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

[jquery.git] / jquery / jquery.js

diff --git a/jquery/jquery.js b/jquery/jquery.js
index a06e81c..c377f63 100644 (file)
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -430,7 +430,7 @@ $.clean = function(a) {
                        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];
                        }
@@ -496,7 +496,6 @@ $.g = {
                disabled: "a.disabled",
                checked: "a.checked"
        },
-       // TODO: Write getAttribute helper
        ".": "$.hasWord(a,m[2])",
        "@": {
                "=": "$.attr(a,m[3]) == m[4]",
@@ -661,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 ) {