Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Components

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,
                         
                         
                         
-                                        
-    /*
+
 ////////////////////////////////////////////////////////////////////
         //
     handleWebRequest: {
@@ -87,7 +86,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                 //TODO: Check if frameId is proper
                 if (this._hackRootFlag && request.parentFrameId !== -1) {
                         //TODO: Optimize creating string
-                        console.log(request);
+                        //console.log(request);
                         //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url);
                                 //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]};
                                 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,
         }
     },
         ////////////////////////////////////////////////////////////////////
-*/
+
 
         
         
diff --git a/manifest.json b/manifest.json
index 0500101b..50e1cba1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,7 +12,10 @@
   },
   "permissions": [
     "unlimitedStorage",
-    "notifications"
+    "notifications",
+    "webRequest",
+    "webRequestBlocking",
+    "http://www.google.com/*"
   ],
   "requirements": {
     "3D": {