foreign_office 0.15.9 → 0.15.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e2cd672c374052a2b0a0153495886ca4aaf8cb2
-  data.tar.gz: 963f3ea6bf287ce82fd4e728b50f660eedf05aab
+  metadata.gz: 41ae26382de688baf1b41116375fbe87089f9c09
+  data.tar.gz: 3c4e36de4d98efcd857d43b8302f2c61138b89bd
 SHA512:
-  metadata.gz: 3b520c6fffb6aafb80a46942a087686cbb29600a6a143ada7b03c5f86b5df9c9d600428a1b3c0908f6a46a6cc04bc654ba0d9025e395d891eadf54329043a05b
-  data.tar.gz: c28e7a6151ee08d158ffe4561b66c3ad173e6f6bde4fdd55fdffc562f6daaeeede3c04f0807f42dbc7b4cb13216d97ad4c7b5bde3d6358e1ea9f9bb9900a5230
+  metadata.gz: cbbbd265379d9b2d179aa7489aeb971c5e4f7ecfe0eba8c7ea920a4729538405a157bde0677129bb245ba218b8b98e823baed24b2ac706aaedcfacdcfe05ae4a
+  data.tar.gz: cdce665b19bc083eff699169a1caddcfad53c01f33796851c17622c3ba3c8c6e5b359f8c8933ed0fef4b6219331fe2700edce829d8ee5b2c32f862a5813b1796

data/app/assets/javascripts/foreign_office.js

@@ -153,14 +153,14 @@ var ForeignOfficeListener = Class.extend({
       return true
     }
     if(this.endpoint){
-      let $progress_target = null
+      var $progress_target = null
       if($listener.data('progress-target')){
         $progress_target = $($listener.data('progress-target'))
       } else {
         $progress_target = []
       }
       if (m.object[this.object_key] == true) {
-        let progress_indicator = new thin_man.AjaxProgress($progress_target,$listener,'black')
+        var progress_indicator = new thin_man.AjaxProgress($progress_target,$listener,'black')
         $.get(this.endpoint, function(data){
           $listener.html(data);
         }).always(function(){
@@ -169,7 +169,7 @@ var ForeignOfficeListener = Class.extend({
       }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($progress_target,$listener,'black')
+        var progress_indicator = new thin_man.AjaxProgress($progress_target,$listener,'black')
         $.get(m.object[this.object_key], function(data){
           $listener.html(data);
         }).always(function(){
@@ -223,7 +223,7 @@ var ForeignOfficeListener = Class.extend({
         break;
 
         default:
-          if(this.$listener.data('trigger-on-message')){
+          if(this.$listener.data('trigger-on-message') || this.$listener.data('download')){
             if(new_value && (new_value != 'false')){
               if((new_value != true) && (new_value != 'true')){
                 this.$listener.attr('href',new_value);
@@ -235,6 +235,8 @@ var ForeignOfficeListener = Class.extend({
                 this.$listener.trigger('apiclick');
               }else if(this.$listener.data('ajax-form')){
                 this.$listener.trigger('apisubmit');
+              }else if(this.$listener.data('download')){
+                window.open(new_value);
               }else{
                 window.location = new_value;
               }
@@ -252,20 +254,16 @@ var ForeignOfficeListener = Class.extend({
   },
   getForeignOfficeProgressIndicator: function(){
     var this_listener = this;
-    $('[data-foreign-office-progress-indicator="' + this.channel + '"]').each(function(){
-      this_listener.foreign_office_progress_indicator = $(this).data('foreign-office-progress-indicator-object');
-      this_listener.foreign_office_flash = $(this).data('ajax-foreign-office-flash').notice;
+    $('[data-foreign-office-progress-indicator][data-channel="' + this.channel + '"][data-key="' + this.object_key + '"]').each(function(){
+      this_listener.$foreign_office_progress_indicator = $(this);
     })
   },
   getChannelObject: function(){
     return foreign_office.channels_by_name[this.channel];
   },
   removeProgressIndicator: function(){
-    if(this.foreign_office_progress_indicator){
-      this.foreign_office_progress_indicator.stop();
-      if(this.foreign_office_flash){
-        new AjaxFlash('success',this.foreign_office_flash,this.$listener);
-      }
+    if(this.$foreign_office_progress_indicator){
+      this.$foreign_office_progress_indicator.remove()
     }
   }
 });

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, progress_target: nil)
+    def listener_attrs(resource, key, reveal_hide: false, endpoint: nil, download: 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}"
@@ -10,13 +10,19 @@ module ForeignOffice
       data_attrs += " data-reveal-hide=true" if reveal_hide
       data_attrs += " data-endpoint=#{endpoint}" if endpoint
       data_attrs += " data-trigger-on-message=true" if trigger
+      data_attrs += " data-download=true" if download
       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, progress_target: nil)
+    def progress_indicator_attrs(resource, key)
+      data_attrs = "data-foreign-office-progress-indicator=true data-channel=#{resource.class.name}#{resource.id}"
+      data_attrs += " data-key=#{key}"
+    end
+
+    def listener_attrs_raw(channel, key, reveal_hide: false, endpoint: nil, download: 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}"
@@ -25,6 +31,7 @@ module ForeignOffice
       end
       data_attrs += " data-reveal-hide=true" if reveal_hide
       data_attrs += " data-endpoint=#{endpoint}" if endpoint
+      data_attrs += " data-download=true" if download
       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
@@ -32,7 +39,7 @@ module ForeignOffice
       data_attrs
     end
 
-    def listener_hash(resource, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil, progress_target: nil)
+    def listener_hash(resource, key, reveal_hide: false, endpoint: nil, download: 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
@@ -41,6 +48,7 @@ module ForeignOffice
       end
       hash[:reveal_hide] = true if reveal_hide
       hash[:endpoint] = endpoint if endpoint
+      hash[:download] = true if download
       hash[:trigger_on_message] = true if trigger
       hash[:href_target] = true if href_target
       hash[:create_modal] = create_modal if create_modal
@@ -48,7 +56,7 @@ module ForeignOffice
       hash
     end
 
-    def listener_hash_raw(channel, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil, progress_target: nil)
+    def listener_hash_raw(channel, key, reveal_hide: false, endpoint: nil, download: 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 +65,7 @@ module ForeignOffice
       end
       hash[:reveal_hide] = true if reveal_hide
       hash[:endpoint] = endpoint if endpoint
+      hash[:download] = true if download
       hash[:trigger_on_message] = true if trigger
       hash[:href_target] = true if href_target
       hash[:create_modal] = create_modal if create_modal

data/lib/foreign_office/version.rb

@@ -1,3 +1,3 @@
 module ForeignOffice
-  VERSION = "0.15.9"
+  VERSION = "0.15.10"
 end

metadata

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