diff options
author | Jose Antonio Marquez | 2012-02-22 22:48:45 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-22 22:48:45 -0800 |
commit | 3673372c1bf05840cb009aaaa12af31ce665f6ef (patch) | |
tree | f522e2ee020265d4a61d4f6fc93c42b3c323224d /js/controllers | |
parent | 593b2c954cf507bcb61d27f18d63b1406e7364c4 (diff) | |
parent | 2afef244a3f8124f8a049e504e9782c05904ce23 (diff) | |
download | ninja-3673372c1bf05840cb009aaaa12af31ce665f6ef.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
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 a6f600cc..77ae67a1 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -87,7 +87,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
87 | handleAppLoaded: { | 87 | handleAppLoaded: { |
88 | value: function() { | 88 | value: function() { |
89 | //Adding an intercept to resources loaded to ensure user assets load from cloud simulator | 89 | //Adding an intercept to resources loaded to ensure user assets load from cloud simulator |
90 | chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]); | 90 | if (window.chrome.app.isInstalled) { |
91 | chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]); | ||
92 | } | ||
91 | } | 93 | } |
92 | }, | 94 | }, |
93 | //////////////////////////////////////////////////////////////////// | 95 | //////////////////////////////////////////////////////////////////// |