summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel Catchpole2014-04-23 10:10:16 +0100
committerNathaniel Catchpole2014-04-23 10:10:16 +0100
commitc39598105fded28f7bfedc78734c1ccde9a9bc9e (patch)
treeec8822072893a52bc9916f7ca5f39531bb5b831d
parent4e8713299993549a0841095dfb4ed8aebb72f903 (diff)
Issue #1574560 by andypost, Rajendar Reddy: Update jQuery Form Plugin to the latest in the git repository.8.0-alpha11
-rw-r--r--core/assets/vendor/jquery-form/jquery.form.js190
-rw-r--r--core/core.libraries.yml3
2 files changed, 136 insertions, 57 deletions
diff --git a/core/assets/vendor/jquery-form/jquery.form.js b/core/assets/vendor/jquery-form/jquery.form.js
index 8ca137a..92e0e1f 100644
--- a/core/assets/vendor/jquery-form/jquery.form.js
+++ b/core/assets/vendor/jquery-form/jquery.form.js
@@ -1,7 +1,7 @@
/*!
* jQuery Form Plugin
- * version: 3.39.0-2013.07.31
- * @requires jQuery v1.5 or later
+ * version: 3.50.0-2014.02.05
+ * 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
@@ -9,7 +9,20 @@
* https://github.com/malsup/form#copyright-and-license
*/
/*global ActiveXObject */
-;(function($) {
+
+// AMD support
+(function (factory) {
+ "use strict";
+ if (typeof define === 'function' && define.amd) {
+ // using AMD; register as anon module
+ define(['jquery'], factory);
+ } else {
+ // no AMD; invoke directly
+ factory( (typeof(jQuery) != 'undefined') ? jQuery : window.Zepto );
+ }
+}
+
+(function($) {
"use strict";
/*
@@ -63,11 +76,13 @@ var hasProp = !!$.fn.prop;
// contains inputs with names like "action" or "method"; in those
// cases "prop" returns the element
$.fn.attr2 = function() {
- if ( ! hasProp )
+ if ( ! hasProp ) {
return this.attr.apply(this, arguments);
+ }
var val = this.prop.apply(this, arguments);
- if ( ( val && val.jquery ) || typeof val === 'string' )
+ if ( ( val && val.jquery ) || typeof val === 'string' ) {
return val;
+ }
return this.attr.apply(this, arguments);
};
@@ -209,7 +224,7 @@ $.fn.ajaxSubmit = function(options) {
// [value] (issue #113), also see comment:
// https://github.com/malsup/form/commit/588306aedba1de01388032d5f42a60159eea9228#commitcomment-2180219
- var fileInputs = $('input[type=file]:enabled:not([value=""])', this);
+ var fileInputs = $('input[type=file]:enabled', this).filter(function() { return $(this).val() !== ''; });
var hasFileInputs = fileInputs.length > 0;
var mp = 'multipart/form-data';
@@ -245,8 +260,9 @@ $.fn.ajaxSubmit = function(options) {
$form.removeData('jqxhr').data('jqxhr', jqxhr);
// clear element array
- for (var k=0; k < elements.length; k++)
+ for (var k=0; k < elements.length; k++) {
elements[k] = null;
+ }
// fire 'notify' event
this.trigger('form-submit-notify', [this, options]);
@@ -278,9 +294,11 @@ $.fn.ajaxSubmit = function(options) {
if (options.extraData) {
var serializedData = deepSerialize(options.extraData);
- for (i=0; i < serializedData.length; i++)
- if (serializedData[i])
+ for (i=0; i < serializedData.length; i++) {
+ if (serializedData[i]) {
formdata.append(serializedData[i][0], serializedData[i][1]);
+ }
+ }
}
options.data = null;
@@ -312,11 +330,18 @@ $.fn.ajaxSubmit = function(options) {
}
s.data = null;
- var beforeSend = s.beforeSend;
- s.beforeSend = function(xhr, o) {
+ var beforeSend = s.beforeSend;
+ s.beforeSend = function(xhr, o) {
+ //Send FormData() provided by user
+ if (options.formData) {
+ o.data = options.formData;
+ }
+ else {
o.data = formdata;
- if(beforeSend)
- beforeSend.call(this, xhr, o);
+ }
+ if(beforeSend) {
+ beforeSend.call(this, xhr, o);
+ }
};
return $.ajax(s);
}
@@ -335,10 +360,12 @@ $.fn.ajaxSubmit = function(options) {
// ensure that every serialized input is still enabled
for (i=0; i < elements.length; i++) {
el = $(elements[i]);
- if ( hasProp )
+ if ( hasProp ) {
el.prop('disabled', false);
- else
+ }
+ else {
el.removeAttr('disabled');
+ }
}
}
@@ -348,10 +375,12 @@ $.fn.ajaxSubmit = function(options) {
if (s.iframeTarget) {
$io = $(s.iframeTarget);
n = $io.attr2('name');
- if (!n)
- $io.attr2('name', id);
- else
+ if (!n) {
+ $io.attr2('name', id);
+ }
+ else {
id = n;
+ }
}
else {
$io = $('<iframe name="' + id + '" src="'+ s.iframeSrc +'" />');
@@ -383,12 +412,15 @@ $.fn.ajaxSubmit = function(options) {
$io.attr('src', s.iframeSrc); // abort op in progress
xhr.error = e;
- if (s.error)
+ if (s.error) {
s.error.call(s.context, xhr, e, status);
- if (g)
+ }
+ if (g) {
$.event.trigger("ajaxError", [xhr, s, e]);
- if (s.complete)
+ }
+ if (s.complete) {
s.complete.call(s.context, xhr, e);
+ }
}
};
@@ -475,11 +507,14 @@ $.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.attr2('target'), a = $form.attr2('action');
+ var t = $form.attr2('target'),
+ a = $form.attr2('action'),
+ mp = 'multipart/form-data',
+ et = $form.attr('enctype') || $form.attr('encoding') || mp;
// update form attrs in IE friendly way
form.setAttribute('target',id);
- if (!method) {
+ if (!method || /post/i.test(method) ) {
form.setAttribute('method', 'POST');
}
if (a != s.url) {
@@ -504,14 +539,16 @@ $.fn.ajaxSubmit = function(options) {
try {
var state = getDoc(io).readyState;
log('state = ' + state);
- if (state && state.toLowerCase() == 'uninitialized')
+ if (state && state.toLowerCase() == 'uninitialized') {
setTimeout(checkState,50);
+ }
}
catch(e) {
log('Server abort: ' , e, ' (', e.name, ')');
cb(SERVER_ABORT);
- if (timeoutHandle)
+ if (timeoutHandle) {
clearTimeout(timeoutHandle);
+ }
timeoutHandle = undefined;
}
}
@@ -539,10 +576,12 @@ $.fn.ajaxSubmit = function(options) {
if (!s.iframeTarget) {
// add iframe to doc and submit the form
$io.appendTo('body');
- if (io.attachEvent)
- io.attachEvent('onload', cb);
- else
- io.addEventListener('load', cb, false);
+ }
+ if (io.attachEvent) {
+ io.attachEvent('onload', cb);
+ }
+ else {
+ io.addEventListener('load', cb, false);
}
setTimeout(checkState,15);
@@ -557,6 +596,7 @@ $.fn.ajaxSubmit = function(options) {
finally {
// reset attrs and remove "extra" input elements
form.setAttribute('action',a);
+ form.setAttribute('enctype', et); // #380
if(t) {
form.setAttribute('target', t);
} else {
@@ -598,13 +638,16 @@ $.fn.ajaxSubmit = function(options) {
if (!doc || doc.location.href == s.iframeSrc) {
// response not received yet
- if (!timedOut)
+ if (!timedOut) {
return;
+ }
}
- if (io.detachEvent)
+ if (io.detachEvent) {
io.detachEvent('onload', cb);
- else
+ }
+ else {
io.removeEventListener('load', cb, false);
+ }
var status = 'success', errMsg;
try {
@@ -631,11 +674,12 @@ $.fn.ajaxSubmit = function(options) {
var docRoot = doc.body ? doc.body : doc.documentElement;
xhr.responseText = docRoot ? docRoot.innerHTML : null;
xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
- if (isXml)
+ if (isXml) {
s.dataType = 'xml';
+ }
xhr.getResponseHeader = function(header){
var headers = {'content-type': s.dataType};
- return headers[header];
+ return headers[header.toLowerCase()];
};
// support for XHR 'status' & 'statusText' emulation :
if (docRoot) {
@@ -695,40 +739,52 @@ $.fn.ajaxSubmit = function(options) {
// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
if (status === 'success') {
- if (s.success)
+ if (s.success) {
s.success.call(s.context, data, 'success', xhr);
+ }
deferred.resolve(xhr.responseText, 'success', xhr);
- if (g)
+ if (g) {
$.event.trigger("ajaxSuccess", [xhr, s]);
+ }
}
else if (status) {
- if (errMsg === undefined)
+ if (errMsg === undefined) {
errMsg = xhr.statusText;
- if (s.error)
+ }
+ if (s.error) {
s.error.call(s.context, xhr, status, errMsg);
+ }
deferred.reject(xhr, 'error', errMsg);
- if (g)
+ if (g) {
$.event.trigger("ajaxError", [xhr, s, errMsg]);
+ }
}
- if (g)
+ if (g) {
$.event.trigger("ajaxComplete", [xhr, s]);
+ }
if (g && ! --$.active) {
$.event.trigger("ajaxStop");
}
- if (s.complete)
+ if (s.complete) {
s.complete.call(s.context, xhr, status);
+ }
callbackProcessed = true;
- if (s.timeout)
+ if (s.timeout) {
clearTimeout(timeoutHandle);
+ }
// clean up
setTimeout(function() {
- if (!s.iframeTarget)
+ if (!s.iframeTarget) {
$io.remove();
+ }
+ else { //adding else to clean up existing iframe response.
+ $io.attr('src', s.iframeSrc);
+ }
xhr.responseXML = null;
}, 100);
}
@@ -756,8 +812,9 @@ $.fn.ajaxSubmit = function(options) {
data = xml ? xhr.responseXML : xhr.responseText;
if (xml && data.documentElement.nodeName === 'parsererror') {
- if ($.error)
+ if ($.error) {
$.error('parsererror');
+ }
}
if (s && s.dataFilter) {
data = s.dataFilter(data, type);
@@ -830,7 +887,7 @@ function doAjaxSubmit(e) {
var options = e.data;
if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
e.preventDefault();
- $(this).ajaxSubmit(options);
+ $(e.target).ajaxSubmit(options); // #365
}
}
@@ -889,8 +946,23 @@ $.fn.formToArray = function(semantic, elements) {
}
var form = this[0];
+ var formId = this.attr('id');
var els = semantic ? form.getElementsByTagName('*') : form.elements;
- if (!els) {
+ var els2;
+
+ if (els && !/MSIE [678]/.test(navigator.userAgent)) { // #390
+ els = $(els).get(); // convert to standard array
+ }
+
+ // #386; account for inputs outside the form which use the 'form' attribute
+ if ( formId ) {
+ els2 = $(':input[form=' + formId + ']').get();
+ if ( els2.length ) {
+ els = (els || []).concat(els2);
+ }
+ }
+
+ if (!els || !els.length) {
return a;
}
@@ -913,15 +985,17 @@ $.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') {
- if (elements)
+ if (elements) {
elements.push(el);
+ }
var files = el.files;
if (files.length) {
for (j=0; j < files.length; j++) {
@@ -934,8 +1008,9 @@ $.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});
}
}
@@ -1031,10 +1106,12 @@ $.fn.fieldValue = function(successful) {
if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
continue;
}
- if (v.constructor == Array)
+ if (v.constructor == Array) {
$.merge(val, v);
- else
+ }
+ else {
val.push(v);
+ }
}
return val;
};
@@ -1068,7 +1145,7 @@ $.fieldValue = function(el, successful) {
if (op.selected) {
var v = op.value;
if (!v) { // extra pain for IE...
- v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+ v = (op.attributes && op.attributes.value && !(op.attributes.value.specified)) ? op.text : op.value;
}
if (one) {
return v;
@@ -1124,8 +1201,9 @@ $.fn.clearFields = $.fn.clearInputs = function(includeHidden) {
// $('#myForm').clearForm('.special:hidden')
// the above would clean hidden inputs that have the class of 'special'
if ( (includeHidden === true && /hidden/.test(t)) ||
- (typeof includeHidden == 'string' && $(this).is(includeHidden)) )
+ (typeof includeHidden == 'string' && $(this).is(includeHidden)) ) {
this.value = '';
+ }
}
});
};
@@ -1184,8 +1262,9 @@ $.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) {
window.console.log(msg);
@@ -1195,4 +1274,5 @@ function log() {
}
}
-})( (typeof(jQuery) != 'undefined') ? jQuery : window.Zepto );
+}));
+
diff --git a/core/core.libraries.yml b/core/core.libraries.yml
index df503dc..fb13d9c 100644
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -310,12 +310,11 @@ jquery.farbtastic:
jquery.form:
remote: https://github.com/malsup/form
- version: 3.39
+ version: 3.50
js:
assets/vendor/jquery-form/jquery.form.js: {}
dependencies:
- core/jquery
- - core/jquery.cookie
jquery.intrinsic:
version: VERSION