aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorJohn Mayhew2012-02-22 13:45:28 -0800
committerJohn Mayhew2012-02-22 13:45:28 -0800
commit79da052891a3d8cfb70489edb71619f27bfe3939 (patch)
tree023543119db19823b70f4ff5cd6b9b956c4f0ac5 /js/controllers
parent2f24dafec79583547fe663d5a387d8ef15aae3bf (diff)
downloadninja-79da052891a3d8cfb70489edb71619f27bfe3939.tar.gz
Fix for bug that keeps Ninja from launching over HTTP. We need to wrap any extension specific code in an if (window.chrome.app.isInstalled) check.
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 ////////////////////////////////////////////////////////////////////