aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-21 12:03:51 -0700
committerJose Antonio Marquez2012-03-21 12:03:51 -0700
commitb1a64afd2840efe9397b68bfd7a86e4e45982944 (patch)
treebe51787a221f8be8584389c003f3e9eeef8e02f1 /js/controllers
parentbeb72aa033f42d09d54a4ea6cc6b5ca59cc6fae7 (diff)
parent873bb850a44d3b388fe6742c6aadc6e0caaae30b (diff)
downloadninja-b1a64afd2840efe9397b68bfd7a86e4e45982944.tar.gz
Merge branch 'refs/heads/FileIO' into FileIO-Montage-Components
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/document-controller.js5
1 files changed, 4 insertions, 1 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,
73 73
74 74
75 75
76 //////////////////////////////////////////////////////////////////// 76 /*
77////////////////////////////////////////////////////////////////////
77 // 78 //
78 handleWebRequest: { 79 handleWebRequest: {
79 value: function (request) { 80 value: function (request) {
80 //TODO: Check if frameId is proper 81 //TODO: Check if frameId is proper
81 if (this._hackRootFlag && request.parentFrameId !== -1) { 82 if (this._hackRootFlag && request.parentFrameId !== -1) {
82 //TODO: Optimize creating string 83 //TODO: Optimize creating string
84 console.log(request);
83 //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url); 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 //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]}; 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(chrome.extension.getURL('js/document/templates/montage-html/'))[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]};
@@ -102,6 +104,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
102 } 104 }
103 }, 105 },
104 //////////////////////////////////////////////////////////////////// 106 ////////////////////////////////////////////////////////////////////
107*/
105 108
106 109
107 110