Merge branch 'master' into 1.0.x

[quix0rs-gnu-social.git] / js / jquery.form.js

diff --git a/js/jquery.form.js b/js/jquery.form.js
index d9266bd6436a3423c944a9ce7d5814d3af7f250b..936b847abe7bedc9ae44cf68cc75a48b1b94bf5c 100644 (file)
--- a/js/jquery.form.js
+++ b/js/jquery.form.js
@@ -1,6 +1,6 @@
 /*\r
  * jQuery Form Plugin\r
- * version: 2.12 (06/07/2008)\r
+ * version: 2.17 (06-NOV-2008)\r
  * @requires jQuery v1.2.2 or later\r
  *\r
  * Examples and documentation at: http://malsup.com/jquery/form/\r
@@ -10,7 +10,7 @@
  *\r
  * Revision: $Id$\r
  */\r
-(function($) {\r
+;(function($) {\r
 \r
 /*\r
     Usage Note:  \r
@@ -67,13 +67,25 @@ $.fn.ajaxSubmit = function(options) {
     if (veto.veto) {\r
         log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');\r
         return this;\r
-   }\r
+    }\r
 \r
+    // provide opportunity to alter form data before it is serialized\r
+    if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {\r
+        log('ajaxSubmit: submit aborted via beforeSerialize callback');\r
+        return this;\r
+    }    \r
+   \r
     var a = this.formToArray(options.semantic);\r
     if (options.data) {\r
         options.extraData = options.data;\r
-        for (var n in options.data)\r
-            a.push( { name: n, value: options.data[n] } );\r
+        for (var n in options.data) {\r
+          if(options.data[n] instanceof Array) {\r
+            for (var k in options.data[n])\r
+              a.push( { name: n, value: options.data[n][k] } )\r
+          }  \r
+          else\r
+             a.push( { name: n, value: options.data[n] } );\r
+        }\r
     }\r
 \r
     // give pre-submit callback an opportunity to abort the submit\r
@@ -114,7 +126,7 @@ $.fn.ajaxSubmit = function(options) {
 \r
     options.success = function(data, status) {\r
         for (var i=0, max=callbacks.length; i < max; i++)\r
-            callbacks[i](data, status, $form);\r
+            callbacks[i].apply(options, [data, status, $form]);\r
     };\r
 \r
     // are there files to upload?\r
@@ -145,12 +157,13 @@ $.fn.ajaxSubmit = function(options) {
     function fileUpload() {\r
         var form = $form[0];\r
         \r
-        if ($(':input[@name=submit]', form).length) {\r
+        if ($(':input[name=submit]', form).length) {\r
             alert('Error: Form elements must not be named "submit".');\r
             return;\r
         }\r
         \r
         var opts = $.extend({}, $.ajaxSettings, options);\r
+               var s = jQuery.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);\r
 \r
         var id = 'jqFormIO' + (new Date().getTime());\r
         var $io = $('<iframe id="' + id + '" name="' + id + '" />');\r
@@ -161,13 +174,18 @@ $.fn.ajaxSubmit = function(options) {
         $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });\r
 \r
         var xhr = { // mock object\r
+            aborted: 0,\r
             responseText: null,\r
             responseXML: null,\r
             status: 0,\r
             statusText: 'n/a',\r
             getAllResponseHeaders: function() {},\r
             getResponseHeader: function() {},\r
-            setRequestHeader: function() {}\r
+            setRequestHeader: function() {},\r
+            abort: function() { \r
+                this.aborted = 1; \r
+                $io.attr('src','about:blank'); // abort op in progress\r
+            }\r
         };\r
 \r
         var g = opts.global;\r
@@ -175,6 +193,13 @@ $.fn.ajaxSubmit = function(options) {
         if (g && ! $.active++) $.event.trigger("ajaxStart");\r
         if (g) $.event.trigger("ajaxSend", [xhr, opts]);\r
 \r
+               if (s.beforeSend && s.beforeSend(xhr, s) === false) {\r
+                       s.global && jQuery.active--;\r
+                       return;\r
+        }\r
+        if (xhr.aborted)\r
+            return;\r
+        \r
         var cbInvoked = 0;\r
         var timedOut = 0;\r
 \r
@@ -191,18 +216,24 @@ $.fn.ajaxSubmit = function(options) {
                 }\r
             }\r
         }\r
-        \r
+\r
         // take a breath so that pending repaints get some cpu time before the upload starts\r
         setTimeout(function() {\r
             // make sure form attrs are set\r
             var t = $form.attr('target'), a = $form.attr('action');\r
             $form.attr({\r
                 target:   id,\r
-                encoding: 'multipart/form-data',\r
-                enctype:  'multipart/form-data',\r
                 method:   'POST',\r
                 action:   opts.url\r
             });\r
+            \r
+            // ie borks in some cases when setting encoding\r
+            if (! options.skipEncodingOverride) {\r
+                $form.attr({\r
+                    encoding: 'multipart/form-data',\r
+                    enctype:  'multipart/form-data'\r
+                });\r
+            }\r
 \r
             // support timout\r
             if (opts.timeout)\r
@@ -325,23 +356,23 @@ $.fn.ajaxForm = function(options) {
     }).each(function() {\r
         // store options in hash\r
         $(":submit,input:image", this).bind('click.form-plugin',function(e) {\r
-            var $form = this.form;\r
-            $form.clk = this;\r
+            var form = this.form;\r
+            form.clk = this;\r
             if (this.type == 'image') {\r
                 if (e.offsetX != undefined) {\r
-                    $form.clk_x = e.offsetX;\r
-                    $form.clk_y = e.offsetY;\r
+                    form.clk_x = e.offsetX;\r
+                    form.clk_y = e.offsetY;\r
                 } else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin\r
                     var offset = $(this).offset();\r
-                    $form.clk_x = e.pageX - offset.left;\r
-                    $form.clk_y = e.pageY - offset.top;\r
+                    form.clk_x = e.pageX - offset.left;\r
+                    form.clk_y = e.pageY - offset.top;\r
                 } else {\r
-                    $form.clk_x = e.pageX - this.offsetLeft;\r
-                    $form.clk_y = e.pageY - this.offsetTop;\r
+                    form.clk_x = e.pageX - this.offsetLeft;\r
+                    form.clk_y = e.pageY - this.offsetTop;\r
                 }\r
             }\r
             // clear form vars\r
-            setTimeout(function() { $form.clk = $form.clk_x = $form.clk_y = null; }, 10);\r
+            setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 10);\r
         });\r
     });\r
 };\r
@@ -539,7 +570,7 @@ $.fn.clearForm = function() {
 $.fn.clearFields = $.fn.clearInputs = function() {\r
     return this.each(function() {\r
         var t = this.type, tag = this.tagName.toLowerCase();\r
-        if (t == 'text' || t == 'password' || tag == 'textarea')\r
+        if (t == 'file' || t == 'text' || t == 'password' || tag == 'textarea')\r
             this.value = '';\r
         else if (t == 'checkbox' || t == 'radio')\r
             this.checked = false;\r
@@ -574,7 +605,7 @@ $.fn.enable = function(b) {
  * Checks/unchecks any matching checkboxes or radio buttons and\r
  * selects/deselects and matching option elements.\r
  */\r
-$.fn.select = function(select) {\r
+$.fn.selected = function(select) {\r
     if (select == undefined) select = true;\r
     return this.each(function() { \r
         var t = this.type;\r
@@ -584,7 +615,7 @@ $.fn.select = function(select) {
             var $sel = $(this).parent('select');\r
             if (select && $sel[0] && $sel[0].type == 'select-one') {\r
                 // deselect all other options\r
-                $sel.find('option').select(false);\r
+                $sel.find('option').selected(false);\r
             }\r
             this.selected = select;\r
         }\r