git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d143f76
)
Operation "Remove JSLint Changes" has begun.
author
John Resig
<jeresig@gmail.com>
Sun, 18 Jun 2006 01:29:53 +0000
(
01:29
+0000)
committer
John Resig
<jeresig@gmail.com>
Sun, 18 Jun 2006 01:29:53 +0000
(
01:29
+0000)
jquery/jquery.js
patch
|
blob
|
history
diff --git
a/jquery/jquery.js
b/jquery/jquery.js
index
b938b5b
..
6263607
100644
(file)
--- a/
jquery/jquery.js
+++ b/
jquery/jquery.js
@@
-50,20
+50,17
@@
function $(a,c) {
},
each: function(f) {
},
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] );
$.apply( this.get(i), f, [i] );
- }
return this;
},
set: function(a,b) {
return this.each(function(){
return this;
},
set: function(a,b) {
return this.each(function(){
- if ( typeof b == 'undefined' ) {
- for ( var j in a ) {
+ if ( typeof b == 'undefined' )
+ for ( var j in a )
$.attr(this,j,a[j]);
$.attr(this,j,a[j]);
- }
- } else {
+ else
$.attr(this,a,b);
$.attr(this,a,b);
- }
});
},
html: function(h) {
});
},
html: function(h) {
@@
-78,47
+75,40
@@
function $(a,c) {
css: function(a,b) {
return a.constructor != String || b ?
this.each(function(){
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]);
$.attr(this.style,j,a[j]);
- }
- } else {
+ else
$.attr(this.style,a,b);
$.attr(this.style,a,b);
- }
}) : $.css( this.get(0), a );
},
toggle: function() {
return this.each(function(){
var d = $.getCSS(this,"display");
}) : $.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();
$(this).show();
- } else {
+ else
$(this).hide();
$(this).hide();
- }
});
},
show: function(a) {
return this.each(function(){
this.style.display = this.$$oldblock ? this.$$oldblock : '';
});
},
show: function(a) {
return this.each(function(){
this.style.display = this.$$oldblock ? this.$$oldblock : '';
- if ( $.getCSS(this,"display") == "none" ) {
+ if ( $.getCSS(this,"display") == "none" )
this.style.display = 'block';
this.style.display = 'block';
- }
});
},
hide: function(a) {
return this.each(function(){
this.$$oldblock = $.getCSS(this,"display");
});
},
hide: function(a) {
return this.each(function(){
this.$$oldblock = $.getCSS(this,"display");
- if ( this.$$oldblock == "none" ) {
+ if ( this.$$oldblock == "none" )
this.$$oldblock = 'block';
this.$$oldblock = 'block';
- }
this.style.display = 'none';
});
},
addClass: function(c) {
return this.each(function(){
this.style.display = 'none';
});
},
addClass: function(c) {
return this.each(function(){
- if ($.hasWord(this,c)) {
- return null;
- }
+ if ($.hasWord(this,c)) return;
this.className += ( this.className.length > 0 ? " " : "" ) + c;
});
},
this.className += ( this.className.length > 0 ? " " : "" ) + c;
});
},
@@
-132,13
+122,12
@@
function $(a,c) {
// TODO: Optomize
toggleClass: function(c) {
return this.each(function(){
// 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'), '');
this.className =
this.className.replace(
new RegExp('(\\s*\\b[^-])'+c+'($|\\b(?=[^-]))', 'g'), '');
- } else {
+ else
this.className += ( this.className.length > 0 ? " " : "" ) + c;
this.className += ( this.className.length > 0 ? " " : "" ) + c;
- }
});
},
remove: function() {
});
},
remove: function() {
@@
-152,9
+141,8
@@
function $(a,c) {
return this.each(function(){
var b = a[0].cloneNode(true);
this.parentNode.insertBefore( b, this );
return this.each(function(){
var b = a[0].cloneNode(true);
this.parentNode.insertBefore( b, this );
- while ( b.firstChild ) {
+ while ( b.firstChild )
b = b.firstChild;
b = b.firstChild;
- }
b.appendChild( this );
});
},
b.appendChild( this );
});
},
@@
-163,18
+151,16
@@
function $(a,c) {
var clone = this.size() > 1;
var a = $.clean(arguments);
return this.domManip(function(){
var clone = this.size() > 1;
var a = $.clean(arguments);
return this.domManip(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] );
this.appendChild( clone ? a[i].cloneNode(true) : a[i] );
- }
});
},
appendTo: function() {
var a = arguments;
return this.each(function(){
});
},
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 );
$(a[i]).append( this );
- }
});
},
});
},
@@
-182,9
+168,8
@@
function $(a,c) {
var clone = this.size() > 1;
var a = $.clean(arguments);
return this.domManip(function(){
var clone = this.size() > 1;
var a = $.clean(arguments);
return this.domManip(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 );
this.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.firstChild );
- }
});
},
});
},
@@
-192,9
+177,8
@@
function $(a,c) {
var clone = this.size() > 1;
var a = $.clean(arguments);
return this.each(function(){
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 );
this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this );
- }
});
},
});
},
@@
-202,17
+186,15
@@
function $(a,c) {
var clone = this.size() > 1;
var a = $.clean(arguments);
return this.each(function(){
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 );
this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.nextSibling );
- }
});
},
empty: function() {
return this.each(function(){
});
},
empty: function() {
return this.each(function(){
- while ( this.firstChild ) {
+ while ( this.firstChild )
this.removeChild( this.firstChild );
this.removeChild( this.firstChild );
- }
});
},
});
},
@@
-245,26
+227,20
@@
function $(a,c) {
this.cur = $.map(this.cur,function(d){
return d.parentNode;
});
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);
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);
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;
},
return this;
},
@@
-293,23
+269,19
@@
function $(a,c) {
// TODO: Remove need to return this
for ( var i in $.fn ) {
// 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] = self[i];
- }
self[i] = $.fn[i];
}
if ( typeof Prototype != "undefined" && $a.constructor != String ) {
self[i] = $.fn[i];
}
if ( typeof Prototype != "undefined" && $a.constructor != String ) {
- if ( $c ) {
- $a = self.get();
- }
+ if ( $c ) $a = self.get();
for ( var k in self ) {(function(j){
try {
for ( var k in self ) {(function(j){
try {
- if ( !$a[j] ) {
+ if ( !$a[j] )
$a[j] = function() {
return $.apply(self,self[j],arguments);
};
$a[j] = function() {
return $.apply(self,self[j],arguments);
};
- }
} catch(e) {}
})(k);}
return $a;
} catch(e) {}
})(k);}
return $a;
@@
-336,13
+308,12
@@
function $(a,c) {
$.apply = function(o,f,a) {
a = a || [];
$.apply = function(o,f,a) {
a = a || [];
- if ( f.apply ) {
+ if ( f.apply )
return f.apply( o, a );
return f.apply( o, a );
- } else {
+ else {
var p = [];
var p = [];
- for (var i = 0; i < a.length; i++) {
+ for (var i = 0; i < a.length; i++)
p[i] = 'a['+i+']';
p[i] = 'a['+i+']';
- }
o.$$exec = this;
var r = eval('o.$$exec(' + p.join(',') + ')');
o.$$exec = null;
o.$$exec = this;
var r = eval('o.$$exec(' + p.join(',') + ')');
o.$$exec = null;
@@
-366,8
+337,8
@@
$.getCSS = function(e,p) {
var oHeight, oWidth;
if ($.css(e,"display") != 'none') {
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;
+ oHeight = e.offsetHeight || parseInt(e.style.height) || 0;
+ oWidth = e.offsetWidth || parseInt(e.style.width) || 0;
} else {
var els = e.style;
var ov = els.visibility;
} else {
var els = e.style;
var ov = els.visibility;
@@
-376,8
+347,8
@@
$.getCSS = function(e,p) {
els.visibility = 'hidden';
els.position = 'absolute';
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);
+ oHeight = e.clientHeight || parseInt(e.style.height);
+ oWidth = e.clientWidth || parseInt(e.style.width);
els.display = od;
els.position = op;
els.visibility = ov;
els.display = od;
els.position = op;
els.visibility = ov;
@@
-388,19
+359,17
@@
$.getCSS = function(e,p) {
(oWidth - pw < 0 ? 0 : oWidth - pw);
}
(oWidth - pw < 0 ? 0 : oWidth - pw);
}
- if (e.style[p]) {
+ if (e.style[p])
return e.style[p];
return e.style[p];
- } else if (e.currentStyle) {
+ else if (e.currentStyle)
return e.currentStyle[p];
return e.currentStyle[p];
- } else if (document.defaultView && document.defaultView.getComputedStyle) {
- p = p.replace(/([A-Z])/g,"-$1");
- p = p.toLowerCase();
+ else if (document.defaultView && document.defaultView.getComputedStyle) {
+ p = p.replace(/([A-Z])/g,"-$1").toLowerCase();
var s = document.defaultView.getComputedStyle(e,"");
var s = document.defaultView.getComputedStyle(e,"");
- var r = s ? s.getPropertyValue(p) : p;
+ var r = s ? s.getPropertyValue(p) : null;
return r;
return r;
- } else {
+ } else
return null;
return null;
- }
};
$.css = $.getCSS;
};
$.css = $.getCSS;