changed $.execute back to eval()

[jquery.git] / jquery / jquery.js

diff --git a/jquery/jquery.js b/jquery/jquery.js
index 4592c1b..a275b02 100644 (file)
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -25,7 +25,7 @@ function $(a,c) {
                                $c = $c && $c.documentElement || document;
                                if ( $c.getElementsByTagName($a).length === 0 ) {
                                        var obj = $c.getElementById($a);
-                                       if ( obj !== null ) { return obj; }
+                                       if ( obj ) { return obj; }
                                }
                        }
                } else if ( $a.constructor == Array ) {
@@ -57,7 +57,7 @@ function $(a,c) {
                },
                set: function(a,b) {
                        return this.each(function(){
-                               if ( b === null ) {
+                               if ( typeof b == 'undefined' ) {
                                        for ( var j in a ) {
                                                $.attr(this,j,a[j]);
                                        }
@@ -67,11 +67,11 @@ function $(a,c) {
                        });
                },
                html: function(h) {
-                       return h === null && this.size() ?
+                       return typeof h == 'undefined' && this.size() ?
                                this.get(0).innerHTML : this.set( "innerHTML", h );
                },
                val: function(h) {
-                       return h === null && this.size() ?
+                       return typeof h == 'undefined' && this.size() ?
                                this.get(0).value : this.set( "value", h );
                },
                
@@ -124,7 +124,7 @@ function $(a,c) {
                },
                removeClass: function(c) {
                        return this.each(function(){
-                               this.className = c === null ? '' :
+                               this.className = !c ? '' :
                                        this.className.replace(
                                                new RegExp('(^|\\s*\\b[^-])'+c+'($|\\b(?=[^-]))', 'g'), '');
                        });
@@ -305,7 +305,7 @@ function $(a,c) {
                }
                for ( var k in self ) {(function(j){
                        try {
-                               if ( $a[j] === null ) {
+                               if ( !$a[j] ) {
                                        $a[j] = function() {
                                                return $.apply(self,self[j],arguments);
                                        };
@@ -318,8 +318,6 @@ function $(a,c) {
        return self;
 }
 
-$.eval = eval;
-
 $.apply = function(o,f,a) {
        a = a || [];
        if ( f.apply ) {
@@ -330,7 +328,7 @@ $.apply = function(o,f,a) {
                        p[i] = 'a['+i+']';
                }
                o.$$exec = this;
-               var r = $.eval('o.$$exec(' + p.join(',') + ')');
+               var r = eval('o.$$exec(' + p.join(',') + ')');
                o.$$exec = null;
                return r;
        }
@@ -398,7 +396,7 @@ $.clean = function(a) {
 
 $.g = {
        '': "m[2] == '*' || a.nodeName.toUpperCase() == m[2].toUpperCase()",
-       '#': "a.id == m[2]",
+       '#': "a.attributes['id'].nodeValue == m[2]",
        ':': {
                lt: "i < m[3]-0",
                gt: "i > m[3]-0",
@@ -625,7 +623,7 @@ $.filter = function(t,r,not) {
                        }
                                                
                        if ( f !== null ) {
-                               $.eval('f = function(a,i){return ' + f + '}');
+                               eval('f = function(a,i){return ' + f + '}');
                                r = g( r, f );
                        }
                }
@@ -651,7 +649,7 @@ $.cleanSpaces = function(t){
 $.ofType = function(a,n,e) {
        var t = $.grep($.sibling(a),function(b){return b.nodeName == a.nodeName;});
        if ( e ) { n = t.length - n - 1; }
-       return n !== null ? t[n] == a : t.length;
+       return typeof n != 'undefined' ? t[n] == a : t.length;
 };
 
 $.sibling = function(a,n,e) {
@@ -673,7 +671,7 @@ $.sibling = function(a,n,e) {
 };
 
 $.hasWord = function(e,a) {
-       if ( e === null ) { return false; }
+       if ( typeof e == 'undefined' ) { return false; }
        if ( e.className !== null ) { e = e.className; }
        return new RegExp("(^|\\s)" + a + "(\\s|$)").test(e);
 };
@@ -711,7 +709,7 @@ $.merge = function(a,b) {
 
 $.grep = function(a,f,s) {
        var r = [];
-       if ( a !== null ) {
+       if ( typeof a != 'undefined' ) {
                for ( var i = 0; i < a.length; i++ ) {
                        if ( (!s && f(a[i],i)) || (s && !f(a[i],i)) ) {
                                r[r.length] = a[i];
@@ -781,12 +779,15 @@ $.event.trigger = function(element,type,data) {
 };
 
 $.event.handle = function(event) {
-       var returnValue = true;
+       if ( !event && !window.event ) { return null; }
+
+       var returnValue = true, handlers = [];
        event = event || $.event.fix(window.event);
-       var handlers = [];
+
        for ( var j in this.events[event.type] ) {
                handlers[handlers.length] = this.events[event.type][j];
        }
+
        for ( var i = 0; i < handlers.length; i++ ) {
                try {
                        if ( handlers[i].constructor == Function ) {