foreign_office 0.15.12 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 325ba8a4518dc69892add11cc324fa8572ea799a
-  data.tar.gz: 4a22aa76e8461d2bf2d318c29614da1db1f271a1
+  metadata.gz: c2de91fc96446054ec1140b1abe152bc1776e9cf
+  data.tar.gz: 1b99de5a4721b53894230d6cd47046894c1203ad
 SHA512:
-  metadata.gz: 909917d0c42580d95388e0caa10659c09100742833435f2ed569a4fadc97f3457b98058984be25da118397608f46cc0cfc4311406f260415046832d52d73bb0b
-  data.tar.gz: f0b30d0f5750b1f348bc977b611e8de527c5dbc5cc5625df5df8594553b846f172fb2d19ad160c37ff1aa2684f00663777a559ed9ae9e6ca53bca913470ac945
+  metadata.gz: af62c31292bca5b0f6c2054cee6a5bddf9f12b022987efe8feb533cccd5836c3ea90c8caec051c8c3e7d80200dd5f0bfabbd1f9c86ae9b14d77e9ff2e52502c6
+  data.tar.gz: f4c4a53a322aa615716d86c8ddbc8705d176b109a6ef187bcdedab3af05bb74bd0ae22026c34b1c95b7bda5397f81e7bea003552ee06c1bb85c7b83856ba1cb0

data/app/assets/javascripts/foreign_office.js

