Skip to content
Permalink
Browse files
Massive update, bugs, filesize, new features - getting ready for 1.0.
  • Loading branch information
jeresig committed Jun 22, 2006
1 parent ce6af8e commit c3c706d3f24dbad0fdeb80fe9caf158bd9d6de66
Showing 6 changed files with 641 additions and 778 deletions.
@@ -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,15 +149,15 @@ $.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 {
// If a local callback was specified, fire it
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
@@ -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;
};
@@ -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();
};

@@ -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);
});
}

0 comments on commit c3c706d

Please sign in to comment.