aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/document-controller.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-22 16:45:08 -0800
committerNivesh Rajbhandari2012-02-22 16:45:08 -0800
commit1ed02c161f0fc063299a606e61ccece878a307a3 (patch)
treed28b88a62125446644a220ef706cabcb46dc15e7 /js/controllers/document-controller.js
parent5272d5585b0fbae233d829ac9a9b5207838ec74c (diff)
parent2afef244a3f8124f8a049e504e9782c05904ce23 (diff)
downloadninja-1ed02c161f0fc063299a606e61ccece878a307a3.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Diffstat (limited to 'js/controllers/document-controller.js')
-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 ////////////////////////////////////////////////////////////////////