From fa3ebf391db168d7c4ebcc86450c66684eeeb5cd Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Wed, 21 Mar 2012 11:11:51 -0700 Subject: Removing usage of webRequest APIs Removed the usage of the webRequest API since all files are parsed on open to handle prefixing correct origin. This will most likely not work for assets that are added dynamically and will most likely break, all those adding linking to assets should make use of a function in the mediator to mask the display value and actual value of the linked asset. --- js/controllers/document-controller.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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, } }, //////////////////////////////////////////////////////////////////// +*/ -- cgit v1.2.3 From 873bb850a44d3b388fe6742c6aadc6e0caaae30b Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Wed, 21 Mar 2012 12:03:36 -0700 Subject: Fix: Chrome 19 I/O Bug Fixed creating new files. --- js/io/system/coreioapi.js | 4 ++-- manifest.json | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) 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": { -- cgit v1.2.3 From df25e7bb3dd45cec5815dcd303a94726e982cabf Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Wed, 21 Mar 2012 13:22:41 -0700 Subject: Updating descriptor file Still an outstanding issue of assets loaded dynamically. --- node_modules/descriptor.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json index d5bb81f3..e5606655 100644 --- a/node_modules/descriptor.json +++ b/node_modules/descriptor.json @@ -122,6 +122,32 @@ "data/sqlaccess/sqlstore.js", "data/store.js", "data/transactionid.js", + "examples/feed-reader/images/07-map-marker.png", + "examples/feed-reader/images/10-medical.png", + "examples/feed-reader/images/100-coffee.png", + "examples/feed-reader/images/107-widescreen.png", + "examples/feed-reader/images/125-food.png", + "examples/feed-reader/images/142-wine-bottle.png", + "examples/feed-reader/images/34-coffee.png", + "examples/feed-reader/images/35-shopping.png", + "examples/feed-reader/images/38-airplane.png", + "examples/feed-reader/images/41-picture-frame.png", + "examples/feed-reader/images/47-fuel.png", + "examples/feed-reader/images/48-fork-and-knife.png", + "examples/feed-reader/images/80-shopping-cart.png", + "examples/feed-reader/images/87-wine-glass.png", + "examples/feed-reader/images/88-beer-mug.png", + "examples/feed-reader/index.html", + "examples/feed-reader/main.reel/main.html", + "examples/feed-reader/main.reel/main.js", + "examples/feed-reader/map-example.reel/main.css", + "examples/feed-reader/map-example.reel/main.html", + "examples/feed-reader/map-example.reel/main.js", + "examples/feed-reader/package.json", + "examples/youtube-channel-example/index.html", + "examples/youtube-channel-example/package.json", + "examples/youtube-channel-example/style.css", + "examples/youtube-channel-example/youtube-channel-example.js", "montage.js", "node.js", "package.json", -- cgit v1.2.3