@@ -136,6 +136,7 @@ var ForeignOfficeListener = Class.extend({
   init: function($listener){
     this.$listener = $listener;
     $listener.data('foreign_office.ForeignOfficeListener',this)
+    this.exclude_value = $listener.data('exclude-value');
     this.endpoint = $listener.data('endpoint');
     this.reveal_hide = $listener.data('reveal-hide');
     this.object_key = $listener.data('key');
@@ -161,11 +162,13 @@ var ForeignOfficeListener = Class.extend({
   handleMessage: function(m){
     var $listener = this.$listener;
     var listener = this
-    if(!m.object.hasOwnProperty(this.object_key) && !m.object.hasOwnProperty(this.delete_key)){
+    var message_value = m.object[this.object_key]
+    if((!m.object.hasOwnProperty(this.object_key) && !m.object.hasOwnProperty(this.delete_key)) ||
+      (this.exclude_value && message_value == this.exclude_value)){
       return true
     }
     if(this.endpoint){
-      if (m.object[this.object_key] == true) {
+      if (message_value == true) {
         listener.maskMe()
         $.get(this.endpoint, function(data){
           $listener.html(data);
@@ -174,29 +177,28 @@ var ForeignOfficeListener = Class.extend({
         })
       }else if(m.object[this.object_key] == false) {
         $listener.empty();
-      }else if(typeof(m.object[this.object_key]) == 'string'){
+      }else if(typeof(message_value) == 'string'){
         listener.maskMe()
-        $.get(m.object[this.object_key], function(data){
+        $.get(message_value, function(data){
           $listener.html(data);
         }).always(function(){
           listener.unMaskMe()          
         })
       }
-      if (m.object[this.delete_key] == true) {
+      if (message_value == true) {
         $listener.remove();
       }
     }else if(this.reveal_hide){
-      var current_value = m.object[this.object_key];
-      if(!current_value || current_value == 'false' || current_value == 'hide'){
+      if(!message_value || message_value == 'false' || message_value == 'hide'){
         this.$listener.hide();
       } else {
         this.$listener.removeClass('hidden');
         this.$listener.show();
       }
     }else if(this.href_target){
-      this.$listener.attr('href',m.object[this.object_key])
+      this.$listener.attr('href',message_value)
     }else if(this.create_modal){
-      if (m.object[this.object_key] == true) {
+      if (message_value && message_value != 'false') {
         var $modal_content = $('<div>').html($(this.create_modal).html());
         var modal = new hooch.Modal($modal_content);
         modal.$dismisser.remove();
@@ -204,35 +206,34 @@ var ForeignOfficeListener = Class.extend({
         delete modal.$dismisser;
       }
     }else{
-      var new_value = m.object[this.object_key];
       switch(this.$listener.get(0).nodeName.toLowerCase()){
         case 'input':
           if(this.$listener.attr('type') == 'checkbox'){
-            this.$listener.prop('checked', new_value);
+            this.$listener.prop('checked', message_value);
           } else {
-            this.$listener.val(new_value);
+            this.$listener.val(message_value);
           }
         break;
         case 'select':
-          if(this.$listener.val() != ('' + new_value)){
-            this.$listener.val('' + new_value).change()
+          if(this.$listener.val() != ('' + message_value)){
+            this.$listener.val('' + message_value).change()
           }
           this.$listener.trigger("chosen:updated")
         break;
 
         case 'img':
-          this.$listener.prop('src',new_value);
+          this.$listener.prop('src',message_value);
         break;
 
         case 'progress':
-          this.$listener.attr('value',new_value)
+          this.$listener.attr('value',message_value)
         break;
 
         default:
           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);
+            if(message_value && (message_value != 'false')){
+              if((message_value != true) && (message_value != 'true')){
+                this.$listener.attr('href',message_value);
               }
               if(this.progress_indicator){
                 this.progress_indicator.stop();
@@ -242,15 +243,15 @@ var ForeignOfficeListener = Class.extend({
               }else if(this.$listener.data('ajax-form')){
                 this.$listener.trigger('apisubmit');
               }else if(this.$listener.data('download')){
-                window.open(new_value);
+                window.open(message_value);
               }else{
-                window.location = new_value;
+                window.location = message_value;
               }
             }
           }else if (m.object[this.delete_key] == true) {
             $listener.remove();
           }else{
-            this.$listener.html(new_value);
+            this.$listener.html(message_value);
           }
         break;
       }

data/lib/foreign_office/foreign_office_helper.rb

@@ -1,12 +1,15 @@
 module ForeignOffice
   module ForeignOfficeHelper
-    def listener_attrs(resource, key, reveal_hide: false, endpoint: nil, download: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil, mask_me: nil)
+    def listener_attrs(resource, key, reveal_hide: false, endpoint: nil, download: nil,
+      trigger: nil, delete: nil, href_target: nil, create_modal: nil, mask_me: nil,
+      exclude_value: nil)
       data_attrs = "data-listener=true data-channel=#{resource.class.name}#{resource.id}"
       if delete
         data_attrs += " data-delete-key=#{key}"
       else
         data_attrs += " data-key=#{key}"
       end
+      data_attrs += " data-exclude-value=#{exclude_value}" if exclude_value
       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
@@ -22,7 +25,9 @@ module ForeignOffice
       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, mask_me: nil)
+    def listener_attrs_raw(channel, key, reveal_hide: false, endpoint: nil, download: nil,
+      trigger: nil, delete: nil, href_target: nil, create_modal: nil, mask_me: nil,
+      exclude_value: nil)
       data_attrs = "data-listener=true data-channel=#{channel}"
       if delete
         data_attrs += " data-delete-key=#{key}"
@@ -30,6 +35,7 @@ module ForeignOffice
         data_attrs += " data-key=#{key}"
       end
       data_attrs += " data-reveal-hide=true" if reveal_hide
+      data_attrs += " data-endpoint=#{exclude_value}" if exclude_value
       data_attrs += " data-endpoint=#{endpoint}" if endpoint
       data_attrs += " data-download=true" if download
       data_attrs += " data-trigger-on-message=true" if trigger
@@ -39,7 +45,9 @@ module ForeignOffice
       data_attrs
     end
 
-    def listener_hash(resource, key, reveal_hide: false, endpoint: nil, download: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil, mask_me: nil)
+    def listener_hash(resource, key, reveal_hide: false, endpoint: nil, download: nil,
+      trigger: nil, delete: nil, href_target: nil, create_modal: nil, mask_me: nil,
+      exclude_value: nil)
       hash = {listener: true, channel: resource.class.name + resource.id.to_s}
       if delete
         hash[:delete_key] = key
@@ -48,6 +56,7 @@ module ForeignOffice
       end
       hash[:reveal_hide] = true if reveal_hide
       hash[:endpoint] = endpoint if endpoint
+      hash[:exclude_value] = exclude_value if exclude_value
       hash[:download] = true if download
       hash[:trigger_on_message] = true if trigger
       hash[:href_target] = true if href_target
@@ -56,7 +65,9 @@ module ForeignOffice
       hash
     end
 
-    def listener_hash_raw(channel, key, reveal_hide: false, endpoint: nil, download: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil, mask_me: nil)
+    def listener_hash_raw(channel, key, reveal_hide: false, endpoint: nil, download: nil,
+      trigger: nil, delete: nil, href_target: nil, create_modal: nil, mask_me: nil,
+      exclude_value: nil)
       hash = {listener: true, channel: channel}
       if delete
         hash[:delete_key] = key
@@ -65,6 +76,7 @@ module ForeignOffice
       end
       hash[:reveal_hide] = true if reveal_hide
       hash[:endpoint] = endpoint if endpoint
+      hash[:exclude_value] = exclude_value if exclude_value
       hash[:download] = true if download
       hash[:trigger_on_message] = true if trigger
       hash[:href_target] = true if href_target

data/lib/foreign_office/version.rb

@@ -1,3 +1,3 @@
 module ForeignOffice
-  VERSION = "0.15.12"
+  VERSION = "0.16.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_office
 version: !ruby/object:Gem::Version
-  version: 0.15.12
+  version: 0.16.0
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails