aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorJonathan Duran2012-02-24 09:30:01 -0800
committerJonathan Duran2012-02-24 09:30:01 -0800
commit2b2bf67d1b7928e4e9d8dde5abf78618b9a1c9ce (patch)
tree552025d3840184b1bea2ad4608fc90a50a68dcba /js/controllers
parent0327073eff62d4b800206ba0f3ba2140ae5da8bc (diff)
parentdb2fd02a1b0e909bb536fa63cefd2144f4642ead (diff)
downloadninja-2b2bf67d1b7928e4e9d8dde5abf78618b9a1c9ce.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/document-controller.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index fa611de4..1c9d9d59 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -84,8 +84,13 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
84 // 84 //
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 //Checking for app to be loaded through extension
88 if (window.chrome.app.isInstalled) { 88 var check;
89 if (chrome && chrome.app) {
90 check = chrome.app.getDetails();
91 }
92 if (check !== null) {
93 //Adding an intercept to resources loaded to ensure user assets load from cloud simulator
89 chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]); 94 chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
90 } 95 }
91 } 96 }