From 6e4f0ce05e88fada8c1767cc2fe7c6a77f2d3602 Mon Sep 17 00:00:00 2001 From: Gilles van den Hoven Date: Tue, 16 May 2006 16:18:52 +0000 Subject: [PATCH] Added my bugfixes and removed the triggerAjax and handleAjax functions since they are no longer needed afaik :) --- ajax/ajax.js | 106 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 87 insertions(+), 19 deletions(-) diff --git a/ajax/ajax.js b/ajax/ajax.js index bd08f83e..d448ebbd 100644 --- a/ajax/ajax.js +++ b/ajax/ajax.js @@ -4,24 +4,60 @@ if ( typeof XMLHttpRequest == 'undefined' && typeof window.ActiveXObject == 'function') { var XMLHttpRequest = function() { - return new ActiveXObject((navigator.userAgent.toLowerCase().indexOf('msie 5') >= 0) ? + return new ActiveXObject((navigator.userAgent.toLowerCase().indexOf('msie 5') >= 0) ? "Microsoft.XMLHTTP" : "Msxml2.XMLHTTP"); }; } +// +// Counter for holding the active query's +$.xmlActive=0; + $.xml = function( type, url, data, ret ) { var xml = new XMLHttpRequest(); if ( xml ) { + // + // Increase the query counter + $.xmlActive++; + + // + // Show loader if needed + if ($.xmlCreate) + $.xmlCreate(); + + // + // Open the socket xml.open(type || "GET", url, true); if ( data ) 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'); + + /* Force "Connection: close" for Mozilla browsers to work around + * a bug where XMLHttpReqeuest sends an incorrect Content-length + * header. See Mozilla Bugzilla #246651. + */ + if ( xml.overrideMimeType ) + xml.setRequestHeader('Connection', 'close'); + xml.onreadystatechange = function() { if ( xml.readyState == 4 ) { if ( ret ) ret(xml); - $.triggerAJAX( $.httpData(xml) ); + + // + // Decrease counter + $.xmlActive--; + + // + // Hide loader if needed + if ($.xmlActive <= 0) { + if ($.xmlDestroy) + $.xmlDestroy(); + } } }; @@ -54,21 +90,6 @@ $.postXML = function( url, data, ret ) { $.post( url, data, ret, "xml" ); }; -// Global AJAX Event Binding -// Requested here: -// http://jquery.com/discuss/2006-March/000415/ - -$.fn.handleAJAX = function( callback ) { - $.ajaxHandles = $.merge( $.ajaxHandles, this.cur ); - return this.bind( 'ajax', callback ); -}; - -$.ajaxHandles = []; -$.triggerAJAX = function(data){ - for ( var i = 0; i < $.ajaxHandles.length; i++ ) - triggerEvent( $.ajaxHandles[i], 'ajax', [data] ); -}; - // Dynamic Form Submission // Based upon the mailing list post at: // http://jquery.com/discuss/2006-March/000424/ @@ -87,8 +108,13 @@ $.fn.serialize = function(callback) { $.param = function(a) { var s = []; - for ( var i in a ) - s[s.length] = i + "=" + encodeURIComponent( a[i] ); + if (a && typeof a == 'object' && a.constructor == Array) { + for ( var i=0; i < a.length; i++ ) + s[s.length] = a[i]['name'] + "=" + encodeURIComponent( a[i]['value'] ); + } else { + for ( var i in a ) + s[s.length] = i + "=" + encodeURIComponent( a[i] ); + } return s.join("&"); }; @@ -120,3 +146,45 @@ $.fn.load = function(a,o,f) { }); return this; }; + +/** + * function: $.fn.formValues + * usage: $('#frmLogin').formValues() + * docs: Gets the form values and creates a key=>value array of the found values (only for ENABLED elements!) + */ +$.fn.formValues = function() { + var a = new Array(); + this.find("input[@type='submit'],input[@type='hidden'],textarea,input[@checked],input[@type='password'],input[@type='text'],option[@selected]") + .filter(":enabled").each(function() { + o = {}; + o['name'] = this.name || this.id || this.parentNode.name || this.parentNode.id; + o['value'] = this.value; + a.push(o); + }); + return a; +}; + +/** + * function: $.update + * usage: $.update('someJQueryObject', 'someurl', 'array'); + * docs: Mimics the ajaxUpdater from prototype. Posts the key=>value array to the url and + * puts the results from that call in the jQuery object specified. + * --> If you set the blnNoEval to true, the script tags are NOT evaluated. + */ +$.update = function(objElement, strURL, arrValues, fncCallback) { + $.post(strURL, arrValues, function(strHTML) { + // + // Update the element with the new HTML + objElement.html(strHTML); + + // + // Evaluate the scripts + objElement.html(strHTML).find("script").each(function(){ + try { eval( this.text || this.textContent || this.innerHTML ); } catch(e){} + }); + + // + // Callback handler + if (fncCallback) fncCallback(); + }); +};