foreign_office 0.15.4 → 0.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8b724e87d76a84ac6d69d6813262301701e9fc8
-  data.tar.gz: cc937e48ae10e0d2a14abb2ef24b182afbc9cb41
+  metadata.gz: 17068b3e2172075329c4579dacaac0dda6032561
+  data.tar.gz: a53d4f5b0098dd9185a1ed4b9b747729aae7929d
 SHA512:
-  metadata.gz: 197850ea7e22c563a79d0ddcf18c633175b9173368ce33f9314b44c33ab6acbeffb8c624dfc6c46de83ef5823cbdf43a8aee2f12b61da977b34bdc1b3562fd1d
-  data.tar.gz: d9e6592467e06e40501332051a146be09e8e84c730448189b1218a12ac371206e820923cff6dba315036256e1bb3268a743b83976e3e0db0ef17ddb60373e2a0
+  metadata.gz: ec858f6edf29e33581509a5c1e855b8727cfde6cfed1e9219d2e5c220d6e09a8460cde72465939a659ff12ac6a264e17957fec61739f0b003b5e0bd80aa76f97
+  data.tar.gz: 02d63300cfd6dfe4ca8bcea24c52c43ec731d03d5f8d4d66c83795e45230f48d62f06e493732e866d9b3989bb33189c6fb307dadf099db21c17edc9b8099edbf

data/app/assets/javascripts/foreign_office.js

@@ -50,6 +50,10 @@ var ForeignOffice = Class.extend({
     }
     this_channel.addListener(listener);
   },
+  removeListener: function($listener){
+    let listener = $listener.data('foreign_office.ForeignOfficeListener');
+    listener.getChannelObject().removeListener(listener)
+  },
   channelNames: function(){
     return $.map(this.channels,function(channel){return channel.channel_name});
   },
@@ -106,7 +110,7 @@ var ForeignOfficeChannel = Class.extend({
   },
   addListener: function(listener){
     this.listeners.push(listener);
-    //need to ensure forms are last in the list, so that inputs 
+    //need to ensure forms are last in the list, so that inputs
     //will be updated before forms are submitted
     //NB. this will only work if the form and its inputs share the same channel
     //since we can't control the order of channel messages coming across the wire
@@ -121,17 +125,23 @@ var ForeignOfficeChannel = Class.extend({
       }
       return 0 //('form' == a_kind) && ('form' == b_kind)
     })
+  },
+  removeListener: function(listener){
+    listener_index = this.listeners.indexOf(listener)
+    this.listeners.splice(listener_index,1)
   }
 });
 
 var ForeignOfficeListener = Class.extend({
   init: function($listener){
     this.$listener = $listener;
+    $listener.data('foreign_office.ForeignOfficeListener',this)
     this.endpoint = $listener.data('endpoint');
     this.reveal_hide = $listener.data('reveal-hide');
     this.object_key = $listener.data('key');
     this.delete_key = $listener.data('delete-key');
-    this.href_target = $listener.data('href-target')
+    this.href_target = $listener.data('href-target');
+    this.create_modal = $listener.data('create-modal');
     this.channel = $listener.data('channel');
     if(this.$listener.data('progress-indicator')){
       this.progress_indicator = new thin_man.AjaxProgress(this.$listener);
@@ -167,6 +177,12 @@ var ForeignOfficeListener = Class.extend({
       }
     }else if(this.href_target){
       this.$listener.attr('href',m.object[this.object_key])
+    }else if(this.create_modal){
+      var $modal_content = $('<div>').html($(this.create_modal).html());
+      var modal = new hooch.Modal($modal_content);
+      modal.$dismisser.remove();
+      delete modal.dismisser;
+      delete modal.$dismisser;
     }else{
       var new_value = m.object[this.object_key];
       switch(this.$listener.get(0).nodeName.toLowerCase()){
@@ -227,6 +243,9 @@ var ForeignOfficeListener = Class.extend({
       this_listener.foreign_office_flash = $(this).data('ajax-foreign-office-flash').notice;
     })
   },
+  getChannelObject: function(){
+    return foreign_office.channels_by_name[this.channel];
+  },
   removeProgressIndicator: function(){
     if(this.foreign_office_progress_indicator){
       this.foreign_office_progress_indicator.stop();

data/lib/foreign_office.rb

@@ -40,7 +40,9 @@ module ForeignOffice
   def self.publish(message)
     Rails.logger.debug("ForeignOffice.publish: #{message.inspect}")
     if !!@cache_messages
-      RequestStore.store[:foreign_office_messages][message[:channel]] = message
+      foreign_office_messages = RequestStore.store[:foreign_office_messages]
+      channel_name = message[:channel]
+      foreign_office_messages[channel_name] = message
     else
       self.handle_publish_request(message)
     end

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)
+    def listener_attrs(resource, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil)
       data_attrs = "data-listener=true data-channel=#{resource.class.name}#{resource.id}"
       if delete
         data_attrs += " data-delete-key=#{key}"
@@ -11,10 +11,11 @@ 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-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)
+    def listener_attrs_raw(channel, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil)
       data_attrs = "data-listener=true data-channel=#{channel}"
       if delete
         data_attrs += " data-delete-key=#{key}"
@@ -25,10 +26,11 @@ 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-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)
+    def listener_hash(resource, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil)
       hash = {listener: true, channel: resource.class.name + resource.id.to_s}
       if delete
         hash[:delete_key] = key
@@ -39,10 +41,11 @@ module ForeignOffice
       hash[:endpoint] = endpoint if endpoint
       hash[:trigger_on_message] = true if trigger
       hash[:href_target] = true if href_target
+      hash[:create_modal] = create_modal if create_modal
       hash
     end
 
-    def listener_hash_raw(channel, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil)
+    def listener_hash_raw(channel, key, reveal_hide: false, endpoint: nil, trigger: nil, delete: nil, href_target: nil, create_modal: nil)
       hash = {listener: true, channel: channel}
       if delete
         hash[:delete_key] = key
@@ -53,7 +56,8 @@ module ForeignOffice
       hash[:endpoint] = endpoint if endpoint
       hash[:trigger_on_message] = true if trigger
       hash[:href_target] = true if href_target
+      hash[:create_modal] = create_modal if create_modal
       hash
     end
   end
-end
+end

data/lib/foreign_office/version.rb

@@ -1,3 +1,3 @@
 module ForeignOffice
-  VERSION = "0.15.4"
+  VERSION = "0.15.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_office
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.5
 platform: ruby
 authors:
 - Eric Draut