foreign_office 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21cc8423d3c2968af39056f4d38ab4fe9b6f1595
-  data.tar.gz: ce68f970618fdf2942424c28ff59785a69d9880b
+  metadata.gz: d52a84688cf5ff06aa54de9bc51be17de548a743
+  data.tar.gz: 94dd508cdaa0210dd6d794b2620501b70c8076a8
 SHA512:
-  metadata.gz: 2b5253d0ecbcae1e0dbfcf455a57f5e1015d634426dbb0b29defe8c0712a0e41a5b224d729eddea74be2e7a05f24e4927116c338838acf355a2725eb7f7098f4
-  data.tar.gz: 08d8f94809996bea13066400747bc241c7fc26b809d9869230b76b2e6dabad8145f526c15471adfed6af19a9fe0f6247217c283d27ae51edcc9c4095fe3c913b
+  metadata.gz: 42bcdc01c9a2fbd8580a4500816702f3e4efe4f2ff626fa95a11d34cf72de5ae667fc4af80cbd33c5e282dd0d22bf6e48eb677515344b05fc4e410d5614c8c2f
+  data.tar.gz: 561668e5074b7d894afd866790e215049da54966a76ebcc43d7d70505b78414eacfb191e8e44668b1c0acfae932af1809347d0c4c14e1f1997da1b6d3cb76def

data/app/assets/javascripts/foreign_office.js

@@ -101,6 +101,21 @@ var ForeignOfficeChannel = Class.extend({
   },
   addListener: function(listener){
     this.listeners.push(listener);
+    //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
+    this.listeners.sort(function(a,b){
+      var a_kind = a.$listener.get(0).nodeName.toLowerCase()
+      var b_kind = b.$listener.get(0).nodeName.toLowerCase()
+      if(('form' != a_kind) && ('form' == b_kind)){
+        return -1
+      }
+      if(('form' == a_kind) && ('form' != b_kind)){
+        return 1
+      }
+      return 0 //('form' == a_kind) && ('form' == b_kind)
+    })
   }
 });
 
@@ -119,6 +134,9 @@ var ForeignOfficeListener = Class.extend({
   },
   handleMessage: function(m){
     var $listener = this.$listener;
+    if(!m.object.hasOwnProperty(this.object_key) && !m.object.hasOwnProperty(this.delete_key)){
+      return true
+    }
     if(this.endpoint){
       if (m.object[this.object_key] == true) {
         $.get(this.endpoint, function(data){
@@ -155,7 +173,9 @@ var ForeignOfficeListener = Class.extend({
           }
         break;
         case 'select':
-          this.$listener.find('option[value="' + new_value + '"]').attr('selected','selected')
+          if(this.$listener.val() != ('' + new_value)){
+            this.$listener.val('' + new_value).change()
+          }
           this.$listener.trigger("chosen:updated")
         break;
 
@@ -178,6 +198,8 @@ var ForeignOfficeListener = Class.extend({
               }
               if(this.$listener.data('ajax-link')){
                 this.$listener.trigger('apiclick');
+              }else if(this.$listener.data('ajax-form')){
+                this.$listener.trigger('apisubmit');
               }else{
                 window.location = new_value;
               }

data/lib/foreign_office/version.rb

@@ -1,3 +1,3 @@
 module ForeignOffice
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_office
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails