Massive update, bugs, filesize, new features - getting ready for 1.0.

1.7/enhancement_8685
John Resig 2006-06-22 05:23:38 +00:00
parent ce6af8e889
commit c3c706d3f2
6 changed files with 638 additions and 775 deletions

View File

@ -39,7 +39,7 @@ $.fn.load = function( url, params, callback ) {
// If a callback function was provided
if ( callback && callback.constructor == Function )
// Execute it within the context of the element
$.apply( self, callback, [res.responseText] );
callback.apply( self, [res.responseText] );
});
// Execute all the scripts inside of the newly-injected HTML
@ -76,17 +76,14 @@ $.post = function( url, data, callback, type ) {
if ( $.browser == "msie" )
XMLHttpRequest = function(){
return new ActiveXObject(
(navigator.userAgent.toLowerCase().indexOf('msie 5') >= 0) ?
(navigator.userAgent.toLowerCase().indexOf("msie 5") >= 0) ?
"Microsoft.XMLHTTP" : "Msxml2.XMLHTTP"
);
};
// Counter for holding the number of active queries
$.xmlActive = 0;
// Attach a bunch of functions for handling common AJAX events
(function(){
var e = ['ajaxStart','ajaxComplete','ajaxError','ajaxSuccess'];
var e = "ajaxStart.ajaxComplete.ajaxError.ajaxSuccess".split(',');
for ( var i = 0; i < e.length; i++ ){ (function(){
var o = e[i];
@ -117,36 +114,32 @@ $.ajax = function( type, url, data, ret ) {
// Set the correct header, if data is being sent
if ( data )
xml.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
xml.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
// Set header so calling script knows that it's an XMLHttpRequest
xml.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
// Make sure the browser sends the right content length
if ( xml.overrideMimeType )
xml.setRequestHeader('Connection', 'close');
xml.setRequestHeader("Connection", "close");
// Wait for a response to come back
xml.onreadystatechange = function(){
// Socket is openend
if ( xml.readyState == 1 ) {
// Increase counter
$.xmlActive++;
$.ajax.active++;
// Show loader if needed
if ( $.xmlActive >= 1 && $.xmlCreate )
$.event.trigger( 'ajaxStart' );
// Show 'loader'
$.event.trigger( "ajaxStart" );
}
// Socket is closed and data is available
if ( xml.readyState == 4 ) {
// Decrease counter
$.xmlActive--;
// Hide loader if needed
if ( $.xmlActive <= 0 && $.xmlDestroy ) {
$.event.trigger( 'ajaxComplete' );
$.xmlActive = 0
if ( ! --$.ajax.active ) {
$.event.trigger( "ajaxComplete" );
$.ajax.active = 0
}
// Make sure that the request was successful
@ -156,7 +149,7 @@ $.ajax = function( type, url, data, ret ) {
if ( success ) success( xml );
// Fire the global callback
$.event.trigger( 'ajaxSuccess' );
$.event.trigger( "ajaxSuccess" );
// Otherwise, the request was not successful
} else {
@ -164,7 +157,7 @@ $.ajax = function( type, url, data, ret ) {
if ( error ) error( xml );
// Fire the global callback
$.event.trigger( 'ajaxError' );
$.event.trigger( "ajaxError" );
}
// Process result
@ -176,10 +169,13 @@ $.ajax = function( type, url, data, ret ) {
xml.send(data);
};
// Counter for holding the number of active queries
$.ajax.active = 0;
// Determines if an XMLHttpRequest was successful or not
$.httpSuccess = function(r) {
return ( r.status && ( r.status >= 200 && r.status < 300 ) ||
r.status == 304 ) || !r.status && location.protocol == 'file:';
r.status == 304 ) || !r.status && location.protocol == "file:";
};
// Get the data out of an XMLHttpRequest

View File

@ -36,3 +36,16 @@ for ( var i = 0; i < posArg.length; i++ ) {
};
})();
}
$.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++ ) {
t += e[j].childNodes[i].nodeType != 1 ?
e[j].childNodes[i].nodeValue :
$.fn.text(e[j].childNodes[i].childNodes);
}
}
return t;
};

View File

@ -38,7 +38,7 @@ $.fn.hover = function(f,g) {
if ( p == this ) return false;
// Execute the right function
return $.apply(this,e.type == 'mouseover' ? f : g,[e]);
return (e.type == "mouseover" ? f : g).apply(this,[e]);
}
// Bind the function to the two event listeners
@ -67,10 +67,9 @@ $.fn.ready = function(f) {
/*
* Bind a number of event-handling functions, dynamically
*/
var e = ["blur","focus","contextmenu","load","resize","scroll","unload",
"click","dblclick","mousedown","mouseup","mouseenter","mouseleave",
"mousemove","mouseover","mouseout","change","reset","select","submit",
"keydown","keypress","keyup","abort","error","ready"];
var e = "blur,focus,contextmenu,load,resize,scroll,unload,click,dblclick," +
"mousedown,mouseup,mouseenter,mouseleave,mousemove,mouseover,mouseout," +
"change,reset,select,submit,keydown,keypress,keyup,abort,error,ready".split(",");
// Go through all the event names, but make sure that
// it is enclosed properly
@ -143,13 +142,13 @@ $.fn.ready = function(f) {
} else if ( $.browser == "msie" ) {
// Only works if you document.write() it
document.write('<scr' + 'ipt id=__ie_init defer=true ' +
'src=javascript:void(0)><\/script>');
document.write("<scr" + "ipt id=__ie_init defer=true " +
"src=javascript:void(0)><\/script>");
// Use the defer script hack
var script = document.getElementById('__ie_init');
var script = document.getElementById("__ie_init");
script.onreadystatechange = function() {
if ( this.readyState == 'complete' )
if ( this.readyState == "complete" )
$.ready();
};

View File

@ -37,7 +37,7 @@
* @param url form action override
* @param mth form method override
* @return "this" object
* @see ajaxForm(), serialize(), load(), $.xml()
* @see ajaxForm(), serialize(), load(), $.ajax()
* @author Mark Constable (markc@renta.net)
* @author G. vd Hoven, Mike Alsup, Sam Collett, John Resig
*/
@ -52,12 +52,12 @@ $.fn.ajaxSubmit = function(target, post_cb, pre_cb, url, mth) {
var mth = mth || f.method || 'POST';
if (target && target.constructor == Function) {
$.xml(mth, url, $.param(this.vars), target);
$.ajax(mth, url, $.param(this.vars), target);
} else if (target && target.constructor == String) {
$(target).load(url, this.vars, post_cb);
} else {
this.vars.push({name: 'evaljs', value: 1});
$.xml(mth, url, $.param(this.vars), function(r) {
$.ajax(mth, url, $.param(this.vars), function(r) {
eval(r.responseText);
});
}

339
fx/fx.js
View File

@ -1,16 +1,117 @@
$.speed = function(s,o) {
if ( o && o.constructor == Function ) { o = { onComplete: o }; }
o = o || {};
var ss = {"crawl":1200,"xslow":850,"slow":600,"medium":400,"fast":200,"xfast":75,"normal":400};
o.duration = typeof s == "number" ? s : ss[s] || 400;
// overwrite the old show method
$.fn._show = $.fn.show;
o.oldComplete = o.onComplete;
o.onComplete = function(){
$.dequeue(this, 'fx');
if ( o.oldComplete && o.oldComplete.constructor == Function ) {
$.apply( this, o.oldComplete );
/**
* The effects module overloads the show method to now allow
* for a speed to the show operation. What actually happens is
* that the height, width, and opacity to the matched elements
* are changed dynamically. The only three current speeds are
* "slow", "normal", and "fast". For example:
* $("p").show("slow");
* Note: You should not run the show method on things
* that are already shown. This can be circumvented by doing this:
* $("p:hidden").show("slow");
*/
$.fn.show = function(speed,callback){
return speed ? this.animate({
height: "show", width: "show", opacity: "show"
}, speed, callback) : this._show();
};
// We're overwriting the old hide method
$.fn._hide = $.fn.hide;
/**
* The hide function behaves very similary to the show function,
* but is just the opposite.
* $("p:visible").hide("slow");
*/
$.fn.hide = function(speed,callback){
return speed ? this.animate({
height: "hide",
width: "hide",
opacity: "hide"
}, speed, callback) : this._hide();
};
/**
* This function increases the height and opacity for all matched
* elements. This is very similar to 'show', but does not change
* the width - creating a neat sliding effect.
* $("p:hidden").slideDown("slow");
*/
$.fn.slideDown = function(speed,callback){
return this.animate({height: "show"}, speed, callback);
};
/**
* Just like slideDown, only it hides all matched elements.
* $("p:visible").slideUp("slow");
*/
$.fn.slideUp = function(speed,callback){
return this.animate({height: "hide"}, speed, callback);
};
/**
* Adjusts the opacity of all matched elements from a hidden,
* to a fully visible, state.
* $("p:hidden").fadeIn("slow");
*/
$.fn.fadeIn = function(speed,callback){
return this.animate({opacity: "show"}, speed, callback);
};
/**
* Same as fadeIn, but transitions from a visible, to a hidden state.
* $("p:visible").fadeOut("slow");
*/
$.fn.fadeOut = function(speed,callback){
return this.animate({opacity: "hide"}, speed, callback);
};
/**
* ...
*/
$.fn.fadeTo = function(speed,to,callback){
return this.animate({opacity: to}, speed, callback);
};
/**
*
*/
$.fn.animate = function(prop,speed,callback) {
return this.queue(function(){
var i = 0;
for ( var p in prop ) {
var e = new fx( this, $.speed(speed,callback,i++), p );
if ( prop[p].constructor == Number )
e.custom( e.cur(), prop[p] );
else
e[ prop[p] ]();
}
});
};
$.speed = function(s,o,i) {
o = o || {};
if ( o.constructor == Function )
o = { complete: o };
var ss = {"slow":600,"fast":200};
o.duration = s.constructor == Number ? s : ss[s] || 400;
// Queueing
o.oldComplete = o.complete;
o.complete = function(){
$.dequeue(this, "fx");
if ( o.oldComplete && o.oldComplete.constructor == Function )
o.oldComplete.apply( this );
};
if ( i > 0 )
o.complete = null;
return o;
};
@ -18,128 +119,47 @@ $.speed = function(s,o) {
$.queue = {};
$.dequeue = function(elem,type){
type = type || 'fx';
type = type || "fx";
if ( elem.$$queue && elem.$$queue[type] ) {
if ( elem.queue && elem.queue[type] ) {
// Remove self
elem.$$queue[type].shift();
elem.queue[type].shift();
// Get next function
var f = elem.$$queue[type][0];
var f = elem.queue[type][0];
if ( f ) {
$.apply( elem, f );
}
if ( f )
f.apply( elem );
}
};
$.fn.queue = function(type,fn){
if ( !fn ) {
fn = type;
type = 'fx';
type = "fx";
}
return this.each(function(){
if ( !this.$$queue ) {
this.$$queue = {};
}
if ( !this.queue )
this.queue = {};
if ( !this.$$queue[type] ) {
this.$$queue[type] = [];
}
if ( !this.queue[type] )
this.queue[type] = [];
this.$$queue[type].push( fn );
this.queue[type].push( fn );
if ( this.$$queue[type].length == 1 ) {
$.apply(this,fn);
}
if ( this.queue[type].length == 1 )
fn.apply(this);
});
};
$.fn._hide = $.fn.hide;
$.fn.hide = function(a,o) {
o = $.speed(a,o);
return a ? this.queue(function(){
new $.fx.FadeSize(this,o).hide();
}) : this._hide();
};
$.fn._show = $.fn.show;
$.fn.show = function(a,o) {
o = $.speed(a,o);
return a ? this.queue(function(){
new $.fx.FadeSize(this,o).show();
}) : this._show();
};
$.fn.slideDown = function(a,o) {
o = $.speed(a,o);
return this.queue(function(){
new $.fx.Resize(this,o).show("height");
});
};
$.fn.slideUp = function(a,o) {
o = $.speed(a,o);
return this.queue(function(){
new $.fx.Resize(this,o).hide("height");
});
};
$.fn.fadeOut = function(a,o) {
o = $.speed(a,o);
return a ? this.queue(function(){
new $.fx.Opacity(this,o,1).hide();
}) : this._hide();
};
$.fn.fadeIn = function(a,o) {
o = $.speed(a,o);
return a ? this.queue(function(){
new $.fx.Opacity(this,o,1).show();
}) : this._show();
};
$.fn.fadeTo = function(a,ev,o) {
o = $.speed(a,o);
return a ? this.queue(function(){
ef = new $.fx.Opacity(this,o);
ef.custom(ef.cur(),parseFloat(ev));
ef.show();
}) : this._show();
};
$.fn.center = function(f) {
return this.each(function(){
if ( !f && this.nodeName == 'IMG' &&
!this.offsetWidth && !this.offsetHeight ) {
var self = this;
setTimeout(function(){
$(self).center(true);
}, 13);
} else {
var s = this.style;
var p = this.parentNode;
if ( $.css(p,"position") == 'static' ) {
p.style.position = 'relative';
}
s.position = 'absolute';
s.left = (($.css(p,"width") - $.css(this,"width"))/2) + "px";
s.top = (($.css(p,"height") - $.css(this,"height"))/2) + "px";
}
});
};
$.setAuto = function(e,p) {
var a = e.style[p];
var o = $.css(e,p);
e.style[p] = 'auto';
e.style[p] = "auto";
var n = $.css(e,p);
if ( o != n ) {
if ( o != n )
e.style[p] = a;
}
};
/*
@ -148,32 +168,42 @@ $.setAuto = function(e,p) {
* people. You've been warned.
*/
$.fx = function(el,op,ty){
$.fx = function( elem, options, prop ){
var z = this;
// The users options
z.o = {
duration: (op && op.duration) || 400,
onComplete: (op && op.onComplete) || op
duration: options.duration || 400,
complete: options.complete
};
// The element
z.el = el;
z.el = elem;
// The styles
var y = z.el.style;
// Simple function for setting a style value
z.a = function(){
z.el.style[ty] = z.now+'px';
if ( prop == "opacity" ) {
if (z.now == 1) z.now = 0.9999;
if (window.ActiveXObject)
y.filter = "alpha(opacity=" + z.now*100 + ")";
y.opacity = z.now;
} else
y[prop] = z.now+"px";
};
// Figure out the maximum number to run to
z.max = function(){return z.el["$$orig"+ty]||z.cur();};
z.max = function(){
return z.el["orig"+prop] || z.cur();
};
// Get the current size
z.cur = function(){return $.css(z.el,ty);};
z.cur = function(){
return parseFloat( $.css(z.el,prop) );
};
// Start an animation from one number to another
z.custom = function(from,to){
@ -196,25 +226,15 @@ $.fx = function(el,op,ty){
// Simple 'hide' function
z.hide = function(){
// Remember where we started, so that we can go back to it later
z.el["$$orig"+ty] = this.cur();
z.el["orig"+prop] = this.cur();
// Begin the animation
z.custom(z.cur(),0);
};
// Toggle between showing and hiding an element
z.toggle = function(){
if ( z.cur() > 0 ) {
z.hide();
} else {
z.show();
}
};
// IE has trouble with opacity if it doesn't have layout
if ( $.browser == "msie" && !z.el.currentStyle.hasLayout ) {
if ( $.browser == "msie" && !z.el.currentStyle.hasLayout )
y.zoom = 1;
}
// Remember the overflow of the element
z.oldOverflow = y.overflow;
@ -239,21 +259,20 @@ $.fx = function(el,op,ty){
// If the element was shown, and not using a custom number,
// set its height and/or width to auto
if ( (ty == "height" || ty == "width") && z.o.auto ) {
$.setAuto( z.el, ty );
}
if ( (prop == "height" || prop == "width") && z.o.auto )
$.setAuto( z.el, prop );
// If a callback was provided, execute it
if( z.o.onComplete.constructor == Function ) {
if( z.o.complete.constructor == Function ) {
// Yes, this is a weird place for this, but it needs to be executed
// only once per cluster of effects.
// If the element is, effectively, hidden - hide it
if ( y.height == "0px" || y.width == "0px" ) {
if ( y.height == "0px" || y.width == "0px" )
y.display = "none";
}
$.apply( z.el, z.o.onComplete );
// Execute the complete function
z.o.complete.apply( z.el );
}
} else {
// Figure out where in the animation we are and set the number
@ -266,57 +285,3 @@ $.fx = function(el,op,ty){
};
};
$.fx.fn = ["show","hide","toggle"];
$.fx.ty = ["Height","Width","Left","Top"];
(function(){
for(var $i in $.fx.ty){(function(){
var c = $.fx.ty[$i];
$.fx[c] = function(a,b){
return new $.fx(a,b,c.toLowerCase());
};
})();}
})();
$.fx.Opacity = function(a,b,sv){
var o = new $.fx(a,b,"opacity");
o.cur = function(){return parseFloat(o.el.style.opacity);};
o.a = function() {
var e = o.el.style;
if (o.now == 1) { o.now = 0.9999; }
if (window.ActiveXObject) {
e.filter = "alpha(opacity=" + o.now*100 + ")";
}
e.opacity = o.now;
};
o.io = o.now = (sv || o.cur());
o.a();
return o;
};
$.fx.Resize = function(e,o){
var z = this;
var h = new $.fx.Height(e,o);
if(o) { o.onComplete = null; }
var w = new $.fx.Width(e,o);
function c(a,b,d){return (!a||a==d||b==d);}
for(var i in $.fx.fn){(function(){
var j = $.fx.fn[i];
z[j] = function(a,b){
if(c(a,b,"height")) { h[j](); }
if(c(a,b,"width")) { w[j](); }
};
})();}
};
$.fx.FadeSize = function(e,o){
var z = this;
var r = new $.fx.Resize(e,o);
if(o) { o.onComplete = null; }
var p = new $.fx.Opacity(e,o,1);
for(var i in $.fx.fn){(function(){
var j = $.fx.fn[i];
z[j] = function(a,b){p[j]();r[j](a,b);};
})();}
};

998
jquery/jquery.js vendored

File diff suppressed because it is too large Load Diff