aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-22 09:57:55 -0700
committerJose Antonio Marquez2012-03-22 09:57:55 -0700
commit2f492522621089366c0ff6bafa406ed100cb1aec (patch)
tree3a41ac728d108b73fd9be83004ca7d9e2d367f18
parentefcec76362a652033254fc6465dd127e8bebc04c (diff)
parentf0392fb5a05c5d4b3dd37ebc64c1dee2c2b6b848 (diff)
downloadninja-2f492522621089366c0ff6bafa406ed100cb1aec.tar.gz
Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Components
-rwxr-xr-xjs/controllers/document-controller.js7
-rw-r--r--manifest.json5
2 files changed, 7 insertions, 5 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index c6f867aa..d5556fa8 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -78,8 +78,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
78 78
79 79
80 80
81 81
82 /*
83//////////////////////////////////////////////////////////////////// 82////////////////////////////////////////////////////////////////////
84 // 83 //
85 handleWebRequest: { 84 handleWebRequest: {
@@ -87,7 +86,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
87 //TODO: Check if frameId is proper 86 //TODO: Check if frameId is proper
88 if (this._hackRootFlag && request.parentFrameId !== -1) { 87 if (this._hackRootFlag && request.parentFrameId !== -1) {
89 //TODO: Optimize creating string 88 //TODO: Optimize creating string
90 console.log(request); 89 //console.log(request);
91 //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url); 90 //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url);
92 //return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]}; 91 //return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]};
93 return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/montage-html/'))[1]}; 92 return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/montage-html/'))[1]};
@@ -110,7 +109,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
110 } 109 }
111 }, 110 },
112 //////////////////////////////////////////////////////////////////// 111 ////////////////////////////////////////////////////////////////////
113*/ 112
114 113
115 114
116 115
diff --git a/manifest.json b/manifest.json
index 0500101b..50e1cba1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,7 +12,10 @@
12 }, 12 },
13 "permissions": [ 13 "permissions": [
14 "unlimitedStorage", 14 "unlimitedStorage",
15 "notifications" 15 "notifications",
16 "webRequest",
17 "webRequestBlocking",
18 "http://www.google.com/*"
16 ], 19 ],
17 "requirements": { 20 "requirements": {
18 "3D": { 21 "3D": {