$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 ) {
},
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]);
}
});
},
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 );
},
},
removeClass: function(c) {
return this.each(function(){
- this.className = c === null ? '' :
+ this.className = !c ? '' :
this.className.replace(
new RegExp('(^|\\s*\\b[^-])'+c+'($|\\b(?=[^-]))', 'g'), '');
});
}
for ( var k in self ) {(function(j){
try {
- if ( $a[j] === null ) {
+ if ( !$a[j] ) {
$a[j] = function() {
return $.apply(self,self[j],arguments);
};
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 || [];
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;
}
$.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);
+ var ph = $.browser == "msie" ? 0 :
+ parseInt($.css(e,"paddingTop")) + parseInt($.css(e,"paddingBottom"));
+ var pw = $.browser == "msie" ? 0 :
+ parseInt($.css(e,"paddingLeft")) + parseInt($.css(e,"paddingRight"));
+
+ var oHeight, oWidth;
+
+ if ($.css(e,"display") != 'none') {
+ oHeight = e.offsetHeight || parseInt(e.style.height,10);
+ oWidth = e.offsetWidth || parseInt(e.style.width,10);
+ } 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]) {
var r = [];
for ( var i = 0; i < a.length; i++ ) {
if ( a[i].constructor == String ) {
+ if ( a[i].indexOf("<tr") == 0 ) {
+ var tr = true;
+ a[i] = "<table>" + a[i] + "</table>";
+ }
var div = document.createElement("div");
div.innerHTML = a[i];
+ if ( tr ) {
+ div = div.firstChild.firstChild;
+ }
for ( var j = 0; j < div.childNodes.length; j++ ) {
r[r.length] = div.childNodes[j];
}
$.g = {
'': "m[2] == '*' || a.nodeName.toUpperCase() == m[2].toUpperCase()",
- '#': "a.getAttribute('id') == m[2]",
+ '#': "a.getAttribute('id') && a.getAttribute('id').nodeValue == m[2]",
':': {
lt: "i < m[3]-0",
gt: "i > m[3]-0",
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);
});
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] = "*"; }
}
}
- 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 ) : [];
};
'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");
}
if ( f !== null ) {
- $.eval('f = function(a,i){return ' + f + '}');
+ eval('f = function(a,i){return ' + f + '}');
r = g( r, f );
}
}
$.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) {
};
$.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);
};
$.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];
};
$.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 );
}
}
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;
};
git.asbjorn.biz / jquery.git / blobdiff