[Jifty-commit] r7390 - in jifty/trunk: share/web/static/js

[Jifty commits]

Author: sartak
Date: Thu Aug 13 21:38:24 2009
New Revision: 7390

Modified:
   jifty/trunk/lib/Jifty/Web/Form/Element.pm
   jifty/trunk/lib/Jifty/Web/Form/Field.pm
   jifty/trunk/share/web/static/js/jifty.js

Log:
Differentiate between preload and preload_key

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	Thu Aug 13 21:38:24 2009
@@ -420,7 +420,7 @@
         my $confirm;
         my $beforeclick;
         my $action_arguments = {};
-        my $preload;
+        my $preload_key;
 
         for my $hook (grep {ref $_ eq "HASH"} (@{$value})) {
             my %args;
@@ -497,7 +497,7 @@
             $args{toggle} = 1 if $hook->{toggle};
 
             # Preloading functionality
-            $preload = $hook->{preload} if $hook->{preload};
+            $preload_key = $hook->{preload} if $hook->{preload};
 
             # Effects
             $args{$_} = $hook->{$_} for grep {exists $hook->{$_}} qw/effect effect_args remove_effect remove_effect_args/;
@@ -512,7 +512,7 @@
             action_arguments => $action_arguments,
             confirm          => $confirm,
             beforeclick      => $beforeclick,
-            preload          => $preload,
+            preload_key      => $preload_key,
         };
     }
 
@@ -547,7 +547,7 @@
                     action_arguments => $trigger_structure->{action_arguments},
                     fragments    => $fragments,
                     continuation => $self->continuation,
-                    preload      => $trigger_structure->{preload},
+                    preload_key  => $trigger_structure->{preload_key},
                 },
                 { singlequote => 1 },
             );

Modified: jifty/trunk/lib/Jifty/Web/Form/Field.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Field.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form/Field.pm	Thu Aug 13 21:38:24 2009
@@ -734,14 +734,14 @@
     my $self = shift;
 
     my $structure = $self->_javascript_attrs_structure;
-    return unless $structure->{preload};
+    return unless $structure->{preload_key};
 
     my @preloaded;
 
     my $preload_json = Jifty::JSON::objToJson(
         {
-            fragments => $structure->{fragments},
-            preload   => $structure->{preload},
+            fragments   => $structure->{fragments},
+            preload_key => $structure->{preload_key},
         },
         { singlequote => 1 },
     );

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	Thu Aug 13 21:38:24 2009
@@ -1085,6 +1085,7 @@
 //  - 'continuation' is ??? Please document me
 //  - 'hide_wait_message' for when you don't want to see it
 //  - 'preload' this request is preloading regions
+//  - 'preload_key' the cache key for using preloaded regions
 //  - 'headers' is a hash of headers to send in this request
 //  - 'fragments' is an array of hashes, which may have:
 //     - 'region' is the name of the region to update
@@ -1303,7 +1304,7 @@
     // fields, with the app connecting to the database, etc.
     var onSuccess = function(responseXML) {
         if (named_args['preload']) {
-            Jifty.preloaded_regions[ named_args['preload'] ] = responseXML;
+            Jifty.preloaded_regions[ named_args['preload_key'] ] = responseXML;
             return;
         }
 
@@ -1474,9 +1475,9 @@
         })
     }
 
-    if (Jifty.preloaded_regions[ named_args['preload'] ]) {
-        var faux_response = Jifty.preloaded_regions[ named_args['preload'] ];
-        delete Jifty.preloaded_regions[ named_args['preload'] ];
+    if (Jifty.preloaded_regions[ named_args['preload'_key] ]) {
+        var faux_response = Jifty.preloaded_regions[ named_args['preload_key'] ];
+        delete Jifty.preloaded_regions[ named_args['preload_key'] ];
         onSuccess(faux_response);
         return;
     }
@@ -1520,9 +1521,10 @@
 
 Jifty.preloaded_regions = {};
 
-Jifty.preload = function (named_args, trigger) {
-    var args = named_args.clone();
+Jifty.preload = function (orig_args, trigger) {
+    var args = orig_args.clone();
     args.hide_wait_message = 1;
+    args.preload = 1;
     args.actions = [];
 
     Jifty.update(args, trigger);