aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-22 16:40:03 -0800
committerValerio Virgillito2012-02-22 16:40:03 -0800
commitf8e491fe81981c95fb1352a21d1f99cc375f240e (patch)
tree4b8c49cf9a3317154aeff29c72ac888c187df09a /js/controllers
parent91f6f672ee96c6e7e942b555af7057d6db52d90f (diff)
parent2afef244a3f8124f8a049e504e9782c05904ce23 (diff)
downloadninja-f8e491fe81981c95fb1352a21d1f99cc375f240e.tar.gz
Merge branch 'refs/heads/master' into file-io
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/document-controller.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 7491ef9f..fa611de4 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -85,7 +85,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
85 handleAppLoaded: { 85 handleAppLoaded: {
86 value: function() { 86 value: function() {
87 //Adding an intercept to resources loaded to ensure user assets load from cloud simulator 87 //Adding an intercept to resources loaded to ensure user assets load from cloud simulator
88 chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]); 88 if (window.chrome.app.isInstalled) {
89 chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
90 }
89 } 91 }
90 }, 92 },
91 //////////////////////////////////////////////////////////////////// 93 ////////////////////////////////////////////////////////////////////