outpost-asset_host 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b057234884be99db3aa56824d86d30feb805b5c
-  data.tar.gz: 698ef6151d5ad6a3cdf287b38c3d6277cdfc683c
+  metadata.gz: 5d1f535609de521469e11aecb8a285454f2030fd
+  data.tar.gz: 6f8dc01efc6410374ff458804ace068295224dce
 SHA512:
-  metadata.gz: 0f8879c7a9e081de29e1706b0fecabc625c8fb4a6ee2ff627b3c8a29cf00bd8661d25edc6dd76eff746b1f1965ceb1191e79997e14428123d6d3be2977deda6e
-  data.tar.gz: dc1b6e608bf178f74bb4afa7c1b029501278608868bf1c8f2bee892333eca222bc148db963053c91c052935e9b68b870accdc4e440fe6d6db40c39bd49dbc1c2
+  metadata.gz: 6608c0c56506c27c01feeaf9bbf7c49f11a4bd1c13fdab69eaf0ec075749f92f01c58e93cc9eb970ed3cea9b92cd18bb1c5cbafc7e0599f4807bcbda53f73157
+  data.tar.gz: 4d8512418aacf5a8ee7e70d646ea355c7d8b502ebdcf723c445cb8664de97f481e8808414f1f52964f6947101fc245e724ea483f042da23000e6c1ed7ef66fed

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.1
+### Fixes
+* Added a check to make sure messages are coming from AssetHost. This fixes conflicts with anything else sending messages to the window (such as the Evernote Web Clipper Chrome extension).
+
+
 ## 1.1.0
 ### Changes
 * Removed old Secretary hooks.

data/lib/assets/javascripts/outpost/asset_host/asset_manager.js.coffee

@@ -23,7 +23,9 @@ class outpost.AssetManager
         # Register listener for AssetHost message
         window.addEventListener "message", (event) =>
             # If the data is an object (i.e. not "LOADED"), do things
-            if _.isObject(event.data)
+            # Also make sure the origin is from AssetHost, otherwise
+            # other messages could trigger this callback.
+            if event.origin == assethost.SERVER and _.isObject(event.data)
                 @assets.reset(event.data)
                 @assets.sort()
                 @assetsView.render()
@@ -81,7 +83,9 @@ class outpost.AssetManager
 
             # attach a listener to wait for the LOADED message
             window.addEventListener "message", (evt) =>
-                if evt.data == "LOADED" and @chooserIsAvailable()
+                if evt.origin == assethost.SERVER and
+                evt.data == "LOADED" and
+                @chooserIsAvailable()
                     console.log @collection.toJSON()
                     # dispatch our event with the asset data
                     window.assethostChooser.postMessage @collection.toJSON(), assethost.SERVER

data/lib/outpost/asset_host/version.rb

@@ -1,5 +1,5 @@
 module Outpost
   module AssetHost
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: outpost-asset_host
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Bryan Ricker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler