Fixed issues with @* and @foo selectors. Ticket #2

[jquery.git] / jquery / jquery.js

diff --git a/jquery/jquery.js b/jquery/jquery.js
index 75dd907..c377f63 100644 (file)
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -162,7 +162,7 @@ function $(a,c) {
                append: function() {
                        var clone = this.size() > 1;
                        var a = $.clean(arguments);
-                       return this.each(function(){
+                       return this.domManip(function(){
                                for ( var i = 0; i < a.length; i++ ) {
                                  this.appendChild( clone ? a[i].cloneNode(true) : a[i] );
                                }
@@ -181,7 +181,7 @@ function $(a,c) {
                prepend: function() {
                        var clone = this.size() > 1;
                        var a = $.clean(arguments);
-                       return this.each(function(){
+                       return this.domManip(function(){
                                for ( var i = a.length - 1; i >= 0; i-- ) {
                                        this.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.firstChild );
                                }
@@ -320,12 +320,18 @@ function $(a,c) {
 
 (function(){
        var b = navigator.userAgent.toLowerCase();
+
+       // Figure out what browser is being used
        $.browser =
-               ( /safari/.test(b) && "safari" ) ||
+               ( /webkit/.test(b) && "safari" ) ||
                ( /opera/.test(b) && "opera" ) ||
                ( /msie/.test(b) && "msie" ) ||
                ( !/compatible/.test(b) && "mozilla" ) ||
                "other";
+
+       // Check to see if the W3C box model is being used
+       $.boxModel = ( $.browser != "msie" || 
+               document.compatMode == "CSS1Compat" );
 })();
 
 $.apply = function(o,f,a) {
@@ -347,10 +353,15 @@ $.apply = function(o,f,a) {
 $.getCSS = function(e,p) {
        // Adapted from Prototype 1.4.0
        if ( p == 'height' || p == 'width' ) {
-               var ph = $.browser == "msie" ? 0 : 
-                       parseInt($.css(e,"paddingTop")) + parseInt($.css(e,"paddingBottom"));
-               var pw = $.browser == "msie" ? 0 : 
-                       parseInt($.css(e,"paddingLeft")) + parseInt($.css(e,"paddingRight"));
+
+               // Handle extra width/height provided by the W3C box model
+               var ph = !$.boxModel ? 0 : 
+                       parseInt($.css(e,"paddingTop")) + parseInt($.css(e,"paddingBottom")) +
+                       parseInt($.css(e,"borderTop")) + parseInt($.css(e,"borderBottom"));
+
+               var pw = !$.boxModel ? 0 : 
+                       parseInt($.css(e,"paddingLeft")) + parseInt($.css(e,"paddingRight")) +
+                       parseInt($.css(e,"borderLeft")) + parseInt($.css(e,"borderRight"));
 
                var oHeight, oWidth;
 
@@ -365,7 +376,7 @@ $.getCSS = function(e,p) {
                        els.visibility = 'hidden';
                        els.position = 'absolute';
                        els.display = '';
-                       oHeight = e.clientHeight - ph || parseInt(e.style.height,10);
+                       oHeight = e.clientHeight || parseInt(e.style.height,10);
                        oWidth = e.clientWidth || parseInt(e.style.width,10);
                        els.display = od;
                        els.position = op;
@@ -397,20 +408,29 @@ $.clean = function(a) {
        var r = [];
        for ( var i = 0; i < a.length; i++ ) {
                if ( a[i].constructor == String ) {
-                       if ( a[i].indexOf("<tr") == 0 ) {
-//alert("tr");
+
+                       if ( !a[i].indexOf("<tr") ) {
                                var tr = true;
                                a[i] = "<table>" + a[i] + "</table>";
+                       } else if ( !a[i].indexOf("<td") || !a[i].indexOf("<th") ) {
+                               var td = true;
+                               a[i] = "<table><tbody><tr>" + a[i] + "</tr></tbody></table>";
                        }
+
                        var div = document.createElement("div");
                        div.innerHTML = a[i];
-                       if ( tr ) {
+
+                       if ( tr || td ) {
                                div = div.firstChild.firstChild;
+                               if ( td ) {
+                                       div = div.firstChild;
+                               }
                        }
+       
                        for ( var j = 0; j < div.childNodes.length; j++ ) {
                                r[r.length] = div.childNodes[j];
                        }
-               } else if ( a[i].length ) {
+               } else if ( a[i].length && !a[i].nodeType ) {
                        for ( var k = 0; k < a[i].length; k++ ) {
                                r[r.length] = a[i][k];
                        }
@@ -422,9 +442,31 @@ $.clean = function(a) {
        return r;
 };
 
+$.fn = {};
+
+/**
+ * A wrapper function for each() to be used by append and prepend.
+ * Handles cases where you're trying to modify the inner contents of
+ * a table, when you actually need to work with the tbody.
+ */
+$.fn.domManip = function(fn){
+       return this.each(function(){
+               var obj = this;
+
+               if ( this.nodeName == 'TABLE' ) {
+                       if ( !this.firstChild ) {
+                               this.appendChild( document.createElement("tbody") );
+                       }
+                       obj = this.firstChild;
+               }
+
+               $.apply( obj, fn );
+       });
+};
+
 $.g = {
        '': "m[2] == '*' || a.nodeName.toUpperCase() == m[2].toUpperCase()",
-       '#': "a.attributes['id'].nodeValue == m[2]",
+       '#': "a.getAttribute('id') && a.getAttribute('id').nodeValue == m[2]",
        ':': {
                lt: "i < m[3]-0",
                gt: "i > m[3]-0",
@@ -454,7 +496,6 @@ $.g = {
                disabled: "a.disabled",
                checked: "a.checked"
        },
-       // TODO: Write getAttribute helper
        ".": "$.hasWord(a,m[2])",
        "@": {
                "=": "$.attr(a,m[3]) == m[4]",
@@ -469,8 +510,6 @@ $.g = {
        "[": "$.Select(m[2],a).length > 0"
 };
 
-$.fn = {};
-
 $.Select = function( t, context ) {
        context = context || $.context || document;
        if ( t.constructor != String ) {
@@ -597,8 +636,7 @@ $.attr = function(o,a,v){
                        'for': 'htmlFor',
                        'text': 'cssText',
                        'class': 'className',
-                       'float': 'cssFloat',
-                       'style': 'cssText'
+                       'float': 'cssFloat'
                };
                a = (fix[a] && fix[a].replace && fix[a]) || a;
                var r = new RegExp("-([a-z])","ig");
@@ -622,7 +660,7 @@ $.filter = function(t,r,not) {
        }
        
        while ( t.length > 0 && t.match(/^[:\\.#\\[a-zA-Z\\*]/) ) {
-               var re = new RegExp( "^\\[ *@([a-z0-9\\(\\)_-]+) *([~!\\|\\*$^=]*) *'?\"?([^'\"]*)'?\"? *\\]", "i" );
+               var re = new RegExp( "^\\[ *@([a-z0-9\\*\\(\\)_-]+) *([~!\\|\\*$^=]*) *'?\"?([^'\"]*)'?\"? *\\]", "i" );
                var m = re.exec(t);
                
                if ( m !== null ) {
@@ -768,7 +806,12 @@ $.event = {};
 // Bind an event to an element
 // Original by Dean Edwards
 $.event.add = function(element, type, handler) {
-       if ( element.location ) { element = window; } // Ughhhhh....
+       // For whatever reason, IE has trouble passing the window object
+       // around, causing it to be cloned in the process
+       if ( $.browser == "msie" && typeof element.setInterval != "undefined" ) {
+               element = window;
+       }
+
        if (!handler.$$guid) { handler.$$guid = $.event.add.guid++; }
        if (!element.events) { element.events = {}; }
        var handlers = element.events[type];
@@ -804,7 +847,7 @@ $.event.remove = function(element, type, handler) {
 };
 
 $.event.trigger = function(element,type,data) {
-       data = data || [{ type: type }];
+       data = data || [ $.event.fix({ type: type }) ];
        if ( element && element["on" + type] ) {
                $.apply( element, element["on" + type], data );
        }