X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=a275b02069458b98ecac398ffeb76836e8628f1e;hb=6596108635d88116be67f6d22183588822e41c44;hp=e9db33d1f777b0962e4b816c4e7ba418fc07bdba;hpb=2a6b0ee7c846d5bdd535dcc9a399d528f65460ac;p=jquery.git diff --git a/jquery/jquery.js b/jquery/jquery.js index e9db33d..a275b02 100644 --- a/jquery/jquery.js +++ b/jquery/jquery.js @@ -9,6 +9,9 @@ * $Rev$ */ +/* For JSLint (jslint.com): */ +/*extern ActiveXObject Prototype setTimeout setInterval clearInterval document window XMLHttpRequest navigator*/ + function $(a,c) { var $a = a || $.context || document; var $c = c && c.$jquery && c.get(0) || c; @@ -22,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 ) { @@ -54,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]); } @@ -64,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 ); }, @@ -121,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'), ''); }); @@ -214,13 +217,13 @@ function $(a,c) { }, bind: function(t,f) { - return this.each(function(){addEvent(this,t,f);}); + return this.each(function(){$.event.add(this,t,f);}); }, unbind: function(t,f) { - return this.each(function(){removeEvent(this,t,f);}); + return this.each(function(){$.event.remove(this,t,f);}); }, trigger: function(t) { - return this.each(function(){triggerEvent(this,t);}); + return this.each(function(){$.event.trigger(this,t);}); }, find: function(t) { @@ -302,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); }; @@ -393,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", @@ -568,7 +571,7 @@ $.attr = function(o,a,v){ a = (fix[a] && fix[a].replace && fix[a]) || a; var r = new RegExp("-([a-z])","ig"); a = a.replace(r,function(z,b){return b.toUpperCase();}); - if ( v !== null ) { + if ( typeof v != 'undefined' ) { o[a] = v; if ( o.setAttribute ) { o.setAttribute(a,v); @@ -646,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) { @@ -668,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); }; @@ -706,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]; @@ -728,11 +731,13 @@ $.map = function(a,f) { return r; }; +$.event = {}; + // Bind an event to an element // Original by Dean Edwards -function addEvent(element, type, handler) { +$.event.add = function(element, type, handler) { if ( element.location ) { element = window; } // Ughhhhh.... - if (!handler.$$guid) { handler.$$guid = addEvent.guid++; } + if (!handler.$$guid) { handler.$$guid = $.event.add.guid++; } if (!element.events) { element.events = {}; } var handlers = element.events[type]; if (!handlers) { @@ -742,13 +747,13 @@ function addEvent(element, type, handler) { } } handlers[handler.$$guid] = handler; - element["on" + type] = handleEvent; -} + element["on" + type] = $.event.handle; +}; -addEvent.guid = 1; +$.event.add.guid = 1; // Detach an event or set of events from an element -function removeEvent(element, type, handler) { +$.event.remove = function(element, type, handler) { if (element.events) { if (type && element.events[type]) { if ( handler ) { @@ -760,26 +765,29 @@ function removeEvent(element, type, handler) { } } else { for ( var j in element.events ) { - removeEvent( element, j ); + $.event.remove( element, j ); } } } -} +}; -function triggerEvent(element,type,data) { +$.event.trigger = function(element,type,data) { data = data || [{ type: type }]; if ( element && element["on" + type] ) { $.apply( element, element["on" + type], data ); } -} +}; + +$.event.handle = function(event) { + if ( !event && !window.event ) { return null; } + + var returnValue = true, handlers = []; + event = event || $.event.fix(window.event); -function handleEvent(event) { - var returnValue = true; - event = event || fixEvent(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 ) { @@ -793,19 +801,19 @@ function handleEvent(event) { } catch(e){} } return returnValue; -} +}; -function fixEvent(event) { - event.preventDefault = fixEvent.preventDefault; - event.stopPropagation = fixEvent.stopPropagation; +$.event.fix = function(event) { + event.preventDefault = $.event.fix.preventDefault; + event.stopPropagation = $.event.fix.stopPropagation; return event; -} +}; -fixEvent.preventDefault = function() { +$.event.fix.preventDefault = function() { this.returnValue = false; }; -fixEvent.stopPropagation = function() { +$.event.fix.stopPropagation = function() { this.cancelBubble = true; };