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

3 files changed, 7 insertions, 6 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 7d982a62..3db4c7d4 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -73,13 +73,15 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                         
                         
                                         
-    ////////////////////////////////////////////////////////////////////
+    /*
+////////////////////////////////////////////////////////////////////
         //
     handleWebRequest: {
         value: function (request) {
                 //TODO: Check if frameId is proper
                 if (this._hackRootFlag && request.parentFrameId !== -1) {
                         //TODO: Optimize creating string
+                        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]};
@@ -102,6 +104,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
         ////////////////////////////////////////////////////////////////////
+*/
 
         
         
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index f428a229..ae249480 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -393,12 +393,12 @@ exports.CoreIoApi = Montage.create(Component, {
                         xhr = new XMLHttpRequest();
                     //
                     xhr.open("POST", serviceURL, false);
-                    xhr.responseType = "arraybuffer"; 
+                    //xhr.responseType = "arraybuffer"; 
                     if(file.contentType && file.contentType.length)
                         xhr.setRequestHeader("Content-Type", file.contentType);
                     else
                         xhr.setRequestHeader("Content-Type", "text/plain");
-
+                    
                     if (file.contents)
                         xhr.send(file.contents);
                     else
diff --git a/manifest.json b/manifest.json
index 80d8a5be..0500101b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,9 +12,7 @@
   },
   "permissions": [
     "unlimitedStorage",
-    "notifications",
-    "webRequest",
-    "webRequestBlocking"
+    "notifications"
   ],
   "requirements": {
     "3D": {