thin_man 0.15.6 → 0.15.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 373fee9d1af3e08f436b8c8c523d74548fe72220
-  data.tar.gz: fb31a388438fb06ca08041272ce0176785d51305
+  metadata.gz: 71de9e24b17fcf6f8ce9970711290e3e3cf45918
+  data.tar.gz: 240679f9a47363b2dab81b86a79ccdbc4e8a76c8
 SHA512:
-  metadata.gz: f5d5b86b4e62db5b314253783b219b29f76ae081544c6baa424f804680a954a4fed63f1bc58d9f785cae205dcf8cf1bb1c252c54eefc4404928f9f5355d180e3
-  data.tar.gz: c78d106d8b01b32d333332064baaa713e3094505f0058eadf3aa5f43c030bd536eeaca853202c75bab3e8af6289ffc848fce3fd04fe6b94a777ad4a63d4d6038
+  metadata.gz: 93baad307f7be01ddf604a1b29218b0c7bedf1fd39672010986c7c8a16836f9afdd6b6bb1ff5b9ca1ffd8b30fd928508131557d858994ad5b3efe89330aae81c
+  data.tar.gz: fea0cc3ff26b37b013ff70cc5dc48c6d103d9baba0fe12a95a03dbb110ebb21c85a6ff52a6d805b4d13ee49e338337ee6573de6ac85c9674b01adb84034025ac

data/app/assets/javascripts/thin_man.js

@@ -270,23 +270,19 @@ var initThinMan = function(){
         } else {
           this.progress_target = $('body');
         }
-        if(!progress_color){
-          progress_color = 'black';
+        if(typeof(progress_color) == 'undefined'){
+          var progress_color = 'black';
         }
         this.progress_container = $('#ajax_progress_container').clone();
         uuid = new UUID;
         this.progress_container.prop('id', 'thin_man_ajax_progress_' + uuid.value);
         this.progress_target.append(this.progress_container);
         var css = {display: 'block', visibility: 'visible','color': progress_color, 'z-index': 1000000}
-        if(this.progress_target.css('position') == 'absolute' || this.progress_target.css('position') == 'relative'){
-          $.extend(css,
-            {position: 'absolute', top: '50%', left: '50%',
-            '-ms-transform': 'translate(-50%, -50%)', /* IE 9 */
-            '-webkit-transform': 'translate(-50%, -50%)', /* Safari */
-            'transform': 'translate(-50%, -50%)'})
-        } else {
-          $.extend(css, {position: 'absolute', top: 0, left: 0})
-        }
+        $.extend(css,
+          {position: 'absolute', top: '50%', left: '50%',
+          '-ms-transform': 'translate(-50%, -50%)', /* IE 9 */
+          '-webkit-transform': 'translate(-50%, -50%)', /* Safari */
+          'transform': 'translate(-50%, -50%)'})
         this.progress_container.css(css)
       },
       stop: function(){
@@ -422,6 +418,9 @@ var initThinMan = function(){
     },
     getTrigger: function(){
       this.trigger = this.jq_obj.find('button, input[type="submit"]');
+      if(this.trigger.length != 1){
+        this.trigger = $(document.activeElement)
+      }
     },
     hideTrigger: function(){
       this.trigger.css('visibility','hidden');
@@ -563,7 +562,6 @@ var initThinMan = function(){
   });
 
   window.any_time_manager.registerListWithClasses({'sortable' : 'AjaxSorter', 'ajax-link-now' : 'AjaxLinkSubmission', 'ajax-form-now' : 'AjaxFormSubmission'},'thin_man');
-  window.any_time_manager.load();
 
   $(document).ready(function(){
     $(document).on('click apiclick','[data-ajax-link],[data-ajax-link-now]',function(e){
@@ -766,8 +764,7 @@ if(typeof window.any_time_manager === "undefined" && typeof window.loading_any_t
       });
     }
     window.any_time_manager.load();
-  });
-
+  })
   // End AnyTime library
 }
 

data/lib/thin_man/ajax_helper.rb

@@ -1,6 +1,6 @@
 module ThinMan
   module AjaxHelper
