foreign_office 0.15.7 → 0.15.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e40ac48bf614839677ce97f57df4f2cc1c2a0b31
-  data.tar.gz: 337949668fcc26dd6e33b1e244960bcab41ab2ab
+  metadata.gz: ac5311e95b99a2a57f2554e552053830a930fc2b
+  data.tar.gz: c3f597a3a2144cd9711009e0f8546a3b12db7e12
 SHA512:
-  metadata.gz: 66e30dd5a93d9072a055280910d86ab313693171a0a7ae1539d582795b5d6069dff221270013ae2dae3bab23ee0957d394a25f840aa88a5aea8f359e10c5434f
-  data.tar.gz: faec1749dd0db075969b47e0f9590821308d2dc393abdb6868641917800a0c48878c64a84a3cd74eb0edeca1e89a474fcc5f47c7d65d7afe5ef7ecb7728815ce
+  metadata.gz: 13a08132e1ef73d9c26e00f5c6145b06d39529c17c40efbfc062e7db4432d3ad2a38cad2dfcd6f81010a4ff87e61cb9295aaffce080a425d048d8254507aa785
+  data.tar.gz: eb9ea8764112495cc2360ae81858a3068ed08691558189145f066c2812a5af88514b850b23583583b6100b81cf7987e0040b892119c67b412dda4da3609bf75b

data/app/assets/javascripts/foreign_office.js

@@ -154,14 +154,24 @@ var ForeignOfficeListener = Class.extend({
     }
     if(this.endpoint){
       if (m.object[this.object_key] == true) {
+        let $progress_target = null
+        if($listener.data('progress-target').length > 0){
+          $progress_target = $($listener.data('progress-target'))
+        }
+        let progress_indicator = new thin_man.AjaxProgress($progress_target,$listener,'black')
         $.get(this.endpoint, function(data){
           $listener.html(data);
+        }).always(function(){
+          progress_indicator.stop()
         })
       }else if(m.object[this.object_key] == false) {
         $listener.empty();
       }else if(typeof(m.object[this.object_key]) == 'string'){
+        let progress_indicator = new thin_man.AjaxProgress($listener,$listener,'black')
         $.get(m.object[this.object_key], function(data){
           $listener.html(data);
+        }).always(function(){
+          progress_indicator.stop()
         })
       }
       if (m.object[this.delete_key] == true) {

data/lib/foreign_office/foreign_office_helper.rb

@@ -1,6 +1,6 @@
 module ForeignOffice
   module ForeignOfficeHelper
-    def listener_attrs(resource, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil)
+    def listener_attrs(resource, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil, progress_target: nil)
       data_attrs = "data-listener=true data-channel=#{resource.class.name}#{resource.id}"
       if delete
         data_attrs += " data-delete-key=#{key}"
@@ -11,11 +11,12 @@ module ForeignOffice
       data_attrs += " data-endpoint=#{endpoint}" if endpoint
       data_attrs += " data-trigger-on-message=true" if trigger
       data_attrs += " data-href-target=true" if href_target
+      data_attrs += " data-progress-target=#{progress_target}" if progress_target
       data_attrs += " data-create-modal=#{create_modal}" if create_modal
       data_attrs
     end
 
-    def listener_attrs_raw(channel, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil)
+    def listener_attrs_raw(channel, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil, progress_target: nil)
       data_attrs = "data-listener=true data-channel=#{channel}"
       if delete
         data_attrs += " data-delete-key=#{key}"
@@ -26,11 +27,12 @@ module ForeignOffice
       data_attrs += " data-endpoint=#{endpoint}" if endpoint
       data_attrs += " data-trigger-on-message=true" if trigger
       data_attrs += " data-href-target=true" if href_target
+      data_attrs += " data-progress-target=#{progress_target}" if progress_target
       data_attrs += " data-create-modal=#{create_modal}" if create_modal
       data_attrs
     end
 
-    def listener_hash(resource, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil)
+    def listener_hash(resource, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil, progress_target: nil)
       hash = {listener: true, channel: resource.class.name + resource.id.to_s}
       if delete
         hash[:delete_key] = key
@@ -42,10 +44,11 @@ module ForeignOffice
       hash[:trigger_on_message] = true if trigger
       hash[:href_target] = true if href_target
       hash[:create_modal] = create_modal if create_modal
+      hash[:progress_target] = progress_target if progress_target
       hash
     end
 
-    def listener_hash_raw(channel, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil)
+    def listener_hash_raw(channel, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil, progress_target: nil)
       hash = {listener: true, channel: channel}
       if delete
         hash[:delete_key] = key
@@ -57,6 +60,7 @@ module ForeignOffice
       hash[:trigger_on_message] = true if trigger
       hash[:href_target] = true if href_target
       hash[:create_modal] = create_modal if create_modal
+      hash[:progress_target] = progress_target if progress_target
       hash
     end
   end

data/lib/foreign_office/version.rb

@@ -1,3 +1,3 @@
 module ForeignOffice
-  VERSION = "0.15.7"
+  VERSION = "0.15.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_office
 version: !ruby/object:Gem::Version
-  version: 0.15.7
+  version: 0.15.8
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails