diff options
author | Jose Antonio Marquez | 2012-02-22 22:48:56 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-22 22:48:56 -0800 |
commit | 3e1be6d4d4f0d3a2474af7d915954f9b6464fe2e (patch) | |
tree | 6310f80c7361d342c356ab0faea17260445a9259 /js/controllers | |
parent | 25e6a03cf8af4bd0496a8b21c82332d76ddd9fff (diff) | |
parent | 2afef244a3f8124f8a049e504e9782c05904ce23 (diff) | |
download | ninja-3e1be6d4d4f0d3a2474af7d915954f9b6464fe2e.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/document-controller.js | 4 |
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 | //////////////////////////////////////////////////////////////////// |