thin_man 0.12.3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7876c85cc5ac8eba96b68d282342768f4c324fea
-  data.tar.gz: 5d6e382a7d82aa90622dfaf35cd9a72630f58208
+  metadata.gz: 87711557897ed02cc919dca89d0247eafeb8c3fd
+  data.tar.gz: 275053997334c8b1628635c3ab95494b0de31cc3
 SHA512:
-  metadata.gz: 9f89b005636a4a6994b1bc23f64d9ca9d45dcdcf13c2e4166f5f44d3754a3c55cee066cec6e63fda161e0b530b05cb30e9560312335d52167bb8ff99d71c3a03
-  data.tar.gz: 008f8123e5847514aafff0168dfb392c5c50feb633f2acf975332cb63ebc6aab09a2b16206d62cda84e6d82c39a2cbf71c1741ffcf195c520c47493f6050cccd
+  metadata.gz: e82988c3cb2edaafa892b1856b9b327b9cf8eaa8321e80c246d79f67a5d28030aeae79e728255f552269362911a7b9a7055bfafbd1dcbd3cc12f1ffc098e8b60
+  data.tar.gz: 9637ea2eac2db6f5a3cf74bddc81c32b81eb42cb2af640d5c99cc9e9e7bd2c45b74e4424525d4f2cade9e26a472f19ca6474c2ca6a4b280a3255dffa273a3921

data/app/assets/javascripts/thin_man.js

@@ -13,6 +13,10 @@ var initThinMan = function(){
         this.jq_obj = jq_obj;
         this.params = params;
         if(!this.params){ this.params = {}}
+        // Bail out if this is a no-mouse-click ajax element and we were mouse clicked
+        if(this.wasMouseClicked() && this.noMouseClick()){
+          return false;
+        }
         this.getTrigger();
         this.getTarget();
         this.getErrorTarget();
@@ -47,13 +51,7 @@ var initThinMan = function(){
       getTarget: function(){
         var target_selector = this.jq_obj.data('ajax-target');
         if(target_selector){
-          if($(target_selector).length > 0){
-            this.target = $(target_selector);
-          }else{
-            console.log('Warning! Thin Man selector ' + target_selector + ' not found')
-          }
-        }else{
-          console.log('Warning! Thin Man selector not given')
+          this.target = $(target_selector);
         }
       },
       getErrorTarget: function(){
@@ -227,6 +225,12 @@ var initThinMan = function(){
           return 'success'
         }
         return 'error'
+      },
+      wasMouseClicked: function(){
+        return this.params.e && this.params.e.type && this.params.e.type == 'click'
+      },
+      noMouseClick: function(){
+        this.jq_obj.data('no-mouse-click')
       }
     }),
     AjaxBrowserPushConnector: Class.extend({
@@ -535,24 +539,24 @@ var initThinMan = function(){
   window.any_time_manager.load();
 
   $(document).ready(function(){
-    $(document).on('click','[data-ajax-link],[data-ajax-link-now]',function(e){
+    $(document).on('click apiclick','[data-ajax-link],[data-ajax-link-now]',function(e){
       e.preventDefault();
       var this_class = eval('thin_man.' + thin_man.getSubClass($(this).data('sub-type'),'AjaxLinkSubmission'));
-      var submission = new this_class($(this));
+      var submission = new this_class($(this),{e: e});
       return false;
     });
 
-    $(document).on('submit','[data-ajax-form]',function(e){
+    $(document).on('submit apisubmit','[data-ajax-form]',function(e){
       e.preventDefault();
       var this_class = eval('thin_man.' + thin_man.getSubClass($(this).data('sub-type'),'AjaxFormSubmission'));
-      var submission = new this_class($(this));
+      var submission = new this_class($(this),{e: e});
       return false;
     });
 
-    $(document).on('click','[data-ajax-delete]',function(e){
+    $(document).on('click apiclick','[data-ajax-delete]',function(e){
       e.preventDefault();
       var this_class = eval('thin_man.' + thin_man.getSubClass($(this).data('sub-type'),'DeleteLink'));
-      var deletion = new this_class($(this));
+      var deletion = new this_class($(this),{e: e});
     });
     $(document).on('click', '[data-change-url]',function(e){
       e.preventDefault();

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)
+    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)
       ajax_options = {
         'data-ajax-link' => true,
         'data-ajax-target' => target
@@ -9,6 +9,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-no-mouse-click' => no_mouse_click) if no_mouse_click.present?
       link_to(name,
               options,
               html_options.merge(ajax_options))
@@ -28,7 +29,7 @@ module ThinMan
               html_options.merge(ajax_options))
     end
 
-    def ajax_delete(name, options, html_options, target, sub_class: nil, replace_response: false, no_confirm: false, custom_progress: nil)
+    def ajax_delete(name, options, html_options, target, sub_class: nil, replace_response: false, no_confirm: false, custom_progress: nil, no_mouse_click: nil)
       ajax_options = {
         'data-ajax-delete' => true,
         'data-ajax-target' => target
@@ -37,12 +38,13 @@ module ThinMan
       ajax_options.merge!('data-replace-response' => true) if replace_response
       ajax_options.merge!('data-no-confirm' => true) if no_confirm
       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?
       link_to(name,
               options,
               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)
+    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)
       ajax_options = {
         'data-ajax-form' => true,
         'data-ajax-target' => target
@@ -54,25 +56,28 @@ 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-no-mouse-click' => no_mouse_click) if no_mouse_click.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)
+    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)
       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
       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-no-mouse-click=#{no_mouse_click}" if no_mouse_click
       data_attrs
     end
 
-    def ajax_link_attrs(target, insert_method: nil, sub_type: nil, empty_on_success: nil, http_method: nil)
+    def ajax_link_attrs(target, insert_method: nil, sub_type: nil, empty_on_success: nil, http_method: nil, no_mouse_click: 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
     end
 

data/lib/thin_man/version.rb

@@ -1,3 +1,3 @@
 module ThinMan
-  VERSION = "0.12.3"
+  VERSION = "0.13.0"
 end

data/test/javascript/spec/thinManSpec.js

@@ -182,30 +182,5 @@ describe("thin_man", function(){
       });
     });
 
-    describe("Log", function(){
-      beforeEach(function(){
-        spyOn(console, 'log');
-      });
-
-      it("Don't show a warning with a valid target", function(){
-        $link = affix('a[data-ajax-link="true"][data-ajax-target="#test_dom_id"]');
-        $target = affix('#test_dom_id');
-        thin = new thin_man.AjaxLinkSubmission($link);
-        expect(console.log).not.toHaveBeenCalled();
-      });
-
-      it("Show a warning when target not found", function(){
-        $link = affix('a[data-ajax-link="true"][data-ajax-target="#not_valid_target"]');
-        thin = new thin_man.AjaxLinkSubmission($link);
-        expect(console.log).toHaveBeenCalledWith('Warning! Thin Man selector #not_valid_target not found');
-      });
-
-      it("Show a warning when target not provided", function(){
-        $link = affix('a[data-ajax-link="true"]');
-        thin = new thin_man.AjaxLinkSubmission($link);
-        expect(console.log).toHaveBeenCalledWith('Warning! Thin Man selector not given');
-      });
-    });
-
   });
 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thin_man
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.0
 platform: ruby
 authors:
 - Eric Draut, Adam Bialek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Rails library that makes web apps lively while keeping all the logic on