redbox can use RJS

jadehopepunk · Dec 18, 2007 · a642932 · a642932
1 parent dec3e37
commit a642932
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/javascripts/redbox.js b/javascripts/redbox.js
@@ -19,6 +19,11 @@ var RedBox = {
   {
     this.removeChildrenFromNode($('RB_window'));
     this.moveChildren($(id), $('RB_window'));
+    this.activateRBWindow();
+  },
+
+  activateRBWindow: function()
+  {
     Element.hide('RB_loading');
     new Effect.Appear('RB_window', {duration: 0.4, queue: 'end'});  
     this.setWindowPosition();

diff --git a/lib/redbox_helper.rb b/lib/redbox_helper.rb
@@ -64,9 +64,13 @@ def build_hidden_content(hidden_content_id)
   end
 
   def redbox_remote_options(remote_options, hidden_content_id)
-    remote_options[:update] = hidden_content_id
-    remote_options[:loading] = "RedBox.loading(); " + remote_options[:loading].to_s
-    remote_options[:complete] = "RedBox.addHiddenContent('#{hidden_content_id}'); " + remote_options[:complete].to_s
+    remote_options[:update] = hidden_content_id unless remote_options.key?(:update)
+    remote_options[:loading] = "RedBox.loading();" + remote_options[:loading].to_s
+    if remote_options[:update]
+      remote_options[:complete] = "RedBox.addHiddenContent('#{hidden_content_id}'); " + remote_options[:complete].to_s
+    else
+      remote_options[:complete] = "RedBox.activateRBWindow(); " + remote_options[:complete].to_s
+    end
     remote_options
   end