Update JQuery Form to version 3.50

application/controllers/SaisieController.php

@@ -324,7 +324,7 @@ class SaisieController extends Zend_Controller_Action
 	{
 		$this->view->headScript()
 			->appendFile('/themes/default/scripts/saisie.js', 'text/javascript')
-			->appendFile('/libs/form/jquery.form.js', 'text/javascript');
+			->appendFile('/libs/form/jquery.form.min.js', 'text/javascript');
 
 		$request = $this->getRequest();
 		$siret = $request->getParam('siret');
@@ -1003,7 +1003,7 @@ class SaisieController extends Zend_Controller_Action
 		//Affichage formulaire
 		} else {
 
-			$this->view->inlineScript()->appendFile('/libs/form/jquery.form.js');
+			$this->view->inlineScript()->appendFile('/libs/form/jquery.form.min.js');
 			if ( intval($siren)==0 ) {
 				$session = new Scores_Session_Entreprise();
 				$siren = '';

application/views/default/scripts/dashboard/newform.phtml

@@ -16,23 +16,22 @@ Fichier PDF : <input type="file" name="fichier" />
 <input type="submit" name="upload" value="Valider" />
 </form>
 <div id="uploadOutput"></div>
-<script type="text/javascript" src="/libs/form/jquery.form.js">
+<script type="text/javascript" src="/libs/form/jquery.form.min.js"/>
-</script>
 <script>
 var timer;
 
 function checkProgress() {
-	$.getJSON('<?=$this->url(array('controller'=>'dashboard', 'action'=>'newprogress'))?>', 
+	$.getJSON('<?=$this->url(array('controller'=>'dashboard', 'action'=>'newprogress'))?>',
-		{key: $('#key').val()}, function(data) { 
+		{key: $('#key').val()}, function(data) {
 			$('#uploadOutput').html(data.current+'/'+data.total);
 	});
 }
 
-$(document).ready(function() { 
+$(document).ready(function() {
 	$('#uploadForm').ajaxForm({
 	    beforeSubmit: function() {
 	    	$('#uploadOutput').html('Envoi en cours...');
-	    	timer = setInterval(checkProgress,500); 
+	    	timer = setInterval(checkProgress,500);
 	    },
 	    success: function(data) {
 	    	clearInterval(timer);

application/views/default/scripts/evaluation/customindiscore3.phtml

@@ -49,7 +49,7 @@
 </table>
 </form>
 </div>
-<script type="text/javascript" src="/libs/form/jquery.form.js"></script>
+<script type="text/javascript" src="/libs/form/jquery.form.min.js"/>
 <script>
 $('#uploadForm').ajaxForm({
 	beforeSubmit: function() {

application/views/default/scripts/finance/saisiebilan-upload.phtml

@@ -41,7 +41,7 @@ Votre fichier : <input type="file" name="fichier" />
 </form>
 <div id="progressbar"></div>
 <div id="uploadOutput"></div>
-<script type="text/javascript" src="/libs/form/jquery.form.js" />
+<script type="text/javascript" src="/libs/form/jquery.form.min.js"/>
 <script>
 $('#uploadForm').ajaxForm({
     beforeSubmit: function() {

application/views/default/scripts/saisie/annoncedialog.phtml

@@ -85,7 +85,7 @@ $('select[name="even[]"]').change(function(){
 
 <?php }?>
 
-<script type="text/javascript" src="/libs/form/jquery.form.js"></script>
+<script type="text/javascript" src="/libs/form/jquery.form.min.js"></script>
 <script>
 $('form#saisie').bind('submit', function(){
 	var options = {

application/views/default/scripts/saisie/liendoc.phtml

@@ -97,7 +97,7 @@ Liste des documents Infogreffe
 </form>
 </div>
 
-<script type="text/javascript" src="/libs/form/jquery.form.js"></script>
+<script type="text/javascript" src="/libs/form/jquery.form.min.js"/>
 <script>
 $.datepicker.setDefaults( $.datepicker.regional["fr"] );
 $('input[name=fileDate]').datepicker({ changeMonth: true, changeYear: true });

public/libs/form/jquery.form.js

@@ -1,6 +1,6 @@
 /*!
  * jQuery Form Plugin
- * version: 3.46.0-2013.11.21
+ * 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/
@@ -12,6 +12,7 @@
 
 // AMD support
 (function (factory) {
+    "use strict";
     if (typeof define === 'function' && define.amd) {
         // using AMD; register as anon module
         define(['jquery'], factory);
@@ -75,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);
 };
 
@@ -257,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]);
@@ -290,9 +294,11 @@ $.fn.ajaxSubmit = function(options) {
 
         if (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]);
+                }
+            }
         }
 
         options.data = null;
@@ -327,12 +333,15 @@ $.fn.ajaxSubmit = function(options) {
         var beforeSend = s.beforeSend;
         s.beforeSend = function(xhr, o) {
             //Send FormData() provided by user
-            if (options.formData)
+            if (options.formData) {
                 o.data = options.formData;
-            else
+            }
+            else {
                 o.data = formdata;
-            if(beforeSend)
+            }
+            if(beforeSend) {
                 beforeSend.call(this, xhr, o);
+            }
         };
         return $.ajax(s);
     }
@@ -351,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');
+                }
             }
         }
 
@@ -364,10 +375,12 @@ $.fn.ajaxSubmit = function(options) {
         if (s.iframeTarget) {
             $io = $(s.iframeTarget);
             n = $io.attr2('name');
-            if (!n)
+            if (!n) {
-                 $io.attr2('name', id);
+                $io.attr2('name', id);
-            else
+            }
+            else {
                 id = n;
+            }
         }
         else {
             $io = $('<iframe name="' + id + '" src="'+ s.iframeSrc +'" />');
@@ -399,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);
+                }
             }
         };
 
@@ -491,7 +507,10 @@ $.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);
@@ -520,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;
                 }
             }
@@ -556,10 +577,12 @@ $.fn.ajaxSubmit = function(options) {
                     // add iframe to doc and submit the form
                     $io.appendTo('body');
                 }
-                if (io.attachEvent)
+                if (io.attachEvent) {
                     io.attachEvent('onload', cb);
-                else
+                }
+                else {
                     io.addEventListener('load', cb, false);
+                }
                 setTimeout(checkState,15);
 
                 try {
@@ -573,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 {
@@ -614,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 {
@@ -647,8 +674,9 @@ $.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.toLowerCase()];
@@ -711,42 +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.
+                }
+                else { //adding else to clean up existing iframe response.
                     $io.attr('src', s.iframeSrc);
+                }
                 xhr.responseXML = null;
             }, 100);
         }
@@ -774,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);
@@ -907,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;
     }
 
@@ -931,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++) {
@@ -952,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});
         }
     }
@@ -1049,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;
 };
@@ -1086,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;
@@ -1142,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 = '';
+            }
         }
     });
 };
@@ -1202,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);