[Jifty-commit] r1336 - jifty/trunk/share/web/static/js

[jifty-commit at lists.jifty.org]

Author: nelhage
Date: Wed Jun 21 14:10:16 2006
New Revision: 1336

Modified:
   jifty/trunk/share/web/static/js/jifty.js

Log:
Javascript AJAX action submits now do action folding in the same way
CGI requests do.


Modified: jifty/trunk/share/web/static/js/jifty.js
==============================================================================
--- jifty/trunk/share/web/static/js/jifty.js	(original)
+++ jifty/trunk/share/web/static/js/jifty.js	Wed Jun 21 14:10:16 2006
@@ -113,16 +113,32 @@
         for (var i = 0; i < fields.length; i++) {
             var f = fields[i];
 
-            if ((Form.Element.getType(f) != "registration") && (Form.Element.getValue(f) != null)) {
+            if (   (Form.Element.getType(f) != "registration")
+		&& (Form.Element.getValue(f) != null)) {
                 if (! a['fields'][Form.Element.getField(f)])
                     a['fields'][Form.Element.getField(f)] = {};
-                a['fields'][Form.Element.getField(f)][Form.Element.getType(f)] = Form.Element.getValue(f);
+		var field = Form.Element.getField(f);
+		var type = Form.Element.getType(f);
+		    
+                a['fields'][field][type] = this._mergeValues(a['fields'][field][type],
+							     Form.Element.getValue(f));
             }
         }
 
         return a;
     },
 
+    _mergeValues: function() {
+	var oldval = arguments[0];
+	var newval = arguments[1];
+	if(!oldval) return newval;
+	if(oldval.constructor != Array) {
+	    oldval = [oldval];
+	}
+	oldval.push(newval);
+	return oldval;
+    },
+
     // Validate the action
     validate: function() {
         show_wait_message();