X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=jquery%2Fjquery.js;h=1e1e4abafe2f43d292add3cc10fd6c38c66495a3;hb=55370e571081930d99128e71bae4fdb5f025b558;hp=668a592d5892f1b77bda19b21b9ccf408290a86e;hpb=4ab5a88bc4cd76c293190ed68a4962d91c108816;p=jquery.git
diff --git a/jquery/jquery.js b/jquery/jquery.js
index 668a592..1e1e4ab 100644
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -1,12 +1,17 @@
/*
- * JQuery (http://jquery.com/)
- * By John Resig (http://ejohn.org/)
- * Under an Attribution, Share Alike License
+ * jQuery (jquery.com)
+ *
+ * Copyright (c) 2006 John Resig (ejohn.org)
+ * Licensed under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
*
* $Date$
* $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;
@@ -18,15 +23,16 @@ function $(a,c) {
var re = new RegExp( "[^a-zA-Z0-9_-]" );
if ( !re.test($a) ) {
$c = $c && $c.documentElement || document;
- if ( $c.getElementsByTagName($a).length == 0 ) {
+ 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 ) {
return $.map( $a, function(b){
- if ( b.constructor == String )
+ if ( b.constructor == String ) {
return document.getElementById(b);
+ }
return b;
});
}
@@ -38,75 +44,87 @@ function $(a,c) {
$jquery: "$Rev$",
// The only two getters
- size: function() {return this.get().length},
+ size: function() {return this.get().length;},
get: function(i) {
- return i == null ? this.cur : this.cur[i];
+ return typeof i == 'undefined' ? this.cur : this.cur[i];
},
each: function(f) {
- for ( var i = 0; i < this.size(); i++ )
+ for ( var i = 0; i < this.size(); i++ ) {
$.apply( this.get(i), f, [i] );
+ }
return this;
},
set: function(a,b) {
return this.each(function(){
- if ( b == null )
- for ( var j in a )
+ if ( typeof b == 'undefined' ) {
+ for ( var j in a ) {
$.attr(this,j,a[j]);
- else
+ }
+ } else {
$.attr(this,a,b);
+ }
});
},
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 );
},
css: function(a,b) {
return a.constructor != String || b ?
this.each(function(){
- if ( !b )
- for ( var j in a )
+ if ( !b ) {
+ for ( var j in a ) {
$.attr(this.style,j,a[j]);
- else
+ }
+ } else {
$.attr(this.style,a,b);
+ }
}) : $.css( this.get(0), a );
},
toggle: function() {
return this.each(function(){
var d = $.getCSS(this,"display");
- if ( d == "none" || d == '' )
+ if ( d == "none" || d === '' ) {
$(this).show();
- else
+ } else {
$(this).hide();
+ }
});
},
show: function(a) {
return this.each(function(){
this.style.display = this.$$oldblock ? this.$$oldblock : '';
- if ( $.getCSS(this,"display") == "none" ) this.style.display = 'block';
+ if ( $.getCSS(this,"display") == "none" ) {
+ this.style.display = 'block';
+ }
});
},
hide: function(a) {
return this.each(function(){
this.$$oldblock = $.getCSS(this,"display");
- if ( this.$$oldblock == "none" ) this.$$oldblock = 'block';
+ if ( this.$$oldblock == "none" ) {
+ this.$$oldblock = 'block';
+ }
this.style.display = 'none';
});
},
addClass: function(c) {
return this.each(function(){
- if ($.hasWord(this,c)) return;
+ if ($.hasWord(this,c)) {
+ return null;
+ }
this.className += ( this.className.length > 0 ? " " : "" ) + 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'), '');
});
@@ -114,12 +132,13 @@ function $(a,c) {
// TODO: Optomize
toggleClass: function(c) {
return this.each(function(){
- if ($.hasWord(this,c))
+ if ($.hasWord(this,c)) {
this.className =
this.className.replace(
new RegExp('(\\s*\\b[^-])'+c+'($|\\b(?=[^-]))', 'g'), '');
- else
+ } else {
this.className += ( this.className.length > 0 ? " " : "" ) + c;
+ }
});
},
remove: function() {
@@ -133,7 +152,9 @@ function $(a,c) {
return this.each(function(){
var b = a[0].cloneNode(true);
this.parentNode.insertBefore( b, this );
- while ( b.firstChild ) b = b.firstChild;
+ while ( b.firstChild ) {
+ b = b.firstChild;
+ }
b.appendChild( this );
});
},
@@ -142,16 +163,18 @@ function $(a,c) {
var clone = this.size() > 1;
var a = $.clean(arguments);
return this.each(function(){
- for ( var i = 0; i < a.length; i++ )
+ for ( var i = 0; i < a.length; i++ ) {
this.appendChild( clone ? a[i].cloneNode(true) : a[i] );
+ }
});
},
appendTo: function() {
var a = arguments;
return this.each(function(){
- for ( var i = 0; i < a.length; i++ )
+ for ( var i = 0; i < a.length; i++ ) {
$(a[i]).append( this );
+ }
});
},
@@ -159,8 +182,9 @@ function $(a,c) {
var clone = this.size() > 1;
var a = $.clean(arguments);
return this.each(function(){
- for ( var i = a.length - 1; i >= 0; i-- )
+ for ( var i = a.length - 1; i >= 0; i-- ) {
this.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.firstChild );
+ }
});
},
@@ -168,8 +192,9 @@ function $(a,c) {
var clone = this.size() > 1;
var a = $.clean(arguments);
return this.each(function(){
- for ( var i = 0; i < a.length; i++ )
+ for ( var i = 0; i < a.length; i++ ) {
this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this );
+ }
});
},
@@ -177,26 +202,28 @@ function $(a,c) {
var clone = this.size() > 1;
var a = $.clean(arguments);
return this.each(function(){
- for ( var i = a.length - 1; i >= 0; i-- )
+ for ( var i = a.length - 1; i >= 0; i-- ) {
this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.nextSibling );
+ }
});
},
empty: function() {
return this.each(function(){
- while ( this.firstChild )
+ while ( this.firstChild ) {
this.removeChild( this.firstChild );
+ }
});
},
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) {
@@ -218,20 +245,26 @@ function $(a,c) {
this.cur = $.map(this.cur,function(d){
return d.parentNode;
});
- if ( a ) this.cur = $.filter(a,this.cur).r;
+ if ( a ) {
+ this.cur = $.filter(a,this.cur).r;
+ }
return this;
},
parents: function(a) {
this.cur = $.map(this.cur,$.parents);
- if ( a ) this.cur = $.filter(a,this.cur).r;
+ if ( a ) {
+ this.cur = $.filter(a,this.cur).r;
+ }
return this;
},
siblings: function(a) {
// Incorrect, need to exclude current element
this.cur = $.map(this.cur,$.sibling);
- if ( a ) this.cur = $.filter(a,this.cur).r;
+ if ( a ) {
+ this.cur = $.filter(a,this.cur).r;
+ }
return this;
},
@@ -260,36 +293,50 @@ function $(a,c) {
// TODO: Remove need to return this
for ( var i in $.fn ) {
- if ( self[i] != null )
+ if ( self[i] !== null ) {
self["_"+i] = self[i];
+ }
self[i] = $.fn[i];
}
if ( typeof Prototype != "undefined" && $a.constructor != String ) {
- if ( $c ) $a = self.get();
- for ( var i in self ) {(function(j){
+ if ( $c ) {
+ $a = self.get();
+ }
+ for ( var k in self ) {(function(j){
try {
- if ( $a[j] == null ) {
+ if ( !$a[j] ) {
$a[j] = function() {
return $.apply(self,self[j],arguments);
};
}
} catch(e) {}
- })(i);}
+ })(k);}
return $a;
}
return self;
}
+(function(){
+ var b = navigator.userAgent.toLowerCase();
+ $.browser =
+ ( /safari/.test(b) && "safari" ) ||
+ ( /opera/.test(b) && "opera" ) ||
+ ( /msie/.test(b) && "msie" ) ||
+ ( !/compatible/.test(b) && "mozilla" ) ||
+ "other";
+})();
+
$.apply = function(o,f,a) {
a = a || [];
- if ( f.apply )
+ if ( f.apply ) {
return f.apply( o, a );
- else {
+ } else {
var p = [];
- for (var i = 0; i < a.length; i++)
+ for (var i = 0; i < a.length; i++) {
p[i] = 'a['+i+']';
+ }
o.$$exec = this;
var r = eval('o.$$exec(' + p.join(',') + ')');
o.$$exec = null;
@@ -300,10 +347,11 @@ $.apply = function(o,f,a) {
$.getCSS = function(e,p) {
// Adapted from Prototype 1.4.0
if ( p == 'height' || p == 'width' ) {
- if ($.getCSS(e,"display") != 'none')
+ if ($.getCSS(e,"display") != 'none') {
return p == 'height' ?
- e.offsetHeight || parseInt(e.style.height) :
- e.offsetWidth || parseInt(e.style.width);
+ e.offsetHeight || parseInt(e.style.height,10) :
+ e.offsetWidth || parseInt(e.style.width,10);
+ }
var els = e.style;
var ov = els.visibility;
var op = els.position;
@@ -311,49 +359,62 @@ $.getCSS = function(e,p) {
els.visibility = 'hidden';
els.position = 'absolute';
els.display = '';
- var oHeight = e.clientHeight || parseInt(e.style.height);
- var oWidth = e.clientWidth || parseInt(e.style.width);
+ var oHeight = e.clientHeight || parseInt(e.style.height,10);
+ var oWidth = e.clientWidth || parseInt(e.style.width,10);
els.display = od;
els.position = op;
els.visibility = ov;
return p == 'height' ? oHeight : oWidth;
}
- if (e.style[p])
+ if (e.style[p]) {
return e.style[p];
- else if (e.currentStyle)
+ } else if (e.currentStyle) {
return e.currentStyle[p];
- else if (document.defaultView && document.defaultView.getComputedStyle) {
+ } else if (document.defaultView && document.defaultView.getComputedStyle) {
p = p.replace(/([A-Z])/g,"-$1");
p = p.toLowerCase();
var s = document.defaultView.getComputedStyle(e,"");
var r = s ? s.getPropertyValue(p) : p;
return r;
- } else
+ } else {
return null;
+ }
};
$.css = $.getCSS;
$.clean = function(a) {
var r = [];
- for ( var i = 0; i < a.length; i++ )
+ for ( var i = 0; i < a.length; i++ ) {
if ( a[i].constructor == String ) {
+ if ( a[i].indexOf("
" + a[i] + "";
+ }
var div = document.createElement("div");
div.innerHTML = a[i];
- for ( var j = 0; j < div.childNodes.length; j++ )
+ if ( tr ) {
+ div = div.firstChild.firstChild;
+ }
+ for ( var j = 0; j < div.childNodes.length; j++ ) {
r[r.length] = div.childNodes[j];
- } else if ( a[i].length )
- for ( var j = 0; j < a[i].length; j++ )
- r[r.length] = a[i][j];
- else if ( a[i] != null )
+ }
+ } else if ( a[i].length ) {
+ for ( var k = 0; k < a[i].length; k++ ) {
+ r[r.length] = a[i][k];
+ }
+ } else if ( a[i] !== null ) {
r[r.length] =
a[i].nodeType ? a[i] : document.createTextNode(a[i].toString());
+ }
+ }
return r;
};
$.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",
@@ -402,17 +463,20 @@ $.fn = {};
$.Select = function( t, context ) {
context = context || $.context || document;
- if ( t.constructor != String ) return [t];
+ if ( t.constructor != String ) {
+ return [t];
+ }
- if ( t.indexOf("//") == 0 ) {
+ if ( t.indexOf("//") === 0 ) {
context = context.documentElement;
t = t.substr(2,t.length);
- } else if ( t.indexOf("/") == 0 ) {
+ } else if ( t.indexOf("/") === 0 ) {
context = context.documentElement;
t = t.substr(1,t.length);
// FIX Assume the root element is right :(
- if ( t.indexOf('/') )
+ if ( t.indexOf('/') ) {
t = t.substr(t.indexOf('/'),t.length);
+ }
}
var ret = [context];
@@ -420,54 +484,57 @@ $.Select = function( t, context ) {
var last = null;
while ( t.length > 0 && last != t ) {
- var r = [];
- last = t;
+ var r = [];
+ last = t;
- t = $.cleanSpaces(t);
+ t = $.cleanSpaces(t);
- var re = new RegExp( "^//", "i" );
- t = t.replace( re, "" );
+ var re = new RegExp( "^//", "i" );
+ t = t.replace( re, "" );
- if ( t.indexOf('..') == 0 || t.indexOf('/..') == 0 ) {
- if ( t.indexOf('/') == 0 )
+ if ( t.indexOf('..') === 0 || t.indexOf('/..') === 0 ) {
+ if ( t.indexOf('/') === 0 ) {
t = t.substr(1,t.length);
+ }
r = $.map( ret, function(a){ return a.parentNode; } );
t = t.substr(2,t.length);
t = $.cleanSpaces(t);
- } else if ( t.indexOf('>') == 0 || t.indexOf('/') == 0 ) {
+ } else if ( t.indexOf('>') === 0 || t.indexOf('/') === 0 ) {
r = $.map( ret, function(a){ return ( a.childNodes.length > 0 ? $.sibling( a.firstChild ) : null ); } );
t = t.substr(1,t.length);
t = $.cleanSpaces(t);
- } else if ( t.indexOf('+') == 0 ) {
+ } else if ( t.indexOf('+') === 0 ) {
r = $.map( ret, function(a){ return $.sibling(a).next; } );
t = t.substr(1,t.length);
t = $.cleanSpaces(t);
- } else if ( t.indexOf('~') == 0 ) {
+ } else if ( t.indexOf('~') === 0 ) {
r = $.map( ret, function(a){
var r = [];
var s = $.sibling(a);
- if ( s.n > 0 )
- for ( var i = s.n; i < s.length; i++ )
+ if ( s.n > 0 ) {
+ for ( var i = s.n; i < s.length; i++ ) {
r[r.length] = s[i];
- return r;
+ }
+ }
+ return r;
});
t = t.substr(1,t.length);
t = $.cleanSpaces(t);
- } else if ( t.indexOf(',') == 0 || t.indexOf('|') == 0 ) {
- if ( ret[0] == context ) ret.shift();
+ } else if ( t.indexOf(',') === 0 || t.indexOf('|') === 0 ) {
+ if ( ret[0] == context ) { ret.shift(); }
done = $.merge( done, ret );
r = ret = [context];
t = " " + t.substr(1,t.length);
- } else {
- var re = new RegExp( "^([#.]?)([a-z0-9\\*_-]*)", "i" );
- var m = re.exec(t);
-
+ } else {
+ var re2 = new RegExp( "^([#.]?)([a-z0-9\\*_-]*)", "i" );
+ var m = re2.exec(t);
+
if ( m[1] == "#" ) { // Ummm, should make this work in all XML docs
var oid = document.getElementById(m[2]);
- r = oid ? [oid] : [];
- t = t.replace( re, "" );
+ r = ret = oid ? [oid] : [];
+ t = t.replace( re2, "" );
} else {
- if ( m[2] == "" || m[1] == "." ) m[2] = "*";
+ if ( m[2] === "" || m[1] == "." ) { m[2] = "*"; }
for ( var i = 0; i < ret.length; i++ ) {
var o = ret[i];
@@ -480,7 +547,7 @@ $.Select = function( t, context ) {
case 'button': case 'submit': case 'image': case 'password':
case 'reset': case 'file':
r = $.merge( $.grep( $.tag(o,"input"),
- function(a){ return a.type == m[2] }), r );
+ function(a){ return a.type == m[2]; }), r );
break;
case 'input':
r = $.merge( $.tag(o,"input"), r );
@@ -496,18 +563,21 @@ $.Select = function( t, context ) {
}
}
- var val = $.filter(t,r);
- ret = r = val.r;
- t = $.cleanSpaces(val.t);
+ if ( t ) {
+ var val = $.filter(t,r);
+ ret = r = val.r;
+ t = $.cleanSpaces(val.t);
+ }
}
- if ( ret && ret[0] == context ) ret.shift();
+ if ( ret && ret[0] == context ) { ret.shift(); }
done = $.merge( done, ret );
+
return done;
};
$.tag = function(a,b){
- return a && typeof a.getElementsByTagName != "undefined" ?
+ return a && a.getElementsByTagName ?
a.getElementsByTagName( b ) : [];
};
@@ -517,66 +587,77 @@ $.attr = function(o,a,v){
'for': 'htmlFor',
'text': 'cssText',
'class': 'className',
- 'float': 'cssFloat'
+ 'float': 'cssFloat',
+ 'style': 'cssText'
};
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);
+ if ( o.setAttribute ) {
+ o.setAttribute(a,v);
+ }
}
return o[a] || o.getAttribute(a) || '';
- } else return '';
+ } else {
+ return '';
+ }
};
$.filter = function(t,r,not) {
var g = $.grep;
- if ( not == false ) var g = function(a,f) {return $.grep(a,f,true);};
+ if ( not === false ) {
+ g = function(a,f) {return $.grep(a,f,true);};
+ }
while ( t.length > 0 && t.match(/^[:\\.#\\[a-zA-Z\\*]/) ) {
var re = new RegExp( "^\\[ *@([a-z0-9\\(\\)_-]+) *([~!\\|\\*$^=]*) *'?\"?([^'\"]*)'?\"? *\\]", "i" );
var m = re.exec(t);
- if ( m != null ) {
+ if ( m !== null ) {
m = ['', '@', m[2], m[1], m[3]];
} else {
- var re = new RegExp( "^(\\[) *([^\\]]*) *\\]", "i" );
- var m = re.exec(t);
+ re = new RegExp( "^(\\[) *([^\\]]*) *\\]", "i" );
+ m = re.exec(t);
- if ( m == null ) {
- var re = new RegExp( "^(:)([a-z0-9\\*_-]*)\\( *[\"']?([^ \\)'\"]*)['\"]? *\\)", "i" );
- var m = re.exec(t);
+ if ( m === null ) {
+ re = new RegExp( "^(:)([a-z0-9\\*_-]*)\\( *[\"']?([^ \\)'\"]*)['\"]? *\\)", "i" );
+ m = re.exec(t);
- if ( m == null ) {
- var re = new RegExp( "^([:\\.#]*)([a-z0-9\\*_-]*)", "i" );
- var m = re.exec(t);
+ if ( m === null ) {
+ re = new RegExp( "^([:\\.#]*)([a-z0-9\\*_-]*)", "i" );
+ m = re.exec(t);
}
}
}
t = t.replace( re, "" );
- if ( m[1] == ":" && m[2] == "not" )
+ if ( m[1] == ":" && m[2] == "not" ) {
r = $.filter(m[3],r,false).r;
- else {
- if ( $.g[m[1]].constructor == String )
- var f = $.g[m[1]];
- else if ( $.g[m[1]][m[2]] )
- var f = $.g[m[1]][m[2]];
+ } else {
+ var f = null;
+
+ if ( $.g[m[1]].constructor == String ) {
+ f = $.g[m[1]];
+ } else if ( $.g[m[1]][m[2]] ) {
+ f = $.g[m[1]][m[2]];
+ }
- if ( f != null ) {
- eval("f = function(a,i){return " + f + "}");
+ if ( f !== null ) {
+ eval('f = function(a,i){return ' + f + '}');
r = g( r, f );
}
}
}
+
return { r: r, t: t };
};
$.parents = function(a){
var b = [];
var c = a.parentNode;
- while ( c != null && c != document ) {
+ while ( c !== null && c != document ) {
b[b.length] = c;
c = c.parentNode;
}
@@ -584,25 +665,27 @@ $.parents = function(a){
};
$.cleanSpaces = function(t){
- return t.replace(/^\s+|\s+$/g, '')
+ return t.replace(/^\s+|\s+$/g, '');
};
$.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;
+ var t = $.grep($.sibling(a),function(b){return b.nodeName == a.nodeName;});
+ if ( e ) { n = t.length - n - 1; }
+ return typeof n != 'undefined' ? t[n] == a : t.length;
};
$.sibling = function(a,n,e) {
var type = [];
var tmp = a.parentNode.childNodes;
for ( var i = 0; i < tmp.length; i++ ) {
- if ( tmp[i].nodeType == 1 )
+ if ( tmp[i].nodeType == 1 ) {
type[type.length] = tmp[i];
- if ( tmp[i] == a )
+ }
+ if ( tmp[i] == a ) {
type.n = type.length - 1;
+ }
}
- if ( e ) n = type.length - n - 1;
+ if ( e ) { n = type.length - n - 1; }
type.cur = ( type[n] == a );
type.prev = ( type.n > 0 ? type[type.n - 1] : null );
type.next = ( type.n < type.length - 1 ? type[type.n + 1] : null );
@@ -610,9 +693,9 @@ $.sibling = function(a,n,e) {
};
$.hasWord = function(e,a) {
- if ( e == null ) return false;
- if ( e.className != null ) e = e.className;
- return new RegExp("(^|\\s)" + a + "(\\s|$)").test(e)
+ if ( typeof e == 'undefined' ) { return false; }
+ if ( e.className !== null ) { e = e.className; }
+ return new RegExp("(^|\\s)" + a + "(\\s|$)").test(e);
};
$.getAll = function(o,r) {
@@ -629,26 +712,32 @@ $.getAll = function(o,r) {
$.merge = function(a,b) {
var d = [];
- for ( var j = 0; j < b.length; j++ )
- d[j] = b[j];
+ for ( var k = 0; k < b.length; k++ ) { d[k] = b[k]; }
for ( var i = 0; i < a.length; i++ ) {
var c = true;
- for ( var j = 0; j < b.length; j++ )
- if ( a[i] == b[j] )
+ for ( var j = 0; j < b.length; j++ ) {
+ if ( a[i] == b[j] ) {
c = false;
- if ( c )
- d[d.length] = a[i];
+ }
+ }
+ if ( c ) {
+ d[d.length] = a[i];
+ }
}
+
return d;
};
$.grep = function(a,f,s) {
var r = [];
- if ( a != null )
- for ( var i = 0; i < a.length; i++ )
- if ( (!s && f(a[i],i)) || (s && !f(a[i],i)) )
+ 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];
+ }
+ }
+ }
return r;
};
@@ -656,84 +745,95 @@ $.map = function(a,f) {
var r = [];
for ( var i = 0; i < a.length; i++ ) {
var t = f(a[i],i);
- if ( t != null ) {
- if ( t.constructor != Array ) t = [t];
+ if ( t !== null ) {
+ if ( t.constructor != Array ) { t = [t]; }
r = $.merge( t, r );
}
}
return r;
};
+$.event = {};
+
// Bind an event to an element
// Original by Dean Edwards
-function addEvent(element, type, handler) {
- if ( element.location ) element = window; // Ughhhhh....
- if (!handler.$$guid) handler.$$guid = addEvent.guid++;
- if (!element.events) element.events = {};
+$.event.add = function(element, type, handler) {
+ if ( element.location ) { element = window; } // Ughhhhh....
+ if (!handler.$$guid) { handler.$$guid = $.event.add.guid++; }
+ if (!element.events) { element.events = {}; }
var handlers = element.events[type];
if (!handlers) {
handlers = element.events[type] = {};
- if (element["on" + type])
+ if (element["on" + type]) {
handlers[0] = element["on" + type];
+ }
}
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 ) {
delete element.events[type][handler.$$guid];
} else {
- for ( var i in element.events[type] )
+ for ( var i in element.events[type] ) {
delete element.events[type][i];
+ }
}
} else {
- for ( var i in element.events )
- removeEvent( element, i );
+ for ( var j in element.events ) {
+ $.event.remove( element, j );
+ }
}
}
};
-function triggerEvent(element,type,data) {
+$.event.trigger = function(element,type,data) {
data = data || [{ type: type }];
- if ( element && element["on" + 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);
+
+ for ( var j in this.events[event.type] ) {
+ handlers[handlers.length] = this.events[event.type][j];
+ }
-function handleEvent(event) {
- var returnValue = true;
- event = event || fixEvent(window.event);
- var handlers = [];
- for ( var i in this.events[event.type] )
- handlers[handlers.length] = this.events[event.type][i];
for ( var i = 0; i < handlers.length; i++ ) {
- try {
- if ( handlers[i].constructor == Function ) {
- this.$$handleEvent = handlers[i];
- if (this.$$handleEvent(event) === false) {
- event.preventDefault();
- event.stopPropagation();
- returnValue = false;
- }
+ if ( handlers[i].constructor == Function ) {
+ this.$$handleEvent = handlers[i];
+ if (this.$$handleEvent(event) === false) {
+ event.preventDefault();
+ event.stopPropagation();
+ returnValue = false;
}
- } 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;
};
@@ -743,15 +843,16 @@ $.fn.text = function(e) {
e = e || this.cur;
var t = "";
for ( var j = 0; j < e.length; j++ ) {
- for ( var i = 0; i < e[j].childNodes.length; i++ )
+ for ( var i = 0; i < e[j].childNodes.length; i++ ) {
t += e[j].childNodes[i].nodeType != 1 ?
e[j].childNodes[i].nodeValue :
$.fn.text(e[j].childNodes[i].childNodes);
+ }
}
return t;
};
-setTimeout(function(){
+/*setTimeout(function(){
if ( typeof Prototype != "undefined" && $.g == null && $.clean == null )
throw "Error: You are overwriting jQuery, please include jQuery last.";
-}, 1000);
\ No newline at end of file
+}, 1000);*/