active_scaffold 3.4.24 → 3.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc9178690751a9ba0c8d602ed0d2e133dcb42d67
-  data.tar.gz: 9a27c060e1b4953701409cc4c550b15cfe48f428
+  metadata.gz: 7ee6cc12616f927c3500f0da84efc6ccbf7f60bf
+  data.tar.gz: c4f7d12b9993f732eab7632b61b37fa36b1ac5c0
 SHA512:
-  metadata.gz: 483dd99adb6c1f300474b5eecb0ae5377428d901896d79889b205525ba37691afe7781e6854300d6acfdd635d4cf3220afdf008a19e120ea7df89bc4d9426760
-  data.tar.gz: b32f74e9882bc164bf6b42f613e0106dd21dc1df54eada67234198834fbc881b0f357c3af50ca1993a5462cfd3bad7fca31c897cb78a3d8bdc490044e22547ef
+  metadata.gz: 6b1177b6f0c4875ef0353058e0187313f390420f940a2471b8139ad46e244f0f0daeae6fce320dc5e1e9b82abd9056fc7c7b6088606836a28603db76b98fcf34
+  data.tar.gz: ef249a6e53a32b40d7dbaa807d5611bf576e3950c76f0ee50d3465fd30e78d1c19f23c7fbd97f179a64ccfa4074d4c04a070efe9f2f932193d1c0da3d0098c53

data/CHANGELOG

@@ -1,3 +1,6 @@
+- call focus_first_element after highlight and trigger element_created
+- fix restoring focus to element which triggers update column
+
 = 3.4.24
 - allow to set :controller in active_scaffold_record_select_autocomplete parameter or active_scaffold_input_text_options
 - fix keeping focus after update_columns when focus was changed to a field which is going to be updated

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

@@ -791,8 +791,8 @@ var ActiveScaffold = {
         element.prepend(content);
       }
     }
-    ActiveScaffold.focus_first_element_of_form(content, '');
     content.trigger('as:element_created');
+    ActiveScaffold.focus_first_element_of_form(content, '');
   },
 
   render_form_field: function(source, content, options) {
@@ -960,10 +960,20 @@ var ActiveScaffold = {
       type: 'post',
       beforeSend: function(xhr, settings) {
         element.nextAll('img.loading-indicator').css('visibility','visible');
-        ActiveScaffold.disable_form(as_form);
+        /* force to blur and save previous last_focus, because disable_form will trigger
+         * blur on focused element and we will not be able to restore focus later
+         */
+        var last_focus = ActiveScaffold.last_focus;
+        if (last_focus) {
+          $(last_focus).blur();
+          ActiveScaffold.last_focus = last_focus;
+        }
+        //ActiveScaffold.disable_form(as_form); // not needed: called from on('ajax:beforeSend', 'form.as_form')
+
         if ($.rails.fire(element, 'ajax:beforeSend', [xhr, settings])) {
           element.trigger('ajax:send', xhr);
         } else {
+          $(ActiveScaffold.last_focus).focus();
           return false;
         }
       },
@@ -1232,8 +1242,8 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
     else {
       return false;
     }
-    ActiveScaffold.focus_first_element_of_form(this.adapter);
     ActiveScaffold.highlight(this.adapter.find('td'));
+    ActiveScaffold.focus_first_element_of_form(this.adapter);
   },
 
   close: function(refreshed_content_or_reload) {
@@ -1300,7 +1310,7 @@ ActiveScaffold.ActionLink.Table = ActiveScaffold.ActionLink.Abstract.extend({
     else {
       throw 'Unknown position "' + this.position + '"'
     }
-    ActiveScaffold.focus_first_element_of_form(this.adapter);
     ActiveScaffold.highlight(this.adapter.find('td').first().children());
+    ActiveScaffold.focus_first_element_of_form(this.adapter);
   }
 });

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.24
+  version: 3.4.25
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman