active_scaffold_vho 3.2.11 → 3.2.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDdiYjFiZTVjMjhhMjZhN2FkNDQxMjc4M2Q3ZDU0ZjkwZjE5YzczNQ==
+    YjliMmVhMmU0ZTExMGRjZjU2YWQ5NDc2MmQyMTgyMTgwZjM4MzZiYg==
   data.tar.gz: !binary |-
-    M2FkZWIxMWZmYWYyOTA1MDJlNGVlNTIyODFhZDE3OGIyZmI4ODJhYw==
+    NDlmYWRmYTVmN2U3Yjg0NmNiZjg3ZTNiYTRlMmVlMGZlYjM5MjM4Yw==
 SHA512:
   metadata.gz: !binary |-
-    YTlhMTRkOTZhNjlhYTRjNTM3N2QyZjJlZTViODZhOTAyMDVlOTJhMmNkYjMz
-    MjViNTM3NzFiODdhMjJkNDc3N2EwNmVkZjgwMjFlZTRiODk4NGVhNjc3YWYw
-    NDRjNDg5YjY2ZWNmNDRmYTFmZmY5NjBkN2QyZDA2MmEzYmJhNGY=
+    YTFkZTQ1NTgxOWU4NGI4YmM1YTIxZjAyNDI2ZTUxZDJhYmE2NGEzNTQ4MzM5
+    YWEwZDNmZjhkYmRjYjdlZGMxMjQyNmFkM2M5ODEwNTY2NTI5ODg1YTgwMDBi
+    NThhNTAwODQzNTIzYjMzZjBhNmY1ODU3ZjE2ZjM2NGZmNDZmOTY=
   data.tar.gz: !binary |-
-    Mzg1MjZlMmVlMjk0MmVlMTM1NjU0YmI1NGU5MGRlYTM4YTdmMGExNGZkN2Fl
-    YzhhNDVkNjM1YTNiNWY0YTkzNmIzMDhjOGQxYzIzYTBhNWFmNDEyYjU4ZDFi
-    MjBlMzQ4NTkwZTgyMmUwNTc1ZDVlMTQyNjk3ZWMyNGQ4NTNiMDk=
+    NzUwMmVjMjU2NjM2NDk4YTAwZTNiMmRkMWMyM2VhZGYxZDU3OTg3N2Y2OWI3
+    OTNlNzNkZWMxODE0ZjkyN2ViY2NhM2I3NTVmNjgzNzA2Mzg2Yzk5ODhkOTkz
+    MGU0ZDc4MDY1MmZmZmU3OTE5YjkyYjE4NDJkYmExODFjNThjMTY=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_scaffold_vho (3.2.10)
+    active_scaffold_vho (3.2.11)
       kaminari
       rails (>= 3.1.0)
 

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

@@ -100,8 +100,8 @@ $(document).ready(function() {
   });
   $(document).on('ajax:before', 'a.as_cancel', function(event) {
     var as_cancel = $(this);
-    var action_link = ActiveScaffold.find_action_link(as_cancel);  
-    
+    var action_link = ActiveScaffold.find_action_link(as_cancel);
+
     if (action_link) {
       var cancel_url = as_cancel.attr('href');
       var refresh_data = as_cancel.attr('data-refresh');
@@ -110,7 +110,7 @@ $(document).ready(function() {
         as_cancel.attr('href', action_link.refresh_url);
         if (action_link.position) event.data_type = 'rails';
       } else if (refresh_data === 'false' || typeof(cancel_url) == 'undefined' || cancel_url.length == 0) {
-        action_link.close();
+        action_link.force_close(true);
         return false;
       }
     }
@@ -324,6 +324,7 @@ $(document).ready(function() {
   });
   ActiveScaffold.trigger_load_events($('[data-as_load]'));
   ActiveScaffold.load_embedded_conrollers();
+  ActiveScaffold.keep_open_action_links();
   
 });
 
@@ -958,6 +959,16 @@ var ActiveScaffold = {
     });
   },
 
+  keep_open_action_links: function() {
+    $.each($('a.as_action[data-keep_open="true"]'), function(index) {
+       var action_link = ActiveScaffold.ActionLink.get($(this));
+
+       if (action_link) {
+         action_link.open();
+       }
+    });
+  },
+
   form_elements_changed: function(form_elements){
     var form_elements_count = form_elements.length;
     var i = 0;
@@ -1076,17 +1087,28 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
   },
 
   open: function(event) {
+    this.tag.click();
   },
   
   insert: function(content) {
     throw 'unimplemented'
   },
 
+  force_close: function(force_closing) {
+    if(!this.keep_open() || force_closing === true) {
+      this.enable();
+      ActiveScaffold.trigger_unload_events(this.adapter.find('[data-as_load]'));
+      this.adapter.remove();
+      if (this.hide_target) this.target.show();
+    } else {
+      var as_form = $(this.adapter).find("form").first();
+      if (as_form) {
+        ActiveScaffold.reset_form(as_form);
+      }
+    }
+ },
   close: function() {
-    this.enable();
-    ActiveScaffold.trigger_unload_events(this.adapter.find('[data-as_load]'));
-    this.adapter.remove();
-    if (this.hide_target) this.target.show();
+    this.force_close(false)
   },
 
   reload: function() {
@@ -1147,6 +1169,9 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
     }
 
     return '<tr class="inline-adapter" id="' + id_string + '"><td colspan="99" class="inline-adapter-cell"><div class="' + this.action + '-view ' + controller +  '-view view"><a class="inline-adapter-close as_cancel" title="' + close_label + '" data-remote="true" data-refresh="' + should_refresh_data + '" href="">' + close_label +'</a>' + content + '</div></td></tr>'
+  },
+  keep_open: function() {
+    return (this.tag.data('keep_open') === true);
   }
 });
 

data/lib/active_scaffold/data_structures/action_link.rb

@@ -152,6 +152,13 @@ module ActiveScaffold::DataStructures
     
     # nested action_links are referencing a column
     attr_accessor :column
+
+
+    # action link is open always, execept another actionlink is open
+    attr_writer :keep_open
+    def keep_open?
+      @keep_open
+    end
     
     # indicates that this a nested_link
     def nested_link?

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -177,10 +177,15 @@ module ActiveScaffold
         html_options[:method] = link.method if link.method != :get
 
         html_options['data-confirm'] = link.confirm(record.try(:to_label)) if link.confirm?
-        html_options['data-position'] = link.position if link.position and link.inline?
         html_options['data-controller'] = link.controller.to_s if link.controller
-        html_options[:class] += ' as_action' if link.inline?
-        html_options['data-action'] = link.action if link.inline?
+
+        if link.inline?
+          html_options['data-position'] = link.position if link.position
+          html_options[:class] += ' as_action'
+          html_options['data-action'] = link.action
+          html_options['data-keep_open'] = true if link.keep_open?
+        end
+
         if link.popup?
           html_options['data-popup'] = true
           html_options[:target] = '_blank'

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version
-  version: 3.2.11
+  version: 3.2.12
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda