window_rails 0.1.1 → 0.1.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== v0.1.2
+* Add rake task for install
+* Pull window content from reference to prevent writing content multiple times
+
 == v0.1.1
 * Proper rails loading when included via gem
 * Fix for window jumping when constraints applied

data/README.rdoc

@@ -13,6 +13,17 @@ After install, add these in the head of your application.html.erb file:
   
 Alphacube is the default theme used by window_rails. Be sure to add the css link if you plan on using other themes.
 
+=== Gem based installs
+
+Gem based installs (bundler) will need to run the install task. For rails versions < 3 the task
+must be added to the Rakefile:
+
+  require 'window_rails/tasks'
+
+Then run the install:
+
+  rake window_rails:install
+
 === Basic examples to get you started
 
 ==== Linking to a window

data/init.rb

@@ -1 +1,8 @@
-require 'window_rails'
+require 'window_rails/window_rails_view'
+require 'window_rails/window_rails_generators'
+
+# Load everything into rails
+if(defined? Rails)
+  ActionView::Base.send :include, WindowRailsView
+  ActionView::Helpers::PrototypeHelper::JavaScriptGenerator::GeneratorMethods.send :include, WindowRailsGenerators
+end

data/lib/window_rails.rb

@@ -1,9 +1 @@
-require 'window_rails/window_rails_view'
-require 'window_rails/window_rails_generators'
-
-# Load everything into rails
-if(defined? Rails)
-  ActionView::Base.send :include, WindowRailsView
-  ActionView::Helpers::PrototypeHelper::JavaScriptGenerator::GeneratorMethods.send :include, WindowRailsGenerators
-  require File.join(File.dirname(File.expand_path(__FILE__)), '..', 'install.rb') # Always included in case we are gem'ed
-end
+require 'window_rails/version'

data/lib/window_rails/tasks.rb

@@ -0,0 +1,7 @@
+namespace :window_rails  do 
+  desc 'Install required library items'
+  task :install do
+    require File.join(File.dirname(__FILE__), '..', '..', 'install.rb')
+  end
+end
+

data/lib/window_rails/version.rb

@@ -1,3 +1,3 @@
 module WindowRails
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/window_rails/window_rails_generators.rb

@@ -37,7 +37,7 @@ module WindowRailsGenerators
     self << "Dialog.setInfoMessage('#{escape_javascript(msg)}');"
   end
   
-  # content:: Updated content
+  # key:: Key of updated contents
   # options:: Hash of options
   #   * window -> Name of the window to update (defaults to last window)
   #   * error -> Show error if window is not found (defaults false)
@@ -45,13 +45,10 @@ module WindowRailsGenerators
   # be placed into the window. If it is a Hash, it will be fed to render and the
   # result will be placed in the window (basically an easy way to integrate partials:
   # page.update_window(:partial => 'my_parital'))
-  def update_window(content, options={})
+  def update_window(key, options={})
     win = options.delete(:window)
     error = options.delete(:error)
-    if(content.is_a?(Hash))
-      content = render(content)
-    end
-    self << check_for_window(win, error){ update_window_contents(content, win) }
+    self << check_for_window(win, error){ update_window_contents(key, win) }
   end
   
   # name:: Name of the window
@@ -76,15 +73,15 @@ module WindowRailsGenerators
     self << "}"
   end
   
-  # content:: String content
+  # key:: Content key location
   # win:: Name of window
   # Updates the contents of the window. If no window name is provided, the topmost window
   # will be updated
-  def update_window_contents(content, win=nil)
+  def update_window_contents(key, win=nil)
     unless(win.blank?)
-      self << "Windows.getWindowByName('#{escape_javascript(win)}').setHTMLContent('#{escape_javascript(content)}');"
+      self << "Windows.getWindowByName('#{escape_javascript(win)}').setHTMLContent(window_rails_contents.get('#{key}'));"
     else
-      self << "Windows.windows.values().last().setHTMLContent('#{escape_javascript(content)}');"
+      self << "Windows.windows.values().last().setHTMLContent(window_rails_contents.get('#{key}'));"
     end
   end
 
@@ -98,19 +95,15 @@ module WindowRailsGenerators
     end
   end
 
-  # content:: String content
+  # key:: Content key location
   # win:: Name of window
   # options:: Options to be passed onto window
   # Creates a new window. Generally this should not be called,
   # rather #open_window should be used
-  def create_window(content, win, options)
+  def create_window(key, win, options)
     self << "var myWin = new Window({#{options.map{|k,v|"#{escape_javascript(k.to_s)}:'#{escape_javascript(v.to_s)}'"}.join(', ')}});"
     self << "Windows.registerByName('#{escape_javascript(win)}', myWin);" unless win.blank?
-    if(content.is_a?(Hash) && content[:url])
-      self << "myWin.setAjaxContent('#{escape_javascript(content[:url])}');"
-    elsif(!content.blank?)
-      self << "myWin.setHTMLContent('#{escape_javascript(content.to_s)}');"
-    end
+    self << "myWin.setHTMLContent(window_rails_contents.get('#{key}'));"
     self << "myWin.setCloseCallback(function(win){ win.destroy(); return true; });"
   end
   
@@ -180,20 +173,20 @@ module WindowRailsGenerators
     end
     options[:width] ||= 300
     options[:height] ||= 200
-    output = []
+    key = store_content(content)
     if(no_update)
-      create_window(content, win, options)
+      create_window(key, win, options)
       unless(constraints == false)
         apply_window_constraints(win, constraints)
       end
       show_window(win, modal)
     else
       check_for_window(win, false) do
-        update_window_contents(content, win)
+        update_window_contents(key, win)
         focus_window(win)
       end
       else_block do
-        create_window(content, win, options)
+        create_window(key, win, options)
         unless(constraints == false)
           apply_window_constraints(win, constraints)
         end
@@ -201,6 +194,15 @@ module WindowRailsGenerators
       end
     end
   end
+
+  def store_content(content)
+    self << "if(typeof(window_rails_contents) == 'undefined'){ var window_rails_contents = new Hash(); }"
+    key = rand.to_s
+    key.slice!(0,2)
+    c = content.is_a?(Hash) ? render(content) : content.to_s
+    self << "window_rails_contents.set('#{key}', '#{escape_javascript(c)}')"
+    key
+  end
   
   # options:: Hash of options
   #   * :window -> name of window to close
@@ -249,4 +251,4 @@ module WindowRailsGenerators
     self << "if($('#{escape_javascript(field_id.to_s)}')){ $('#{escape_javascript(field_id.to_s)}').observe('change', #{f}); }"
   end
   
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: window_rails
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Chris Roberts
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 -08:00
+date: 2011-01-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -223,6 +223,7 @@ files:
 - files/themes/alert.css
 - lib/window_rails.rb
 - lib/window_rails/version.rb
+- lib/window_rails/tasks.rb
 - lib/window_rails/window_rails_view.rb
 - lib/window_rails/window_rails_generators.rb
 has_rdoc: true