mack-javascript 0.8.2 → 0.8.3

data/lib/mack-javascript/view_helpers/html_helpers.rb

@@ -21,7 +21,7 @@ module Mack
       end
       
       def link_to_remote(link_text, ajax_options, options = {})
-        link_to_function(link_text, remote_function(ajax_options), options)
+        link_to_function(link_text, ajax(ajax_options), options)
       end
       
       def link_to_function(link_text, *args, &block)
@@ -33,12 +33,14 @@ module Mack
       end
       
       # Returns javascript that does an Ajax call
-      def remote_function(options)
-        Mack::JavaScript::ScriptGenerator.framework.remote_function(options)
+      def ajax(options)
+        Mack::JavaScript::ScriptGenerator.new(session.id).ajax(options).to_s
       end
       
+      alias_deprecated_method :remote_function, :ajax, '0.8.3', '>=0.8.4'
+      
       def js
-        Mack::JavaScript::ScriptGenerator.new
+        Mack::JavaScript::ScriptGenerator.new(session.id)
       end
       
       # Returns a button that links to a remote function. 
@@ -48,10 +50,21 @@ module Mack
       def button_to_remote(value = "Submit", options = {}, *original_args)
         with = options.delete(:with) || 'Form.serialize(this.form)'
         url = options.delete(:url) || '#'
-        options[:onclick] = remote_function(:with => with, :url => url) + '; return false'
+        options[:onclick] = ajax(:with => with, :url => url) + '; return false'
         submit_button(value, options, *original_args)
       end
       
+      def form_remote(action, options = {}, &block)
+        options[:form] = true
+        options[:url] = action
+        options[:html] ||= {}
+        options[:html][:onsubmit] = 
+          (options[:html][:onsubmit] ? options[:html][:onsubmit] + "; " : "") + 
+          "#{ajax(options)}; return false;"
+
+        form(action, options[:html], &block)
+      end
+      
     end
   end
 end

data/lib/mack-javascript.rb

@@ -24,16 +24,7 @@ dir_globs.each do |d|
 end
 
 if configatron.mack.js_framework
-  case configatron.mack.js_framework.to_s
-    when 'prototype'
-      file_list = ["controls.js", "dragdrop.js", "effects.js", "prototype.js"]
-    when 'jquery'
-      file_list = ["jquery.js", "jquery-ui.js", "jquery-fx.js"]
-  end
-  
-  file_list.each do |file|
-    assets_mgr.defaults do |a|
-      a.add_js file
-    end
+  assets_mgr.defaults do |a|
+    a.add_js "#{configatron.mack.js_framework.to_s}.js"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-javascript
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Gerardo Pis-Lopez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-30 00:00:00 -05:00
+date: 2009-01-18 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -62,11 +62,6 @@ files:
 - lib/mack-javascript/generators/manifest.yml
 - lib/mack-javascript/generators/templates
 - lib/mack-javascript/generators/templates/javascripts
-- lib/mack-javascript/generators/templates/javascripts/controls.js.template
-- lib/mack-javascript/generators/templates/javascripts/dragdrop.js.template
-- lib/mack-javascript/generators/templates/javascripts/effects.js.template
-- lib/mack-javascript/generators/templates/javascripts/jquery-fx.js.template
-- lib/mack-javascript/generators/templates/javascripts/jquery-ui.js.template
 - lib/mack-javascript/generators/templates/javascripts/jquery.js.template
 - lib/mack-javascript/generators/templates/javascripts/prototype.js.template
 - lib/mack-javascript/helpers