Commit c3959810 authored by catch's avatar catch
Browse files

Issue #1574560 by andypost, Rajendar Reddy: Update jQuery Form Plugin to the...

Issue #1574560 by andypost, Rajendar Reddy: Update jQuery Form Plugin to the latest in the git repository.
parent 4e871329
/*! /*!
* jQuery Form Plugin * jQuery Form Plugin
* version: 3.39.0-2013.07.31 * version: 3.50.0-2014.02.05
* @requires jQuery v1.5 or later * Requires jQuery v1.5 or later
* Copyright (c) 2013 M. Alsup * Copyright (c) 2013 M. Alsup
* Examples and documentation at: http://malsup.com/jquery/form/ * Examples and documentation at: http://malsup.com/jquery/form/
* Project repository: https://github.com/malsup/form * Project repository: https://github.com/malsup/form
...@@ -9,7 +9,20 @@ ...@@ -9,7 +9,20 @@
* https://github.com/malsup/form#copyright-and-license * https://github.com/malsup/form#copyright-and-license
*/ */
/*global ActiveXObject */ /*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"; "use strict";
/* /*
...@@ -63,11 +76,13 @@ var hasProp = !!$.fn.prop; ...@@ -63,11 +76,13 @@ var hasProp = !!$.fn.prop;
// contains inputs with names like "action" or "method"; in those // contains inputs with names like "action" or "method"; in those
// cases "prop" returns the element // cases "prop" returns the element
$.fn.attr2 = function() { $.fn.attr2 = function() {
if ( ! hasProp ) if ( ! hasProp ) {
return this.attr.apply(this, arguments); return this.attr.apply(this, arguments);
}
var val = this.prop.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 val;
}
return this.attr.apply(this, arguments); return this.attr.apply(this, arguments);
}; };
...@@ -209,7 +224,7 @@ $.fn.ajaxSubmit = function(options) { ...@@ -209,7 +224,7 @@ $.fn.ajaxSubmit = function(options) {
// [value] (issue #113), also see comment: // [value] (issue #113), also see comment:
// https://github.com/malsup/form/commit/588306aedba1de01388032d5f42a60159eea9228#commitcomment-2180219 // 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 hasFileInputs = fileInputs.length > 0;
var mp = 'multipart/form-data'; var mp = 'multipart/form-data';
...@@ -245,8 +260,9 @@ $.fn.ajaxSubmit = function(options) { ...@@ -245,8 +260,9 @@ $.fn.ajaxSubmit = function(options) {
$form.removeData('jqxhr').data('jqxhr', jqxhr); $form.removeData('jqxhr').data('jqxhr', jqxhr);
// clear element array // clear element array
for (var k=0; k < elements.length; k++) for (var k=0; k < elements.length; k++) {
elements[k] = null; elements[k] = null;
}
// fire 'notify' event // fire 'notify' event
this.trigger('form-submit-notify', [this, options]); this.trigger('form-submit-notify', [this, options]);
...@@ -278,9 +294,11 @@ $.fn.ajaxSubmit = function(options) { ...@@ -278,9 +294,11 @@ $.fn.ajaxSubmit = function(options) {
if (options.extraData) { if (options.extraData) {
var serializedData = deepSerialize(options.extraData); var serializedData = deepSerialize(options.extraData);
for (i=0; i < serializedData.length; i++) for (i=0; i < serializedData.length; i++) {
if (serializedData[i]) if (serializedData[i]) {
formdata.append(serializedData[i][0], serializedData[i][1]); formdata.append(serializedData[i][0], serializedData[i][1]);
}
}
} }
options.data = null; options.data = null;
...@@ -312,11 +330,18 @@ $.fn.ajaxSubmit = function(options) { ...@@ -312,11 +330,18 @@ $.fn.ajaxSubmit = function(options) {
} }
s.data = null; s.data = null;
var beforeSend = s.beforeSend; var beforeSend = s.beforeSend;
s.beforeSend = function(xhr, o) { s.beforeSend = function(xhr, o) {
//Send FormData() provided by user
if (options.formData) {
o.data = options.formData;
}
else {
o.data = formdata; o.data = formdata;
if(beforeSend) }
beforeSend.call(this, xhr, o); if(beforeSend) {
beforeSend.call(this, xhr, o);
}
}; };
return $.ajax(s); return $.ajax(s);
} }
...@@ -335,10 +360,12 @@ $.fn.ajaxSubmit = function(options) { ...@@ -335,10 +360,12 @@ $.fn.ajaxSubmit = function(options) {
// ensure that every serialized input is still enabled // ensure that every serialized input is still enabled
for (i=0; i < elements.length; i++) { for (i=0; i < elements.length; i++) {
el = $(elements[i]); el = $(elements[i]);
if ( hasProp ) if ( hasProp ) {
el.prop('disabled', false); el.prop('disabled', false);
else }
else {
el.removeAttr('disabled'); el.removeAttr('disabled');
}
} }
} }
...@@ -348,10 +375,12 @@ $.fn.ajaxSubmit = function(options) { ...@@ -348,10 +375,12 @@ $.fn.ajaxSubmit = function(options) {
if (s.iframeTarget) { if (s.iframeTarget) {
$io = $(s.iframeTarget); $io = $(s.iframeTarget);
n = $io.attr2('name'); n = $io.attr2('name');
if (!n) if (!n) {
$io.attr2('name', id); $io.attr2('name', id);
else }
else {
id = n; id = n;
}
} }
else { else {
$io = $('<iframe name="' + id + '" src="'+ s.iframeSrc +'" />'); $io = $('<iframe name="' + id + '" src="'+ s.iframeSrc +'" />');
...@@ -383,12 +412,15 @@ $.fn.ajaxSubmit = function(options) { ...@@ -383,12 +412,15 @@ $.fn.ajaxSubmit = function(options) {
$io.attr('src', s.iframeSrc); // abort op in progress $io.attr('src', s.iframeSrc); // abort op in progress
xhr.error = e; xhr.error = e;
if (s.error) if (s.error) {
s.error.call(s.context, xhr, e, status); s.error.call(s.context, xhr, e, status);
if (g) }
if (g) {
$.event.trigger("ajaxError", [xhr, s, e]); $.event.trigger("ajaxError", [xhr, s, e]);
if (s.complete) }
if (s.complete) {
s.complete.call(s.context, xhr, e); s.complete.call(s.context, xhr, e);
}
} }
}; };
...@@ -475,11 +507,14 @@ $.fn.ajaxSubmit = function(options) { ...@@ -475,11 +507,14 @@ $.fn.ajaxSubmit = function(options) {
// take a breath so that pending repaints get some cpu time before the upload starts // take a breath so that pending repaints get some cpu time before the upload starts
function doSubmit() { function doSubmit() {
// make sure form attrs are set // 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 // update form attrs in IE friendly way
form.setAttribute('target',id); form.setAttribute('target',id);
if (!method) { if (!method || /post/i.test(method) ) {
form.setAttribute('method', 'POST'); form.setAttribute('method', 'POST');
} }
if (a != s.url) { if (a != s.url) {
...@@ -504,14 +539,16 @@ $.fn.ajaxSubmit = function(options) { ...@@ -504,14 +539,16 @@ $.fn.ajaxSubmit = function(options) {
try { try {
var state = getDoc(io).readyState; var state = getDoc(io).readyState;
log('state = ' + state); log('state = ' + state);
if (state && state.toLowerCase() == 'uninitialized') if (state && state.toLowerCase() == 'uninitialized') {
setTimeout(checkState,50); setTimeout(checkState,50);
}
} }
catch(e) { catch(e) {
log('Server abort: ' , e, ' (', e.name, ')'); log('Server abort: ' , e, ' (', e.name, ')');
cb(SERVER_ABORT); cb(SERVER_ABORT);
if (timeoutHandle) if (timeoutHandle) {
clearTimeout(timeoutHandle); clearTimeout(timeoutHandle);
}
timeoutHandle = undefined; timeoutHandle = undefined;
} }
} }
...@@ -539,10 +576,12 @@ $.fn.ajaxSubmit = function(options) { ...@@ -539,10 +576,12 @@ $.fn.ajaxSubmit = function(options) {
if (!s.iframeTarget) { if (!s.iframeTarget) {
// add iframe to doc and submit the form // add iframe to doc and submit the form
$io.appendTo('body'); $io.appendTo('body');
if (io.attachEvent) }
io.attachEvent('onload', cb); if (io.attachEvent) {
else io.attachEvent('onload', cb);
io.addEventListener('load', cb, false); }
else {
io.addEventListener('load', cb, false);
} }
setTimeout(checkState,15); setTimeout(checkState,15);
...@@ -557,6 +596,7 @@ $.fn.ajaxSubmit = function(options) { ...@@ -557,6 +596,7 @@ $.fn.ajaxSubmit = function(options) {
finally { finally {
// reset attrs and remove "extra" input elements // reset attrs and remove "extra" input elements
form.setAttribute('action',a); form.setAttribute('action',a);
form.setAttribute('enctype', et); // #380
if(t) { if(t) {
form.setAttribute('target', t); form.setAttribute('target', t);
} else { } else {
...@@ -598,13 +638,16 @@ $.fn.ajaxSubmit = function(options) { ...@@ -598,13 +638,16 @@ $.fn.ajaxSubmit = function(options) {
if (!doc || doc.location.href == s.iframeSrc) { if (!doc || doc.location.href == s.iframeSrc) {
// response not received yet // response not received yet
if (!timedOut) if (!timedOut) {
return; return;
}
} }
if (io.detachEvent) if (io.detachEvent) {
io.detachEvent('onload', cb); io.detachEvent('onload', cb);
else }
else {
io.removeEventListener('load', cb, false); io.removeEventListener('load', cb, false);
}
var status = 'success', errMsg; var status = 'success', errMsg;
try { try {
...@@ -631,11 +674,12 @@ $.fn.ajaxSubmit = function(options) { ...@@ -631,11 +674,12 @@ $.fn.ajaxSubmit = function(options) {
var docRoot = doc.body ? doc.body : doc.documentElement; var docRoot = doc.body ? doc.body : doc.documentElement;
xhr.responseText = docRoot ? docRoot.innerHTML : null; xhr.responseText = docRoot ? docRoot.innerHTML : null;
xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc; xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
if (isXml) if (isXml) {
s.dataType = 'xml'; s.dataType = 'xml';
}
xhr.getResponseHeader = function(header){ xhr.getResponseHeader = function(header){
var headers = {'content-type': s.dataType}; var headers = {'content-type': s.dataType};
return headers[header]; return headers[header.toLowerCase()];
}; };
// support for XHR 'status' & 'statusText' emulation : // support for XHR 'status' & 'statusText' emulation :
if (docRoot) { if (docRoot) {
...@@ -695,40 +739,52 @@ $.fn.ajaxSubmit = function(options) { ...@@ -695,40 +739,52 @@ $.fn.ajaxSubmit = function(options) {
// ordering of these callbacks/triggers is odd, but that's how $.ajax does it // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
if (status === 'success') { if (status === 'success') {
if (s.success) if (s.success) {
s.success.call(s.context, data, 'success', xhr); s.success.call(s.context, data, 'success', xhr);
}
deferred.resolve(xhr.responseText, 'success', xhr); deferred.resolve(xhr.responseText, 'success', xhr);
if (g) if (g) {
$.event.trigger("ajaxSuccess", [xhr, s]); $.event.trigger("ajaxSuccess", [xhr, s]);
}
} }
else if (status) { else if (status) {
if (errMsg === undefined) if (errMsg === undefined) {
errMsg = xhr.statusText; errMsg = xhr.statusText;
if (s.error) }
if (s.error) {
s.error.call(s.context, xhr, status, errMsg); s.error.call(s.context, xhr, status, errMsg);
}
deferred.reject(xhr, 'error', errMsg); deferred.reject(xhr, 'error', errMsg);
if (g) if (g) {
$.event.trigger("ajaxError", [xhr, s, errMsg]); $.event.trigger("ajaxError", [xhr, s, errMsg]);
}
} }
if (g) if (g) {
$.event.trigger("ajaxComplete", [xhr, s]); $.event.trigger("ajaxComplete", [xhr, s]);
}
if (g && ! --$.active) { if (g && ! --$.active) {
$.event.trigger("ajaxStop"); $.event.trigger("ajaxStop");
} }
if (s.complete) if (s.complete) {
s.complete.call(s.context, xhr, status); s.complete.call(s.context, xhr, status);
}
callbackProcessed = true; callbackProcessed = true;
if (s.timeout) if (s.timeout) {
clearTimeout(timeoutHandle); clearTimeout(timeoutHandle);
}
// clean up // clean up
setTimeout(function() { setTimeout(function() {
if (!s.iframeTarget) if (!s.iframeTarget) {
$io.remove(); $io.remove();
}
else { //adding else to clean up existing iframe response.
$io.attr('src', s.iframeSrc);
}
xhr.responseXML = null; xhr.responseXML = null;
}, 100); }, 100);
} }
...@@ -756,8 +812,9 @@ $.fn.ajaxSubmit = function(options) { ...@@ -756,8 +812,9 @@ $.fn.ajaxSubmit = function(options) {
data = xml ? xhr.responseXML : xhr.responseText; data = xml ? xhr.responseXML : xhr.responseText;
if (xml && data.documentElement.nodeName === 'parsererror') { if (xml && data.documentElement.nodeName === 'parsererror') {
if ($.error) if ($.error) {
$.error('parsererror'); $.error('parsererror');
}
} }
if (s && s.dataFilter) { if (s && s.dataFilter) {
data = s.dataFilter(data, type); data = s.dataFilter(data, type);
...@@ -830,7 +887,7 @@ function doAjaxSubmit(e) { ...@@ -830,7 +887,7 @@ function doAjaxSubmit(e) {
var options = e.data; var options = e.data;
if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
e.preventDefault(); e.preventDefault();
$(this).ajaxSubmit(options); $(e.target).ajaxSubmit(options); // #365
} }
} }
...@@ -889,8 +946,23 @@ $.fn.formToArray = function(semantic, elements) { ...@@ -889,8 +946,23 @@ $.fn.formToArray = function(semantic, elements) {
} }
var form = this[0]; var form = this[0];
var formId = this.attr('id');
var els = semantic ? form.getElementsByTagName('*') : form.elements; 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; return a;
} }
...@@ -913,15 +985,17 @@ $.fn.formToArray = function(semantic, elements) { ...@@ -913,15 +985,17 @@ $.fn.formToArray = function(semantic, elements) {
v = $.fieldValue(el, true); v = $.fieldValue(el, true);
if (v && v.constructor == Array) { if (v && v.constructor == Array) {
if (elements) if (elements) {
elements.push(el); elements.push(el);
}
for(j=0, jmax=v.length; j < jmax; j++) { for(j=0, jmax=v.length; j < jmax; j++) {
a.push({name: n, value: v[j]}); a.push({name: n, value: v[j]});
} }
} }
else if (feature.fileapi && el.type == 'file') { else if (feature.fileapi && el.type == 'file') {
if (elements) if (elements) {
elements.push(el); elements.push(el);
}
var files = el.files; var files = el.files;
if (files.length) { if (files.length) {
for (j=0; j < files.length; j++) { for (j=0; j < files.length; j++) {
...@@ -934,8 +1008,9 @@ $.fn.formToArray = function(semantic, elements) { ...@@ -934,8 +1008,9 @@ $.fn.formToArray = function(semantic, elements) {
} }
} }
else if (v !== null && typeof v != 'undefined') { else if (v !== null && typeof v != 'undefined') {
if (elements) if (elements) {
elements.push(el); elements.push(el);
}
a.push({name: n, value: v, type: el.type, required: el.required}); a.push({name: n, value: v, type: el.type, required: el.required});
} }
} }
...@@ -1031,10 +1106,12 @@ $.fn.fieldValue = function(successful) { ...@@ -1031,10 +1106,12 @@ $.fn.fieldValue = function(successful) {
if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) { if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
continue; continue;
} }
if (v.constructor == Array) if (v.constructor == Array) {
$.merge(val, v); $.merge(val, v);
else }
else {
val.push(v); val.push(v);
}
} }
return val; return val;
}; };
...@@ -1068,7 +1145,7 @@ $.fieldValue = function(el, successful) { ...@@ -1068,7 +1145,7 @@ $.fieldValue = function(el, successful) {
if (op.selected) { if (op.selected) {
var v = op.value; var v = op.value;
if (!v) { // extra pain for IE... 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) { if (one) {
return v; return v;
...@@ -1124,8 +1201,9 @@ $.fn.clearFields = $.fn.clearInputs = function(includeHidden) { ...@@ -1124,8 +1201,9 @@ $.fn.clearFields = $.fn.clearInputs = function(includeHidden) {
// $('#myForm').clearForm('.special:hidden') // $('#myForm').clearForm('.special:hidden')
// the above would clean hidden inputs that have the class of 'special' // the above would clean hidden inputs that have the class of 'special'
if ( (includeHidden === true && /hidden/.test(t)) || if ( (includeHidden === true && /hidden/.test(t)) ||
(typeof includeHidden == 'string' && $(this).is(includeHidden)) ) (typeof includeHidden == 'string' && $(this).is(includeHidden)) ) {
this.value = ''; this.value = '';
}
} }
}); });
}; };
...@@ -1184,8 +1262,9 @@ $.fn.ajaxSubmit.debug = false; ...@@ -1184,8 +1262,9 @@ $.fn.ajaxSubmit.debug = false;
// helper fn for console logging // helper fn for console logging
function log() { function log() {
if (!$.fn.ajaxSubmit.debug) if (!$.fn.ajaxSubmit.debug) {
return; return;
}
var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,''); var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');