-    def ajax_link(name, options, html_options, target, sub_class: nil, insert_method: nil, empty_on_success: nil, http_method: nil, no_mouse_click: nil)
+    def ajax_link(name, options, html_options, target, sub_class: nil, insert_method: nil, empty_on_success: nil, http_method: nil, no_mouse_click: nil, progress_target: nil)
       ajax_options = {
         'data-ajax-link' => true,
         'data-ajax-target' => target
@@ -10,12 +10,13 @@ module ThinMan
       ajax_options.merge!('data-ajax-method' => http_method) if http_method.present?
       ajax_options.merge!('data-empty-on-success' => empty_on_success) if empty_on_success.present?
       ajax_options.merge!('data-no-mouse-click' => no_mouse_click) if no_mouse_click.present?
+      ajax_options.merge!('data-progress-target' => progress_target) if progress_target.present?
       link_to(name,
               options,
               html_options.merge(ajax_options))
     end
 
-    def ajax_link_now(name, options, html_options, target, sub_class: nil, insert_method: nil, empty_on_success: nil, http_method: nil)
+    def ajax_link_now(name, options, html_options, target, sub_class: nil, insert_method: nil, empty_on_success: nil, http_method: nil, progress_target: nil)
       ajax_options = {
         'data-ajax-link-now' => true,
         'data-ajax-target' => target
@@ -24,6 +25,7 @@ module ThinMan
       ajax_options.merge!('data-insert-method' => insert_method) if insert_method.present?
       ajax_options.merge!('data-ajax-method' => http_method) if http_method.present?
       ajax_options.merge!('data-empty-on-success' => empty_on_success) if empty_on_success.present?
+      ajax_options.merge!('data-progress-target' => progress_target) if progress_target.present?
       link_to(name,
               options,
               html_options.merge(ajax_options))
@@ -44,7 +46,7 @@ module ThinMan
               html_options.merge(ajax_options))
     end
 
-    def ajax_form_hash(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, container: nil, custom_progress: nil, no_mouse_click: nil)
+    def ajax_form_hash(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, container: nil, custom_progress: nil, no_mouse_click: nil, progress_target: nil)
       ajax_options = {
         'data-ajax-form' => true,
         'data-ajax-target' => target
@@ -57,10 +59,11 @@ module ThinMan
       ajax_options.merge!('data-reset-on-success' => reset_on_success) if reset_on_success.present?
       ajax_options.merge!('data-custom-progress' => custom_progress) if custom_progress.present?
       ajax_options.merge!('data-no-mouse-click' => no_mouse_click) if no_mouse_click.present?
+      ajax_options.merge!('data-progress-target' => progress_target) if progress_target.present?
       ajax_options
     end
 
-    def ajax_form_now(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, container: nil, custom_progress: nil)
+    def ajax_form_now(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, container: nil, custom_progress: nil, progress_target: nil)
       ajax_options = {
         'data-ajax-form-now' => true,
         'data-ajax-target' => target
@@ -72,10 +75,11 @@ module ThinMan
       ajax_options.merge!('data-empty-on-success' => empty_on_success) if empty_on_success.present?
       ajax_options.merge!('data-reset-on-success' => reset_on_success) if reset_on_success.present?
       ajax_options.merge!('data-custom-progress' => custom_progress) if custom_progress.present?
+      ajax_options.merge!('data-progress-target' => progress_target) if progress_target.present?
       ajax_options
     end
 
-    def ajax_form_attrs(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, no_mouse_click: nil)
+    def ajax_form_attrs(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, no_mouse_click: nil, progress_target: nil)
       data_attrs = "data-ajax-form=true data-ajax-target=#{target}"
       data_attrs += " data-insert-method=#{insert_method}" if insert_method
       data_attrs += " data-sub-type=#{sub_class}" if sub_class
@@ -83,26 +87,29 @@ module ThinMan
       data_attrs += " data-reset-on-success=#{reset_on_success}" if reset_on_success
       data_attrs += " data-error-target=#{error_target}" if error_target
       data_attrs += " data-no-mouse-click=#{no_mouse_click}" if no_mouse_click
+      data_attrs += " data-progress-target=#{progress_target}" if progress_target
       data_attrs
     end
 
-    def ajax_form_now_attrs(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil)
+    def ajax_form_now_attrs(target, sub_class: nil, insert_method: nil, error_target: nil, empty_on_success: nil, reset_on_success: nil, progress_target: nil)
       data_attrs = "data-ajax-form-now=true data-ajax-target=#{target}"
       data_attrs += " data-insert-method=#{insert_method}" if insert_method
       data_attrs += " data-sub-type=#{sub_class}" if sub_class
       data_attrs += " data-empty-on-success=#{empty_on_success}" if empty_on_success
       data_attrs += " data-reset-on-success=#{reset_on_success}" if reset_on_success
       data_attrs += " data-error-target=#{error_target}" if error_target
+      data_attrs += " data-progress-target=#{progress_target}" if progress_target
       data_attrs
     end
 
-    def ajax_link_attrs(target, insert_method: nil, sub_type: nil, empty_on_success: nil, http_method: nil, no_mouse_click: nil)
+    def ajax_link_attrs(target, insert_method: nil, sub_type: nil, empty_on_success: nil, http_method: nil, no_mouse_click: nil, progress_target: nil)
       data_attrs = "data-ajax-link=true data-ajax-target=#{target}"
       data_attrs += " data-insert-method=#{insert_method}" if insert_method
       data_attrs += " data-ajax-method=#{http_method}" if http_method
       data_attrs += " data-sub-type=#{sub_type}" if sub_type
       data_attrs += " data-empty-on-success=#{empty_on_success}" if empty_on_success
       data_attrs += " data-no-mouse-click=#{no_mouse_click}" if no_mouse_click
+      data_attrs += " data-progress-target=#{progress_target}" if progress_target
       data_attrs
     end
 

data/lib/thin_man/version.rb

@@ -1,3 +1,3 @@
 module ThinMan
-  VERSION = "0.15.6"
+  VERSION = "0.15.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thin_man
 version: !ruby/object:Gem::Version
-  version: 0.15.6
+  version: 0.15.7
 platform: ruby
 authors:
 - Eric Draut, Adam Bialek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails