Merge branch 'refs/heads/FileIO-jose' into FileIO

1 files changed, 6 insertions, 2 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 6f7d098f..e221df68 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -86,8 +86,12 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         //
     handleAppLoaded: {
         value: function() {
-            //Checking for app not to be loaded via http/https to add app only listener
-            if (window.location.protocol !== 'http:' && window.location.protocol !== 'https:') {
+            //Checking for app to be loaded through extension
+            var check;
+            if (chrome && chrome.app) {
+                check = chrome.app.getDetails();
+            }
+            if (check !== null) {
                 //Adding an intercept to resources loaded to ensure user assets load from cloud simulator
                 chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
             }