issue #0001669 : Update jquery.form to version 3.37
This commit is contained in:
Michael RICOIS
parent
03a3af275e
commit
799ec45164
@ -1,15 +1,14 @@
|
||||
/*!
|
||||
* jQuery Form Plugin
|
||||
* version: 3.18 (28-SEP-2012)
|
||||
* version: 3.37.0-2013.07.11
|
||||
* @requires jQuery v1.5 or later
|
||||
*
|
||||
* Copyright (c) 2013 M. Alsup
|
||||
* Examples and documentation at: http://malsup.com/jquery/form/
|
||||
* Project repository: https://github.com/malsup/form
|
||||
* Dual licensed under the MIT and GPL licenses:
|
||||
* http://malsup.github.com/mit-license.txt
|
||||
* http://malsup.github.com/gpl-license-v2.txt
|
||||
* Dual licensed under the MIT and GPL licenses.
|
||||
* https://github.com/malsup/form#copyright-and-license
|
||||
*/
|
||||
/*global ActiveXObject alert */
|
||||
/*global ActiveXObject */
|
||||
;(function($) {
|
||||
"use strict";
|
||||
|
||||
@ -37,7 +36,7 @@
|
||||
target: '#output'
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
You can also use ajaxForm with delegation (requires jQuery v1.7+), so the
|
||||
form does not have to exist when you invoke ajaxForm:
|
||||
|
||||
@ -45,7 +44,7 @@
|
||||
delegation: true,
|
||||
target: '#output'
|
||||
});
|
||||
|
||||
|
||||
When using ajaxForm, the ajaxSubmit function will be invoked for you
|
||||
at the appropriate time.
|
||||
*/
|
||||
@ -57,6 +56,21 @@ var feature = {};
|
||||
feature.fileapi = $("<input type='file'/>").get(0).files !== undefined;
|
||||
feature.formdata = window.FormData !== undefined;
|
||||
|
||||
var hasProp = !!$.fn.prop;
|
||||
|
||||
// attr2 uses prop when it can but checks the return type for
|
||||
// an expected string. this accounts for the case where a form
|
||||
// contains inputs with names like "action" or "method"; in those
|
||||
// cases "prop" returns the element
|
||||
$.fn.attr2 = function() {
|
||||
if ( ! hasProp )
|
||||
return this.attr.apply(this, arguments);
|
||||
var val = this.prop.apply(this, arguments);
|
||||
if ( ( val && val.jquery ) || typeof val === 'string' )
|
||||
return val;
|
||||
return this.attr.apply(this, arguments);
|
||||
};
|
||||
|
||||
/**
|
||||
* ajaxSubmit() provides a mechanism for immediately submitting
|
||||
* an HTML form using AJAX.
|
||||
@ -69,15 +83,19 @@ $.fn.ajaxSubmit = function(options) {
|
||||
log('ajaxSubmit: skipping submit process - no element selected');
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
var method, action, url, $form = this;
|
||||
|
||||
if (typeof options == 'function') {
|
||||
options = { success: options };
|
||||
}
|
||||
else if ( options === undefined ) {
|
||||
options = {};
|
||||
}
|
||||
|
||||
method = options.type || this.attr2('method');
|
||||
action = options.url || this.attr2('action');
|
||||
|
||||
method = this.attr('method');
|
||||
action = this.attr('action');
|
||||
url = (typeof action === 'string') ? $.trim(action) : '';
|
||||
url = url || window.location.href || '';
|
||||
if (url) {
|
||||
@ -111,7 +129,7 @@ $.fn.ajaxSubmit = function(options) {
|
||||
if ( traditional === undefined ) {
|
||||
traditional = $.ajaxSettings.traditional;
|
||||
}
|
||||
|
||||
|
||||
var elements = [];
|
||||
var qx, a = this.formToArray(options.semantic, elements);
|
||||
if (options.data) {
|
||||
@ -135,7 +153,7 @@ $.fn.ajaxSubmit = function(options) {
|
||||
var q = $.param(a, traditional);
|
||||
if (qx) {
|
||||
q = ( q ? (q + '&' + qx) : qx );
|
||||
}
|
||||
}
|
||||
if (options.type.toUpperCase() == 'GET') {
|
||||
options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
|
||||
options.data = null; // data is null for 'get'
|
||||
@ -165,14 +183,34 @@ $.fn.ajaxSubmit = function(options) {
|
||||
}
|
||||
|
||||
options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
|
||||
var context = options.context || this ; // jQuery 1.4+ supports scope context
|
||||
var context = options.context || this ; // jQuery 1.4+ supports scope context
|
||||
for (var i=0, max=callbacks.length; i < max; i++) {
|
||||
callbacks[i].apply(context, [data, status, xhr || $form, $form]);
|
||||
}
|
||||
};
|
||||
|
||||
if (options.error) {
|
||||
var oldError = options.error;
|
||||
options.error = function(xhr, status, error) {
|
||||
var context = options.context || this;
|
||||
oldError.apply(context, [xhr, status, error, $form]);
|
||||
};
|
||||
}
|
||||
|
||||
if (options.complete) {
|
||||
var oldComplete = options.complete;
|
||||
options.complete = function(xhr, status) {
|
||||
var context = options.context || this;
|
||||
oldComplete.apply(context, [xhr, status, $form]);
|
||||
};
|
||||
}
|
||||
|
||||
// are there files to upload?
|
||||
var fileInputs = $('input:file:enabled[value]', this); // [value] (issue #113)
|
||||
|
||||
// [value] (issue #113), also see comment:
|
||||
// https://github.com/malsup/form/commit/588306aedba1de01388032d5f42a60159eea9228#commitcomment-2180219
|
||||
var fileInputs = $('input[type=file]:enabled[value!=""]', this);
|
||||
|
||||
var hasFileInputs = fileInputs.length > 0;
|
||||
var mp = 'multipart/form-data';
|
||||
var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
|
||||
@ -216,13 +254,16 @@ $.fn.ajaxSubmit = function(options) {
|
||||
|
||||
// utility fn for deep serialization
|
||||
function deepSerialize(extraData){
|
||||
var serialized = $.param(extraData).split('&');
|
||||
var serialized = $.param(extraData, options.traditional).split('&');
|
||||
var len = serialized.length;
|
||||
var result = {};
|
||||
var result = [];
|
||||
var i, part;
|
||||
for (i=0; i < len; i++) {
|
||||
// #252; undo param space replacement
|
||||
serialized[i] = serialized[i].replace(/\+/g,' ');
|
||||
part = serialized[i].split('=');
|
||||
result[decodeURIComponent(part[0])] = decodeURIComponent(part[1]);
|
||||
// #278; use array instead of object storage, favoring array serializations
|
||||
result.push([decodeURIComponent(part[0]), decodeURIComponent(part[1])]);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@ -237,9 +278,9 @@ $.fn.ajaxSubmit = function(options) {
|
||||
|
||||
if (options.extraData) {
|
||||
var serializedData = deepSerialize(options.extraData);
|
||||
for (var p in serializedData)
|
||||
if (serializedData.hasOwnProperty(p))
|
||||
formdata.append(p, serializedData[p]);
|
||||
for (i=0; i < serializedData.length; i++)
|
||||
if (serializedData[i])
|
||||
formdata.append(serializedData[i][0], serializedData[i][1]);
|
||||
}
|
||||
|
||||
options.data = null;
|
||||
@ -250,13 +291,13 @@ $.fn.ajaxSubmit = function(options) {
|
||||
cache: false,
|
||||
type: method || 'POST'
|
||||
});
|
||||
|
||||
|
||||
if (options.uploadProgress) {
|
||||
// workaround because jqXHR does not expose upload property
|
||||
s.xhr = function() {
|
||||
var xhr = jQuery.ajaxSettings.xhr();
|
||||
var xhr = $.ajaxSettings.xhr();
|
||||
if (xhr.upload) {
|
||||
xhr.upload.onprogress = function(event) {
|
||||
xhr.upload.addEventListener('progress', function(event) {
|
||||
var percent = 0;
|
||||
var position = event.loaded || event.position; /*event.position is deprecated*/
|
||||
var total = event.total;
|
||||
@ -264,7 +305,7 @@ $.fn.ajaxSubmit = function(options) {
|
||||
percent = Math.ceil(position / total * 100);
|
||||
}
|
||||
options.uploadProgress(event, position, total, percent);
|
||||
};
|
||||
}, false);
|
||||
}
|
||||
return xhr;
|
||||
};
|
||||
@ -283,22 +324,13 @@ $.fn.ajaxSubmit = function(options) {
|
||||
// private function for handling file uploads (hat tip to YAHOO!)
|
||||
function fileUploadIframe(a) {
|
||||
var form = $form[0], el, i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle;
|
||||
var useProp = !!$.fn.prop;
|
||||
var deferred = $.Deferred();
|
||||
|
||||
if ($(':input[name=submit],:input[id=submit]', form).length) {
|
||||
// if there is an input with a name or id of 'submit' then we won't be
|
||||
// able to invoke the submit fn on the form (at least not x-browser)
|
||||
alert('Error: Form elements must not have name or id of "submit".');
|
||||
deferred.reject();
|
||||
return deferred;
|
||||
}
|
||||
|
||||
if (a) {
|
||||
// ensure that every serialized input is still enabled
|
||||
for (i=0; i < elements.length; i++) {
|
||||
el = $(elements[i]);
|
||||
if ( useProp )
|
||||
if ( hasProp )
|
||||
el.prop('disabled', false);
|
||||
else
|
||||
el.removeAttr('disabled');
|
||||
@ -310,9 +342,9 @@ $.fn.ajaxSubmit = function(options) {
|
||||
id = 'jqFormIO' + (new Date().getTime());
|
||||
if (s.iframeTarget) {
|
||||
$io = $(s.iframeTarget);
|
||||
n = $io.attr('name');
|
||||
n = $io.attr2('name');
|
||||
if (!n)
|
||||
$io.attr('name', id);
|
||||
$io.attr2('name', id);
|
||||
else
|
||||
id = n;
|
||||
}
|
||||
@ -336,12 +368,14 @@ $.fn.ajaxSubmit = function(options) {
|
||||
var e = (status === 'timeout' ? 'timeout' : 'aborted');
|
||||
log('aborting upload... ' + e);
|
||||
this.aborted = 1;
|
||||
// #214
|
||||
if (io.contentWindow.document.execCommand) {
|
||||
try { // #214
|
||||
|
||||
try { // #214, #257
|
||||
if (io.contentWindow.document.execCommand) {
|
||||
io.contentWindow.document.execCommand('Stop');
|
||||
} catch(ignore) {}
|
||||
}
|
||||
}
|
||||
catch(ignore) {}
|
||||
|
||||
$io.attr('src', s.iframeSrc); // abort op in progress
|
||||
xhr.error = e;
|
||||
if (s.error)
|
||||
@ -387,15 +421,44 @@ $.fn.ajaxSubmit = function(options) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
var CLIENT_TIMEOUT_ABORT = 1;
|
||||
var SERVER_ABORT = 2;
|
||||
|
||||
|
||||
function getDoc(frame) {
|
||||
var doc = frame.contentWindow ? frame.contentWindow.document : frame.contentDocument ? frame.contentDocument : frame.document;
|
||||
/* it looks like contentWindow or contentDocument do not
|
||||
* carry the protocol property in ie8, when running under ssl
|
||||
* frame.document is the only valid response document, since
|
||||
* the protocol is know but not on the other two objects. strange?
|
||||
* "Same origin policy" http://en.wikipedia.org/wiki/Same_origin_policy
|
||||
*/
|
||||
|
||||
var doc = null;
|
||||
|
||||
// IE8 cascading access check
|
||||
try {
|
||||
if (frame.contentWindow) {
|
||||
doc = frame.contentWindow.document;
|
||||
}
|
||||
} catch(err) {
|
||||
// IE8 access denied under ssl & missing protocol
|
||||
log('cannot get iframe.contentWindow document: ' + err);
|
||||
}
|
||||
|
||||
if (doc) { // successful getting content
|
||||
return doc;
|
||||
}
|
||||
|
||||
try { // simply checking may throw in ie8 under ssl or mismatched protocol
|
||||
doc = frame.contentDocument ? frame.contentDocument : frame.document;
|
||||
} catch(err) {
|
||||
// last attempt
|
||||
log('cannot get iframe.contentDocument: ' + err);
|
||||
doc = frame.document;
|
||||
}
|
||||
return doc;
|
||||
}
|
||||
|
||||
|
||||
// Rails CSRF hack (thanks to Yvan Barthelemy)
|
||||
var csrf_token = $('meta[name=csrf-token]').attr('content');
|
||||
var csrf_param = $('meta[name=csrf-param]').attr('content');
|
||||
@ -407,7 +470,7 @@ $.fn.ajaxSubmit = function(options) {
|
||||
// take a breath so that pending repaints get some cpu time before the upload starts
|
||||
function doSubmit() {
|
||||
// make sure form attrs are set
|
||||
var t = $form.attr('target'), a = $form.attr('action');
|
||||
var t = $form.attr2('target'), a = $form.attr2('action');
|
||||
|
||||
// update form attrs in IE friendly way
|
||||
form.setAttribute('target',id);
|
||||
@ -430,7 +493,7 @@ $.fn.ajaxSubmit = function(options) {
|
||||
if (s.timeout) {
|
||||
timeoutHandle = setTimeout(function() { timedOut = true; cb(CLIENT_TIMEOUT_ABORT); }, s.timeout);
|
||||
}
|
||||
|
||||
|
||||
// look for server aborts
|
||||
function checkState() {
|
||||
try {
|
||||
@ -457,11 +520,11 @@ $.fn.ajaxSubmit = function(options) {
|
||||
// if using the $.param format that allows for multiple values with the same name
|
||||
if($.isPlainObject(s.extraData[n]) && s.extraData[n].hasOwnProperty('name') && s.extraData[n].hasOwnProperty('value')) {
|
||||
extraInputs.push(
|
||||
$('<input type="hidden" name="'+s.extraData[n].name+'">').attr('value',s.extraData[n].value)
|
||||
$('<input type="hidden" name="'+s.extraData[n].name+'">').val(s.extraData[n].value)
|
||||
.appendTo(form)[0]);
|
||||
} else {
|
||||
extraInputs.push(
|
||||
$('<input type="hidden" name="'+n+'">').attr('value',s.extraData[n])
|
||||
$('<input type="hidden" name="'+n+'">').val(s.extraData[n])
|
||||
.appendTo(form)[0]);
|
||||
}
|
||||
}
|
||||
@ -477,7 +540,14 @@ $.fn.ajaxSubmit = function(options) {
|
||||
io.addEventListener('load', cb, false);
|
||||
}
|
||||
setTimeout(checkState,15);
|
||||
form.submit();
|
||||
|
||||
try {
|
||||
form.submit();
|
||||
} catch(err) {
|
||||
// just in case form has element with name/id of 'submit'
|
||||
var submitFn = document.createElement('form').submit;
|
||||
submitFn.apply(form);
|
||||
}
|
||||
}
|
||||
finally {
|
||||
// reset attrs and remove "extra" input elements
|
||||
@ -504,11 +574,10 @@ $.fn.ajaxSubmit = function(options) {
|
||||
if (xhr.aborted || callbackProcessed) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
doc = getDoc(io);
|
||||
}
|
||||
catch(ex) {
|
||||
log('cannot access response document: ', ex);
|
||||
|
||||
doc = getDoc(io);
|
||||
if(!doc) {
|
||||
log('cannot access response document');
|
||||
e = SERVER_ABORT;
|
||||
}
|
||||
if (e === CLIENT_TIMEOUT_ABORT && xhr) {
|
||||
@ -529,7 +598,7 @@ $.fn.ajaxSubmit = function(options) {
|
||||
}
|
||||
if (io.detachEvent)
|
||||
io.detachEvent('onload', cb);
|
||||
else
|
||||
else
|
||||
io.removeEventListener('load', cb, false);
|
||||
|
||||
var status = 'success', errMsg;
|
||||
@ -599,15 +668,15 @@ $.fn.ajaxSubmit = function(options) {
|
||||
try {
|
||||
data = httpData(xhr, dt, s);
|
||||
}
|
||||
catch (e) {
|
||||
catch (err) {
|
||||
status = 'parsererror';
|
||||
xhr.error = errMsg = (e || status);
|
||||
xhr.error = errMsg = (err || status);
|
||||
}
|
||||
}
|
||||
catch (e) {
|
||||
log('error caught: ',e);
|
||||
catch (err) {
|
||||
log('error caught: ',err);
|
||||
status = 'error';
|
||||
xhr.error = errMsg = (e || status);
|
||||
xhr.error = errMsg = (err || status);
|
||||
}
|
||||
|
||||
if (xhr.aborted) {
|
||||
@ -720,7 +789,7 @@ $.fn.ajaxSubmit = function(options) {
|
||||
$.fn.ajaxForm = function(options) {
|
||||
options = options || {};
|
||||
options.delegation = options.delegation && $.isFunction($.fn.on);
|
||||
|
||||
|
||||
// in jQuery 1.3+ we can fix mistakes with the ready state
|
||||
if (!options.delegation && this.length === 0) {
|
||||
var o = { s: this.selector, c: this.context };
|
||||
@ -750,7 +819,7 @@ $.fn.ajaxForm = function(options) {
|
||||
.bind('click.form-plugin', options, captureSubmittingElement);
|
||||
};
|
||||
|
||||
// private event handlers
|
||||
// private event handlers
|
||||
function doAjaxSubmit(e) {
|
||||
/*jshint validthis:true */
|
||||
var options = e.data;
|
||||
@ -759,14 +828,14 @@ function doAjaxSubmit(e) {
|
||||
$(this).ajaxSubmit(options);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function captureSubmittingElement(e) {
|
||||
/*jshint validthis:true */
|
||||
var target = e.target;
|
||||
var $el = $(target);
|
||||
if (!($el.is(":submit,input:image"))) {
|
||||
if (!($el.is("[type=submit],[type=image]"))) {
|
||||
// is this a child element of the submit el? (ex: a span within a button)
|
||||
var t = $el.closest(':submit');
|
||||
var t = $el.closest('[type=submit]');
|
||||
if (t.length === 0) {
|
||||
return;
|
||||
}
|
||||
@ -824,13 +893,13 @@ $.fn.formToArray = function(semantic, elements) {
|
||||
for(i=0, max=els.length; i < max; i++) {
|
||||
el = els[i];
|
||||
n = el.name;
|
||||
if (!n) {
|
||||
if (!n || el.disabled) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (semantic && form.clk && el.type == "image") {
|
||||
// handle image inputs on the fly when semantic == true
|
||||
if(!el.disabled && form.clk == el) {
|
||||
if(form.clk == el) {
|
||||
a.push({name: n, value: $(el).val(), type: el.type });
|
||||
a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
|
||||
}
|
||||
@ -839,14 +908,14 @@ $.fn.formToArray = function(semantic, elements) {
|
||||
|
||||
v = $.fieldValue(el, true);
|
||||
if (v && v.constructor == Array) {
|
||||
if (elements)
|
||||
if (elements)
|
||||
elements.push(el);
|
||||
for(j=0, jmax=v.length; j < jmax; j++) {
|
||||
a.push({name: n, value: v[j]});
|
||||
}
|
||||
}
|
||||
else if (feature.fileapi && el.type == 'file' && !el.disabled) {
|
||||
if (elements)
|
||||
else if (feature.fileapi && el.type == 'file') {
|
||||
if (elements)
|
||||
elements.push(el);
|
||||
var files = el.files;
|
||||
if (files.length) {
|
||||
@ -860,7 +929,7 @@ $.fn.formToArray = function(semantic, elements) {
|
||||
}
|
||||
}
|
||||
else if (v !== null && typeof v != 'undefined') {
|
||||
if (elements)
|
||||
if (elements)
|
||||
elements.push(el);
|
||||
a.push({name: n, value: v, type: el.type, required: el.required});
|
||||
}
|
||||
@ -924,19 +993,19 @@ $.fn.fieldSerialize = function(successful) {
|
||||
* <input name="C" type="radio" value="C2" />
|
||||
* </fieldset></form>
|
||||
*
|
||||
* var v = $(':text').fieldValue();
|
||||
* var v = $('input[type=text]').fieldValue();
|
||||
* // if no values are entered into the text inputs
|
||||
* v == ['','']
|
||||
* // if values entered into the text inputs are 'foo' and 'bar'
|
||||
* v == ['foo','bar']
|
||||
*
|
||||
* var v = $(':checkbox').fieldValue();
|
||||
* var v = $('input[type=checkbox]').fieldValue();
|
||||
* // if neither checkbox is checked
|
||||
* v === undefined
|
||||
* // if both checkboxes are checked
|
||||
* v == ['B1', 'B2']
|
||||
*
|
||||
* var v = $(':radio').fieldValue();
|
||||
* var v = $('input[type=radio]').fieldValue();
|
||||
* // if neither radio is checked
|
||||
* v === undefined
|
||||
* // if first radio is checked
|
||||
@ -1037,6 +1106,13 @@ $.fn.clearFields = $.fn.clearInputs = function(includeHidden) {
|
||||
else if (tag == 'select') {
|
||||
this.selectedIndex = -1;
|
||||
}
|
||||
else if (t == "file") {
|
||||
if (/MSIE/.test(navigator.userAgent)) {
|
||||
$(this).replaceWith($(this).clone(true));
|
||||
} else {
|
||||
$(this).val('');
|
||||
}
|
||||
}
|
||||
else if (includeHidden) {
|
||||
// includeHidden can be the value true, or it can be a selector string
|
||||
// indicating a special test; for example:
|
||||
@ -1103,7 +1179,7 @@ $.fn.ajaxSubmit.debug = false;
|
||||
|
||||
// helper fn for console logging
|
||||
function log() {
|
||||
if (!$.fn.ajaxSubmit.debug)
|
||||
if (!$.fn.ajaxSubmit.debug)
|
||||
return;
|
||||
var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
|
||||
if (window.console && window.console.log) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user