Index: wp-includes/js/jquery/jquery.form.js
===================================================================
--- wp-includes/js/jquery/jquery.form.js (revision 6561)
+++ wp-includes/js/jquery/jquery.form.js (working copy)
@@ -1,15 +1,16 @@
/*
- * jQuery form plugin
- * @requires jQuery v1.0.3
+ * jQuery Form Plugin
+ * version: 2.02 (12/16/2007)
+ * @requires jQuery v1.1 or later
*
+ * Examples at: http://malsup.com/jquery/form/
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html
*
* Revision: $Id$
- * Version: 0.9
*/
-
+ (function($) {
/**
* ajaxSubmit() provides a mechanism for submitting an HTML form using AJAX.
*
@@ -26,15 +27,14 @@
* url: URL to which the form data will be submitted.
* default value: value of form's 'action' attribute
*
- * method: @deprecated use 'type'
* type: The method in which the form data should be submitted, 'GET' or 'POST'.
* default value: value of form's 'method' attribute (or 'GET' if none found)
*
- * before: @deprecated use 'beforeSubmit'
+ * data: Additional data to add to the request, specified as key/value pairs (see $.ajax).
+ *
* beforeSubmit: Callback method to be invoked before the form is submitted.
* default value: null
*
- * after: @deprecated use 'success'
* success: Callback method to be invoked after the form has been successfully submitted
* and the response has been returned from the server
* default value: null
@@ -66,10 +66,10 @@
* The dataType option provides a means for specifying how the server response should be handled.
* This maps directly to the jQuery.httpData method. The following values are supported:
*
- * 'xml': if dataType == 'xml' the server response is treated as XML and the 'after'
+ * 'xml': if dataType == 'xml' the server response is treated as XML and the 'success'
* callback method, if specified, will be passed the responseXML value
* 'json': if dataType == 'json' the server response will be evaluted and passed to
- * the 'after' callback, if specified
+ * the 'success' callback, if specified
* 'script': if dataType == 'script' the server response is evaluated in the global context
*
*
@@ -175,34 +175,38 @@
* @param options object literal containing options which control the form submission process
* @cat Plugins/Form
* @return jQuery
- * @see formToArray
- * @see ajaxForm
- * @see $.ajax
- * @author jQuery Community
*/
-jQuery.fn.ajaxSubmit = function(options) {
+$.fn.ajaxSubmit = function(options) {
if (typeof options == 'function')
options = { success: options };
- options = jQuery.extend({
- url: this.attr('action') || '',
- method: this.attr('method') || 'GET'
+ options = $.extend({
+ url: this.attr('action') || window.location.toString(),
+ type: this.attr('method') || 'GET'
}, options || {});
- // remap deprecated options (temporarily)
- options.success = options.success || options.after;
- options.beforeSubmit = options.beforeSubmit || options.before;
- options.type = options.type || options.method;
+ // hook for manipulating the form data before it is extracted;
+ // convenient for use with rich editors like tinyMCE or FCKEditor
+ var veto = {};
+ $.event.trigger('form.pre.serialize', [this, options, veto]);
+ if (veto.veto) return this;
var a = this.formToArray(options.semantic);
+ if (options.data) {
+ for (var n in options.data)
+ a.push( { name: n, value: options.data[n] } );
+ }
// give pre-submit callback an opportunity to abort the submit
if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) return this;
- var q = jQuery.param(a);
+ // fire vetoable 'validate' event
+ $.event.trigger('form.submit.validate', [a, this, options, veto]);
+ if (veto.veto) return this;
+ var q = $.param(a);//.replace(/%20/g,'+');
+
if (options.type.toUpperCase() == 'GET') {
- // if url already has a '?' then append args after '&'
options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
options.data = null; // data is null for 'get'
}
@@ -216,8 +220,11 @@
// perform a load on the target only if dataType is not provided
if (!options.dataType && options.target) {
var oldSuccess = options.success || function(){};
- callbacks.push(function(data, status) {
- jQuery(options.target).attr("innerHTML", data).evalScripts().each(oldSuccess, [data, status]);
+ callbacks.push(function(data) {
+ if (this.evalScripts)
+ $(options.target).attr("innerHTML", data).evalScripts().each(oldSuccess, arguments);
+ else // jQuery v1.1.4
+ $(options.target).html(data).each(oldSuccess, arguments);
});
}
else if (options.success)
@@ -225,12 +232,151 @@
options.success = function(data, status) {
for (var i=0, max=callbacks.length; i < max; i++)
- callbacks[i](data, status);
+ callbacks[i](data, status, $form);
};
- jQuery.ajax(options);
+ // are there files to upload?
+ var files = $('input:file', this).fieldValue();
+ var found = false;
+ for (var j=0; j < files.length; j++)
+ if (files[j])
+ found = true;
+
+ // options.iframe allows user to force iframe mode
+ if (options.iframe || found) {
+ // hack to fix Safari hang (thanks to Tim Molendijk for this)
+ // see: http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+ if ($.browser.safari && options.closeKeepAlive)
+ $.get(options.closeKeepAlive, fileUpload);
+ else
+ fileUpload();
+ }
+ else
+ $.ajax(options);
+
+ // fire 'notify' event
+ $.event.trigger('form.submit.notify', [this, options]);
return this;
+
+
+ // private function for handling file uploads (hat tip to YAHOO!)
+ function fileUpload() {
+ var form = $form[0];
+ var opts = $.extend({}, $.ajaxSettings, options);
+
+ var id = 'jqFormIO' + $.fn.ajaxSubmit.counter++;
+ var $io = $('');
+ var io = $io[0];
+ var op8 = $.browser.opera && window.opera.version() < 9;
+ if ($.browser.msie || op8) io.src = 'javascript:false;document.write("");';
+ $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+
+ var xhr = { // mock object
+ responseText: null,
+ responseXML: null,
+ status: 0,
+ statusText: 'n/a',
+ getAllResponseHeaders: function() {},
+ getResponseHeader: function() {},
+ setRequestHeader: function() {}
+ };
+
+ var g = opts.global;
+ // trigger ajax global events so that activity/block indicators work like normal
+ if (g && ! $.active++) $.event.trigger("ajaxStart");
+ if (g) $.event.trigger("ajaxSend", [xhr, opts]);
+
+ var cbInvoked = 0;
+ var timedOut = 0;
+
+ // take a breath so that pending repaints get some cpu time before the upload starts
+ setTimeout(function() {
+ // make sure form attrs are set
+ var encAttr = form.encoding ? 'encoding' : 'enctype';
+ var t = $form.attr('target');
+ $form.attr({
+ target: id,
+ method: 'POST',
+ action: opts.url
+ });
+ form[encAttr] = 'multipart/form-data';
+
+ // support timout
+ if (opts.timeout)
+ setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
+
+ // add iframe to doc and submit the form
+ $io.appendTo('body');
+ io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
+ form.submit();
+ $form.attr('target', t); // reset target
+ }, 10);
+
+ function cb() {
+ if (cbInvoked++) return;
+
+ io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
+
+ var ok = true;
+ try {
+ if (timedOut) throw 'timeout';
+ // extract the server response from the iframe
+ var data, doc;
+ doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
+ xhr.responseText = doc.body ? doc.body.innerHTML : null;
+ xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+
+ if (opts.dataType == 'json' || opts.dataType == 'script') {
+ var ta = doc.getElementsByTagName('textarea')[0];
+ data = ta ? ta.value : xhr.responseText;
+ if (opts.dataType == 'json')
+ eval("data = " + data);
+ else
+ $.globalEval(data);
+ }
+ else if (opts.dataType == 'xml') {
+ data = xhr.responseXML;
+ if (!data && xhr.responseText != null)
+ data = toXml(xhr.responseText);
+ }
+ else {
+ data = xhr.responseText;
+ }
+ }
+ catch(e){
+ ok = false;
+ $.handleError(opts, xhr, 'error', e);
+ }
+
+ // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+ if (ok) {
+ opts.success(data, 'success');
+ if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
+ }
+ if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
+ if (g && ! --$.active) $.event.trigger("ajaxStop");
+ if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
+
+ // clean up
+ setTimeout(function() {
+ $io.remove();
+ xhr.responseXML = null;
+ }, 100);
+ };
+
+ function toXml(s, doc) {
+ if (window.ActiveXObject) {
+ doc = new ActiveXObject('Microsoft.XMLDOM');
+ doc.async = 'false';
+ doc.loadXML(s);
+ }
+ else
+ doc = (new DOMParser()).parseFromString(s, 'text/xml');
+ return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
+ };
+ };
};
+$.fn.ajaxSubmit.counter = 0; // used to create unique iframe ids
/**
* ajaxForm() provides a mechanism for fully automating form submission.
@@ -289,40 +435,64 @@
* @return jQuery
* @cat Plugins/Form
* @type jQuery
- * @see ajaxSubmit
- * @author jQuery Community
*/
-jQuery.fn.ajaxForm = function(options) {
- return this.each(function() {
- jQuery("input:submit,input:image,button:submit", this).click(function(ev) {
- var $form = this.form;
- $form.clk = this;
- if (this.type == 'image') {
- if (ev.offsetX != undefined) {
- $form.clk_x = ev.offsetX;
- $form.clk_y = ev.offsetY;
- } else if (typeof jQuery.fn.offset == 'function') { // try to use dimensions plugin
- var offset = jQuery(this).offset();
- $form.clk_x = ev.pageX - offset.left;
- $form.clk_y = ev.pageY - offset.top;
- } else {
- $form.clk_x = ev.pageX - this.offsetLeft;
- $form.clk_y = ev.pageY - this.offsetTop;
- }
- }
- // clear form vars
- setTimeout(function() {
- $form.clk = $form.clk_x = $form.clk_y = null;
- }, 10);
- })
- }).submit(function(e) {
- jQuery(this).ajaxSubmit(options);
- return false;
+$.fn.ajaxForm = function(options) {
+ return this.ajaxFormUnbind().submit(submitHandler).each(function() {
+ // store options in hash
+ this.formPluginId = $.fn.ajaxForm.counter++;
+ $.fn.ajaxForm.optionHash[this.formPluginId] = options;
+ $(":submit,input:image", this).click(clickHandler);
});
};
+$.fn.ajaxForm.counter = 1;
+$.fn.ajaxForm.optionHash = {};
+function clickHandler(e) {
+ var $form = this.form;
+ $form.clk = this;
+ if (this.type == 'image') {
+ if (e.offsetX != undefined) {
+ $form.clk_x = e.offsetX;
+ $form.clk_y = e.offsetY;
+ } else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+ var offset = $(this).offset();
+ $form.clk_x = e.pageX - offset.left;
+ $form.clk_y = e.pageY - offset.top;
+ } else {
+ $form.clk_x = e.pageX - this.offsetLeft;
+ $form.clk_y = e.pageY - this.offsetTop;
+ }
+ }
+ // clear form vars
+ setTimeout(function() { $form.clk = $form.clk_x = $form.clk_y = null; }, 10);
+};
+
+function submitHandler() {
+ // retrieve options from hash
+ var id = this.formPluginId;
+ var options = $.fn.ajaxForm.optionHash[id];
+ $(this).ajaxSubmit(options);
+ return false;
+};
+
/**
+ * ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+ *
+ * @name ajaxFormUnbind
+ * @return jQuery
+ * @cat Plugins/Form
+ * @type jQuery
+ */
+$.fn.ajaxFormUnbind = function() {
+ this.unbind('submit', submitHandler);
+ return this.each(function() {
+ $(":submit,input:image", this).unbind('click', clickHandler);
+ });
+
+};
+
+/**
* formToArray() gathers form element data into an array of objects that can
* be passed to any of the following ajax functions: $.get, $.post, or load.
* Each object in the array has both a 'name' and 'value' property. An example of
@@ -347,11 +517,8 @@
* @param semantic true if serialization must maintain strict semantic ordering of elements (slower)
* @type Array