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

[Jifty commits]

Author: sartak
Date: Thu Aug 13 21:37:03 2009
New Revision: 7382

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

Log:
I don't think we actually need this logic, the <script> only fires when
it is stuffed onto the page

Modified: jifty/trunk/lib/Jifty/Request.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Request.pm	(original)
+++ jifty/trunk/lib/Jifty/Request.pm	Thu Aug 13 21:37:03 2009
@@ -4,7 +4,7 @@
 package Jifty::Request;
 
 use base qw/Jifty::Object Class::Accessor::Fast/;
-__PACKAGE__->mk_accessors(qw(_top_request arguments template_arguments just_validating path continuation_id future_continuation_id continuation_type continuation_path request_method preloading_region));
+__PACKAGE__->mk_accessors(qw(_top_request arguments template_arguments just_validating path continuation_id future_continuation_id continuation_type continuation_path request_method));
 
 use Jifty::JSON;
 use Jifty::YAML;
@@ -124,8 +124,6 @@
     my $ct   = $ENV{"CONTENT_TYPE"};
     my $data = $cgi->param('POSTDATA');
 
-    $self->preloading_region($ENV{"HTTP_X_JIFTY_PRELOADINGREGION"});
-
     # Check it for something appropriate
     if ($data) {
         if ($ct =~ m{^text/x-json}) {

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:37:03 2009
@@ -748,15 +748,6 @@
 
     return if !@preloaded;
 
-    # If we're inside a preloaded region, then we don't want to preload any
-    # other regions. Otherwise you could get into a cycle where you're always
-    # preloading the same set of regions. So we set it up so that when this
-    # preloaded region is put into the page, it will preload its child regions.
-    if (Jifty->web->request->preloading_region) {
-        my $region = Jifty->web->current_region->qualified_name;
-        return;
-    }
-
     my $preload_json = Jifty::JSON::objToJson(
         { fragments   => \@preloaded },
         { 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:37:03 2009
@@ -1527,10 +1527,7 @@
             hide_wait_message: 1,
             preload: 1,
             actions: [],
-            fragments: [fragment],
-            headers: {
-                'X-Jifty-PreloadingRegion': 1
-            }
+            fragments: [fragment]
         }, trigger);
     }
 }