aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-21 17:22:47 -0700
committerValerio Virgillito2012-03-21 17:22:47 -0700
commitf0392fb5a05c5d4b3dd37ebc64c1dee2c2b6b848 (patch)
treef36b68c990a0c9e336780264dc6eb166c5ca54dd
parent19aca6ec6f3c10922646f0ca760a375acdffaf56 (diff)
downloadninja-f0392fb5a05c5d4b3dd37ebc64c1dee2c2b6b848.tar.gz
Changes to the webrequest blocking and adding a google.com permission workaround
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
-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 3db4c7d4..539fd13e 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -72,8 +72,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
72 72
73 73
74 74
75 75
76 /*
77//////////////////////////////////////////////////////////////////// 76////////////////////////////////////////////////////////////////////
78 // 77 //
79 handleWebRequest: { 78 handleWebRequest: {
@@ -81,7 +80,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
81 //TODO: Check if frameId is proper 80 //TODO: Check if frameId is proper
82 if (this._hackRootFlag && request.parentFrameId !== -1) { 81 if (this._hackRootFlag && request.parentFrameId !== -1) {
83 //TODO: Optimize creating string 82 //TODO: Optimize creating string
84 console.log(request); 83 //console.log(request);
85 //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url); 84 //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url);
86 //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]}; 85 //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]};
87 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]}; 86 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]};
@@ -104,7 +103,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
104 } 103 }
105 }, 104 },
106 //////////////////////////////////////////////////////////////////// 105 ////////////////////////////////////////////////////////////////////
107*/ 106
108 107
109 108
110 109
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": {