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

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Mon Mar 27 20:08:36 2006
New Revision: 747

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

Log:
 r11904 at zoq-fot-pik:  chmrr | 2006-03-27 20:08:26 -0500
  * AJAX file upload fixes, for real this time


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	Mon Mar 27 20:08:36 2006
@@ -181,8 +181,7 @@
 
             push @fragments, \%args;
         }
-        $response .= qq| $trigger="update( @{[ Jifty::JSON::objToJson( {actions => \@actions, fragments => \@fragments }, {singlequote => 1}) ]} );|;
-        $response .= qq|return false;"|;
+        $response .= qq| $trigger="return update( @{[ Jifty::JSON::objToJson( {actions => \@actions, fragments => \@fragments }, {singlequote => 1}) ]} ) "|;
     }
     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	Mon Mar 27 20:08:36 2006
@@ -54,7 +54,7 @@
     hasUpload: function() {
         var fields = this.fields();
         for (var i = 0; i < fields.length; i++) {
-            if (fields[i].getAttribute("type") == "file")
+            if ((fields[i].getAttribute("type") == "file") && fields[i].value)
                 return true;
         }
         return false;
@@ -378,8 +378,11 @@
     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.register) {
+            if (a.hasUpload())
+                return true;
             request['actions'][moniker] = a.data_structure();
+        }
     }
 
     request['fragments'] = {};
@@ -526,6 +529,7 @@
     new Ajax.Request(document.URL,
                      options
                     );
+    return false;
 }
 
 function trace( msg ){