active_scaffold_vho 3.2.0 → 3.2.1

data/Gemfile.lock

@@ -1,82 +1,81 @@
 PATH
   remote: .
   specs:
-    active_scaffold_vho (3.1.8)
+    active_scaffold_vho (3.2.1)
       kaminari
       rails (>= 3.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
-      mail (~> 2.4.4)
-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    actionmailer (3.2.16)
+      actionpack (= 3.2.16)
+      mail (~> 2.5.4)
+    actionpack (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
+    activemodel (3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    activerecord (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
+    activeresource (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
+    activesupport (3.2.16)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    arel (3.0.2)
+    arel (3.0.3)
     builder (3.0.4)
     erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.4)
+    hike (1.2.3)
+    i18n (0.6.9)
     journey (1.0.4)
-    json (1.8.0)
+    json (1.8.1)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.25)
-    multi_json (1.7.8)
-    polyglot (0.3.3)
-    rack (1.4.4)
+    mime-types (1.25.1)
+    multi_json (1.9.2)
+    polyglot (0.3.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.11)
-      actionmailer (= 3.2.11)
-      actionpack (= 3.2.11)
-      activerecord (= 3.2.11)
-      activeresource (= 3.2.11)
-      activesupport (= 3.2.11)
+    rails (3.2.16)
+      actionmailer (= 3.2.16)
+      actionpack (= 3.2.16)
+      activerecord (= 3.2.16)
+      activeresource (= 3.2.16)
+      activesupport (= 3.2.16)
       bundler (~> 1.0)
-      railties (= 3.2.11)
-    railties (3.2.11)
-      actionpack (= 3.2.11)
-      activesupport (= 3.2.11)
+      railties (= 3.2.16)
+    railties (3.2.16)
+      actionpack (= 3.2.16)
+      activesupport (= 3.2.16)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
+    rake (10.3.1)
     rcov (0.9.9)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
     shoulda (2.11.3)
     sprockets (2.2.2)
@@ -84,12 +83,12 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.18.1)
-    tilt (1.3.3)
-    treetop (1.4.12)
+    thor (0.19.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby

data/app/assets/javascripts/jquery/jquery.editinplace.js

@@ -2,7 +2,7 @@
 
 A jQuery edit in place plugin
 
-Version 2.2.0
+Version 2.3.0
 
 Authors:
 	Dave Hauenstein
@@ -11,7 +11,7 @@ Authors:
 Project home:
 	http://code.google.com/p/jquery-in-place-editor/
 
-Patches with tests welcomed! For guidance see the tests at </spec/unit/spec.js>. To submit, attach them to the bug tracker.
+Patches with tests welcomed! For guidance see the tests  </spec/unit/>. To submit, attach them to the bug tracker.
 
 License:
 This source file is subject to the BSD license bundled with this package.
@@ -179,14 +179,15 @@ $.extend(InlineEditor.prototype, {
 		if ( ! this.shouldOpenEditor(anEvent))
 			return;
 		
-		this.workAroundFirefoxBlurBug();
 		this.disconnectOpeningEvents();
 		this.removeHoverEffect();
 		this.removeInsertedDefaultTextIfNeccessary();
 		this.saveOriginalValue();
 		this.markEditorAsActive();
 		this.replaceContentWithEditor();
-		this.connectOpeningEventsToEditor();
+		this.setInitialValue();
+		this.workAroundMissingBlurBug();
+		this.connectClosingEventsToEditor();
 		this.triggerDelegateCall('didOpenEditInPlace');
 	},
 	
@@ -239,20 +240,16 @@ $.extend(InlineEditor.prototype, {
 			this.dom.text(aValue);
 	},
 	
-	workAroundFirefoxBlurBug: function() {
-		if ( ! $.browser.mozilla)
-			return;
-		
-		// TODO: Opera seems to also have this bug....
-		
-		// Firefox will forget to send a blur event to an input element when another one is
-		// created and selected programmatically. This means that if another inline editor is
-		// opened, existing inline editors will _not_ close if they are configured to submit when blurred.
-		// This is actually the first time I've written browser specific code for a browser different than IE! Wohoo!
+	workAroundMissingBlurBug: function() {
+		// Strangely, all browser will forget to send a blur event to an input element
+		// when another one is created and selected programmatically. (at least under some circumstances). 
+		// This means that if another inline editor is opened, existing inline editors will _not_ close 
+		// if they are configured to submit when blurred.
 		
 		// Using parents() instead document as base to workaround the fact that in the unittests
 		// the editor is not a child of window.document but of a document fragment
-		this.dom.parents(':last').find('.editInPlace-active :input').blur();
+		var ourInput = this.dom.find(':input');
+		this.dom.parents(':last').find('.editInPlace-active :input').not(ourInput).blur();
 	},
 	
 	replaceContentWithEditor: function() {
@@ -288,6 +285,17 @@ $.extend(InlineEditor.prototype, {
 		editor.val(this.triggerDelegateCall('willOpenEditInPlace', this.originalValue));
 		return editor;
 	},
+    
+    setInitialValue: function() {
+		var initialValue = this.triggerDelegateCall('willOpenEditInPlace', this.originalValue);
+		var editor = this.dom.find(':input');
+		editor.val(initialValue);
+		
+		// Workaround for select fields which don't contain the original value.
+		// Somehow the browsers don't like to select the instructional choice (disabled) in that case
+		if (editor.val() !== initialValue)
+			editor.val(''); // selects instructional choice
+	},
 	
 	createRemoteGeneratedEditor: function () {
 	  this.dom.html(this.settings.loading_text);
@@ -371,9 +379,8 @@ $.extend(InlineEditor.prototype, {
 		var optionsArray = this.settings.select_options;
 		if ( ! $.isArray(optionsArray))
 			optionsArray = optionsArray.split(',');
-			
+		
 		for (var i=0; i<optionsArray.length; i++) {
-			
 			var currentTextAndValue = optionsArray[i];
 			if ( ! $.isArray(currentTextAndValue))
 				currentTextAndValue = currentTextAndValue.split(':');
@@ -385,12 +392,11 @@ $.extend(InlineEditor.prototype, {
 			var option = $('<option ' + selected + ' ></option>').val(value).text(text);
 			editor.append(option);
 		}
-		return editor;
 		
+		return editor;
 	},
 	
-	// REFACT: rename opening is not what it's about. Its about closing events really
-	connectOpeningEventsToEditor: function() {
+	connectClosingEventsToEditor: function() {
 		var that = this;
 		function cancelEditorAction(anEvent) {
 			that.handleCancelEditor(anEvent);
@@ -415,8 +421,8 @@ $.extend(InlineEditor.prototype, {
 			else
 				form.find(".inplace_field").blur(cancelEditorAction);
 			
-			// workaround for firefox bug where it won't submit on enter if no button is shown
-			if ($.browser.mozilla)
+			// workaround for msie & firefox bug where it won't submit on enter if no button is shown
+			if ($.browser.mozilla || $.browser.msie)
 				this.bindSubmitOnEnterInInput();
 		}
 		
@@ -609,7 +615,7 @@ $.extend(InlineEditor.prototype, {
 		if ( ! aCallback)
 			return; // callback wasn't specified after all
 		
-		var callbackArguments = Array.prototype.splice.call(arguments, 1);
+		var callbackArguments = Array.prototype.slice.call(arguments, 1);
 		return aCallback.apply(this.dom[0], callbackArguments);
 	},
 	

data/frontends/default/views/_on_post_form_action.js.erb

@@ -0,0 +1,45 @@
+try {
+<% form_selector = "#{element_form_id(:action => form_action)}"
+insert_at ||= :top %>
+var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
+action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages').strip)%>');
+<% if controller.send :successful? %>
+  <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
+    <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
+    <% if nested_singular_association? %>
+      action_link.close('<%= escape_javascript(parent_rendered) %>');
+    <% else %>
+      <% if render_parent_action == :row %>
+        ActiveScaffold.create_record_row(action_link.scaffold(),'<%= escape_javascript(parent_rendered) %>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
+      <% elsif render_parent_action == :index %>
+        <%= parent_rendered %>
+      <% end %>
+      action_link.close();
+    <% end %>
+    <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+  <% elsif (active_scaffold_config.send(form_action).refresh_list) %>
+    ActiveScaffold.replace_html('<%= active_scaffold_content_id%>', '<%= escape_javascript(render(:partial => 'list', :layout => false)) %>');
+  <% elsif params[:parent_controller].nil? %>
+    <% new_row = render :partial => 'list_record', :locals => {:record => @record} %>
+    ActiveScaffold.create_record_row(action_link.scaffold(),'<%=escape_javascript(new_row)%>', <%={:insert_at => insert_at}.to_json.html_safe%>);
+    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
+    <% end %>
+  <% end %>
+
+  <% unless render_parent? %>
+    <% if (active_scaffold_config.send(form_action).persistent) %>
+      action_link.reload();
+    <% else %>
+      action_link.close();
+    <% end %>
+    <% if (active_scaffold_config.send(form_action).edit_after_create) %>
+      var link = $('<%=action_link_id 'edit', @record.id%>');
+      if (link) (function() { link.action_link.open() }).defer();
+    <% end %>
+  <% end %>
+<% else %>
+  ActiveScaffold.replace('<%=form_selector%>','<%=escape_javascript(render(:partial => 'create_form', :locals => {:xhr => true, :form_action => form_action}))%>');
+  ActiveScaffold.scroll_to('<%=form_selector%>');
+<% end %>
+} catch (e) { alert('RJS error:\n\n' + e.toString());}

data/frontends/default/views/_on_put_form_action.js.erb

@@ -0,0 +1,31 @@
+try {
+<% form_selector = "#{element_form_id(:action => form_action)}" %>
+var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
+action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages').strip)%>');
+<% if controller.send :successful? %>
+  <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
+    <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
+    <% if nested_singular_association? %>
+      action_link.close('<%= escape_javascript(parent_rendered) %>');
+    <% else %>
+      <% if render_parent_action == :row %>
+        action_link.close('<%= escape_javascript(parent_rendered) %>');
+      <% elsif render_parent_action == :index %>
+        <%= parent_rendered %>
+      <% end %>
+    <% end %>
+    <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+  <% elsif update_refresh_list? %>
+    ActiveScaffold.replace_html('<%= active_scaffold_content_id%>', '<%= escape_javascript(render(:partial => 'list', :layout => false))%>');
+   <% else %>
+    <% updated_row = render :partial => 'list_record', :locals => {:record => @record}%>
+    action_link.close('<%= escape_javascript(updated_row)%>');
+    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
+    <% end %>
+  <% end %>
+<% else %>
+  ActiveScaffold.replace('<%=form_selector%>','<%=escape_javascript(render(:partial => "update_form", :locals => {:xhr => true, :form_action => form_action}))%>');
+  ActiveScaffold.scroll_to('<%=form_selector%>');
+<% end %>
+} catch (e) { alert('RJS error:\n\n' + e.toString());}

data/frontends/default/views/on_create.js.erb

@@ -1,45 +1 @@
-try {
-<% form_selector = "#{element_form_id(:action => :create)}"
-insert_at ||= :top %>
-var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
-action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages').strip)%>');
-<% if controller.send :successful? %>
-  <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
-    <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
-    <% if nested_singular_association? %>
-      action_link.close('<%= escape_javascript(parent_rendered) %>');
-    <% else %>
-      <% if render_parent_action == :row %>
-        ActiveScaffold.create_record_row(action_link.scaffold(),'<%= escape_javascript(parent_rendered) %>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
-      <% elsif render_parent_action == :index %>
-        <%= parent_rendered %>
-      <% end %>
-      action_link.close();
-    <% end %>
-    <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-  <% elsif (active_scaffold_config.create.refresh_list) %>
-    ActiveScaffold.replace_html('<%= active_scaffold_content_id%>', '<%= escape_javascript(render(:partial => 'list', :layout => false)) %>');
-  <% elsif params[:parent_controller].nil? %>
-    <% new_row = render :partial => 'list_record', :locals => {:record => @record} %>
-    ActiveScaffold.create_record_row(action_link.scaffold(),'<%=escape_javascript(new_row)%>', <%={:insert_at => insert_at}.to_json.html_safe%>);
-    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
-    <% end %>
-  <% end %>
-
-  <% unless render_parent? %>
-    <% if (active_scaffold_config.create.persistent) %>
-      action_link.reload();
-    <% else %>
-      action_link.close();
-    <% end %>
-    <% if (active_scaffold_config.create.edit_after_create) %>
-      var link = $('<%=action_link_id 'edit', @record.id%>');
-      if (link) (function() { link.action_link.open() }).defer();
-    <% end %>
-  <% end %>
-<% else %>
-  ActiveScaffold.replace('<%=form_selector%>','<%=escape_javascript(render(:partial => 'create_form', :locals => {:xhr => true}))%>');
-  ActiveScaffold.scroll_to('<%=form_selector%>');
-<% end %>
-} catch (e) { alert('RJS error:\n\n' + e.toString());}
+<%= render :partial => 'on_post_form_action', formats: [:js], :locals => {:form_action => :create} %>

data/frontends/default/views/on_update.js.erb

@@ -1,31 +1 @@
-try {
-<% form_selector = "#{element_form_id(:action => :update)}" %>
-var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
-action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages').strip)%>');
-<% if controller.send :successful? %>
-  <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
-    <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
-    <% if nested_singular_association? %>
-      action_link.close('<%= escape_javascript(parent_rendered) %>');
-    <% else %>
-      <% if render_parent_action == :row %>
-        action_link.close('<%= escape_javascript(parent_rendered) %>');
-      <% elsif render_parent_action == :index %>
-        <%= parent_rendered %>
-      <% end %>
-    <% end %>
-    <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-  <% elsif update_refresh_list? %>
-    ActiveScaffold.replace_html('<%= active_scaffold_content_id%>', '<%= escape_javascript(render(:partial => 'list', :layout => false))%>');
-   <% else %>
-    <% updated_row = render :partial => 'list_record', :locals => {:record => @record}%>
-    action_link.close('<%= escape_javascript(updated_row)%>');
-    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
-    <% end %>
-  <% end %>
-<% else %>
-  ActiveScaffold.replace('<%=form_selector%>','<%=escape_javascript(render(:partial => 'update_form', :locals => {:xhr => true}))%>');
-  ActiveScaffold.scroll_to('<%=form_selector%>');
-<% end %>
-} catch (e) { alert('RJS error:\n\n' + e.toString());}
+<%= render :partial => 'on_put_form_action', formats: [:js], :locals => {:form_action => :update} %>

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 0
+    PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &22098540 !ruby/object:Gem::Requirement
+  requirement: &20166240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22098540
+  version_requirements: *20166240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &22114420 !ruby/object:Gem::Requirement
+  requirement: &20165760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *22114420
+  version_requirements: *20165760
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &22113940 !ruby/object:Gem::Requirement
+  requirement: &20165280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22113940
+  version_requirements: *20165280
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &22113460 !ruby/object:Gem::Requirement
+  requirement: &20164800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *22113460
+  version_requirements: *20164800
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &22113080 !ruby/object:Gem::Requirement
+  requirement: &20164420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22113080
+  version_requirements: *20164420
 description: Save time and headaches, and create a more easily maintainable set of
   pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read,
   update, delete) user interface needs, leaving you more time to focus on more challenging
@@ -140,6 +140,8 @@ files:
 - frontends/default/views/_list_record_columns.html.erb
 - frontends/default/views/_list_with_header.html.erb
 - frontends/default/views/_messages.html.erb
+- frontends/default/views/_on_post_form_action.js.erb
+- frontends/default/views/_on_put_form_action.js.erb
 - frontends/default/views/_render_field.js.erb
 - frontends/default/views/_row.html.erb
 - frontends/default/views/_search.html.erb