[Jifty-commit] r722 - in jifty/trunk: lib/Jifty/Web/Form share/web/static/js

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Tue Mar 21 12:35:32 EST 2006


Author: alexmv
Date: Tue Mar 21 12:35:32 2006
New Revision: 722

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Web/Form/Element.pm
   jifty/trunk/share/web/static/js/jifty.js

Log:
 r11752 at zoq-fot-pik:  chmrr | 2006-03-21 12:35:24 -0500
  * Revert changes that were supposed to force full submit for upload
 fields, but were breaking all AJAX submits


Modified: jifty/trunk/lib/Jifty/Web/Form/Element.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Element.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form/Element.pm	Tue Mar 21 12:35:32 2006
@@ -181,7 +181,8 @@
 
             push @fragments, \%args;
         }
-        $response .= qq| $trigger="update( @{[ Jifty::JSON::objToJson( {actions => \@actions, fragments => \@fragments }, {singlequote => 1}) ]} ) "|;
+        $response .= qq| $trigger="update( @{[ Jifty::JSON::objToJson( {actions => \@actions, fragments => \@fragments }, {singlequote => 1}) ]} );|;
+        $response .= qq|return false;"|;
     }
     return $response;
 }

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	Tue Mar 21 12:35:32 2006
@@ -378,11 +378,8 @@
     for (var i = 0; i < named_args['actions'].length; i++) {
         var moniker = named_args['actions'][i];
         var a = new Action(moniker);
-        if (a.register) {
-            if (a.hasUpload)
-                return true;
+        if (a.register)
             request['actions'][moniker] = a.data_structure();
-        }
     }
 
     request['fragments'] = {};
@@ -529,7 +526,6 @@
     new Ajax.Request(document.URL,
                      options
                     );
-    return false;
 }
 
 function trace( msg ){


More information about the Jifty-commit mailing list