diff options
author | Valerio Virgillito | 2012-03-21 13:32:10 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-21 13:32:10 -0700 |
commit | a5b5ec05a032a5c21249857351b2af243584279c (patch) | |
tree | ab0acad7a5a914a709677125b6deefbdf5cab33b /js/controllers | |
parent | 21a88a93f039bb7470c10d77efc01e549c4ae6dc (diff) | |
parent | 25c93afe8795c1b53859f4fa08220a947ace937e (diff) | |
download | ninja-a5b5ec05a032a5c21249857351b2af243584279c.tar.gz |
Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/document-controller.js | 5 |
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 | ||