X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=6ff825b9355f64d6709b925c582cdd54754e083b;hb=d584a884b6377553d6ba544c10484dc2a866caee;hp=4592c1bf3bea6a0fda5a854681f07c95350637e4;hpb=c75701a0152a589c21c4862c33b691902a8b8f7b;p=jquery.git
diff --git a/jquery/jquery.js b/jquery/jquery.js
index 4592c1b..6ff825b 100644
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -15,7 +15,7 @@
function $(a,c) {
var $a = a || $.context || document;
var $c = c && c.$jquery && c.get(0) || c;
-
+
// Since we're using Prototype's $ function,
// be nice and have backwards compatability
if ( typeof Prototype != "undefined" ) {
@@ -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 ) {
@@ -42,13 +42,13 @@ function $(a,c) {
var self = {
cur: $.Select($a,$c),
$jquery: "$Rev$",
-
+
// The only two getters
size: function() {return this.get().length;},
get: function(i) {
return typeof i == 'undefined' ? this.cur : this.cur[i];
},
-
+
each: function(f) {
for ( var i = 0; i < this.size(); i++ ) {
$.apply( this.get(i), f, [i] );
@@ -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,14 +67,14 @@ 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 );
},
-
+
css: function(a,b) {
return a.constructor != String || b ?
this.each(function(){
@@ -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'), '');
});
@@ -133,7 +133,7 @@ function $(a,c) {
toggleClass: function(c) {
return this.each(function(){
if ($.hasWord(this,c)) {
- this.className =
+ this.className =
this.className.replace(
new RegExp('(\\s*\\b[^-])'+c+'($|\\b(?=[^-]))', 'g'), '');
} else {
@@ -146,7 +146,7 @@ function $(a,c) {
this.cur = [];
return this;
},
-
+
wrap: function() {
var a = $.clean(arguments);
return this.each(function(){
@@ -158,11 +158,11 @@ function $(a,c) {
b.appendChild( this );
});
},
-
+
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] );
}
@@ -177,17 +177,17 @@ 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 );
}
});
},
-
+
before: function() {
var clone = this.size() > 1;
var a = $.clean(arguments);
@@ -197,7 +197,7 @@ function $(a,c) {
}
});
},
-
+
after: function() {
var clone = this.size() > 1;
var a = $.clean(arguments);
@@ -215,7 +215,7 @@ function $(a,c) {
}
});
},
-
+
bind: function(t,f) {
return this.each(function(){$.event.add(this,t,f);});
},
@@ -225,7 +225,7 @@ function $(a,c) {
trigger: function(t) {
return this.each(function(){$.event.trigger(this,t);});
},
-
+
find: function(t) {
var old = [], ret = [];
this.each(function(){
@@ -250,7 +250,7 @@ function $(a,c) {
}
return this;
},
-
+
parents: function(a) {
this.cur = $.map(this.cur,$.parents);
if ( a ) {
@@ -258,7 +258,7 @@ function $(a,c) {
}
return this;
},
-
+
siblings: function(a) {
// Incorrect, need to exclude current element
this.cur = $.map(this.cur,$.sibling);
@@ -267,7 +267,7 @@ function $(a,c) {
}
return this;
},
-
+
filter: function(t) {
this.cur = $.filter(t,this.cur).r;
return this;
@@ -290,7 +290,7 @@ function $(a,c) {
return !this.s(t);
}
};
-
+
// TODO: Remove need to return this
for ( var i in $.fn ) {
if ( self[i] !== null ) {
@@ -298,14 +298,14 @@ function $(a,c) {
}
self[i] = $.fn[i];
}
-
+
if ( typeof Prototype != "undefined" && $a.constructor != String ) {
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);
};
@@ -314,11 +314,25 @@ function $(a,c) {
})(k);}
return $a;
}
-
+
return self;
}
-$.eval = eval;
+(function(){
+ var b = navigator.userAgent.toLowerCase();
+
+ // Figure out what browser is being used
+ $.browser =
+ ( /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) {
a = a || [];
@@ -330,7 +344,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;
}
@@ -339,26 +353,41 @@ $.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') {
- return p == 'height' ?
- e.offsetHeight || parseInt(e.style.height,10) :
- e.offsetWidth || parseInt(e.style.width,10);
+
+ // 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")) || 0;
+
+ var pw = !$.boxModel ? 0 :
+ parseInt($.css(e,"paddingLeft")) + parseInt($.css(e,"paddingRight")) +
+ parseInt($.css(e,"borderLeft")) + parseInt($.css(e,"borderRight")) || 0;
+
+ var oHeight, oWidth;
+
+ if ($.css(e,"display") != 'none') {
+ oHeight = e.offsetHeight || parseInt(e.style.height,10) || 0;
+ oWidth = e.offsetWidth || parseInt(e.style.width,10) || 0;
+ } else {
+ var els = e.style;
+ var ov = els.visibility;
+ var op = els.position;
+ var od = els.display;
+ els.visibility = 'hidden';
+ els.position = 'absolute';
+ els.display = '';
+ oHeight = e.clientHeight || parseInt(e.style.height,10);
+ oWidth = e.clientWidth || parseInt(e.style.width,10);
+ els.display = od;
+ els.position = op;
+ els.visibility = ov;
}
- var els = e.style;
- var ov = els.visibility;
- var op = els.position;
- var od = els.display;
- els.visibility = 'hidden';
- els.position = 'absolute';
- els.display = '';
- 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;
+
+ return p == 'height' ?
+ (oHeight - ph < 0 ? 0 : oHeight - ph) :
+ (oWidth - pw < 0 ? 0 : oWidth - pw);
}
-
+
if (e.style[p]) {
return e.style[p];
} else if (e.currentStyle) {
@@ -379,26 +408,65 @@ $.clean = function(a) {
var r = [];
for ( var i = 0; i < a.length; i++ ) {
if ( a[i].constructor == String ) {
+
+ if ( !a[i].indexOf("
" + a[i] + "";
+ } else if ( !a[i].indexOf(" |
" + a[i] + "
";
+ }
+
var div = document.createElement("div");
div.innerHTML = a[i];
+
+ 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];
}
} else if ( a[i] !== null ) {
- r[r.length] =
+ r[r.length] =
a[i].nodeType ? a[i] : document.createTextNode(a[i].toString());
}
}
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.id == m[2]",
+ '#': "a.getAttribute('id') && a.getAttribute('id').nodeValue == m[2]",
':': {
lt: "i < m[3]-0",
gt: "i > m[3]-0",
@@ -428,7 +496,6 @@ $.g = {
disabled: "a.disabled",
checked: "a.checked"
},
- // TODO: Write getAttribute helper
".": "$.hasWord(a,m[2])",
"@": {
"=": "$.attr(a,m[3]) == m[4]",
@@ -443,14 +510,12 @@ $.g = {
"[": "$.Select(m[2],a).length > 0"
};
-$.fn = {};
-
$.Select = function( t, context ) {
context = context || $.context || document;
if ( t.constructor != String ) {
return [t];
}
-
+
if ( t.indexOf("//") === 0 ) {
context = context.documentElement;
t = t.substr(2,t.length);
@@ -462,36 +527,36 @@ $.Select = function( t, context ) {
t = t.substr(t.indexOf('/'),t.length);
}
}
-
+
var ret = [context];
var done = [];
var last = null;
-
+
while ( t.length > 0 && last != t ) {
var r = [];
last = t;
-
+
t = $.cleanSpaces(t);
-
+
var re = new RegExp( "^//", "i" );
t = t.replace( re, "" );
-
- if ( t.indexOf('..') === 0 || 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);
@@ -504,22 +569,22 @@ $.Select = function( t, context ) {
});
t = t.substr(1,t.length);
t = $.cleanSpaces(t);
- } else if ( t.indexOf(',') === 0 || t.indexOf('|') === 0 ) {
+ } 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 {
+ } 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] = "*"; }
-
+
for ( var i = 0; i < ret.length; i++ ) {
var o = ret[i];
if ( o ) {
@@ -530,7 +595,7 @@ $.Select = function( t, context ) {
case 'text': case 'radio': case 'checkbox': case 'hidden':
case 'button': case 'submit': case 'image': case 'password':
case 'reset': case 'file':
- r = $.merge( $.grep( $.tag(o,"input"),
+ r = $.merge( $.grep( $.tag(o,"input"),
function(a){ return a.type == m[2]; }), r );
break;
case 'input':
@@ -547,18 +612,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(); }
done = $.merge( done, ret );
+
return done;
};
$.tag = function(a,b){
- return a && typeof a.getElementsByTagName != "undefined" ?
+ return a && typeof a.getElementsByTagName != 'undefined' ?
a.getElementsByTagName( b ) : [];
};
@@ -575,10 +643,10 @@ $.attr = function(o,a,v){
a = a.replace(r,function(z,b){return b.toUpperCase();});
if ( typeof v != 'undefined' ) {
o[a] = v;
- if ( o.setAttribute ) {
+ if ( o.setAttribute && a != 'disabled' ) {
o.setAttribute(a,v);
}
- }
+ }
return o[a] || o.getAttribute(a) || '';
} else {
return '';
@@ -590,21 +658,21 @@ $.filter = function(t,r,not) {
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 re = new RegExp( "^\\[ *@([a-z0-9\\*\\(\\)_-]+) *([~!\\|\\*$^=]*) *'?\"?([^'\"]*)'?\"? *\\]", "i" );
var m = re.exec(t);
-
+
if ( m !== null ) {
m = ['', '@', m[2], m[1], m[3]];
} else {
re = new RegExp( "^(\\[) *([^\\]]*) *\\]", "i" );
m = re.exec(t);
-
+
if ( m === null ) {
re = new RegExp( "^(:)([a-z0-9\\*_-]*)\\( *[\"']?([^ \\)'\"]*)['\"]? *\\)", "i" );
m = re.exec(t);
-
+
if ( m === null ) {
re = new RegExp( "^([:\\.#]*)([a-z0-9\\*_-]*)", "i" );
m = re.exec(t);
@@ -612,7 +680,7 @@ $.filter = function(t,r,not) {
}
}
t = t.replace( re, "" );
-
+
if ( m[1] == ":" && m[2] == "not" ) {
r = $.filter(m[3],r,false).r;
} else {
@@ -623,9 +691,9 @@ $.filter = function(t,r,not) {
} else if ( $.g[m[1]][m[2]] ) {
f = $.g[m[1]][m[2]];
}
-
+
if ( f !== null ) {
- $.eval('f = function(a,i){return ' + f + '}');
+ eval('f = function(a,i){return ' + f + '}');
r = g( r, f );
}
}
@@ -651,7 +719,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 +741,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);
};
@@ -693,7 +761,7 @@ $.getAll = function(o,r) {
$.merge = function(a,b) {
var d = [];
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++ ) {
@@ -711,7 +779,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];
@@ -738,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];
@@ -774,30 +847,31 @@ $.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 );
}
};
$.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 ) {
- 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;
};