diff options
author | Valerio Virgillito | 2012-05-10 16:03:45 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-10 16:03:45 -0700 |
commit | 9d0356be5d05dfc53829a7c0cd26e6849f51be75 (patch) | |
tree | 2371f0d74ba67c724b2a4bdacbbb3fcd1df13b14 /js/controllers/document-controller.js | |
parent | d6cec6193a16563e9d35d75f0caee49bab927cda (diff) | |
parent | c23c4bad96ebc4c2f85070e4cc2511030cac05fc (diff) | |
download | ninja-9d0356be5d05dfc53829a7c0cd26e6849f51be75.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into dom-architecture
Diffstat (limited to 'js/controllers/document-controller.js')
-rwxr-xr-x | js/controllers/document-controller.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 58fa4de7..84e9f4fc 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -89,8 +89,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
89 | 89 | ||
90 | 90 | ||
91 | //TODO: Ensure these APIs are not needed | 91 | //TODO: Ensure these APIs are not needed |
92 | /* | 92 | //////////////////////////////////////////////////////////////////// |
93 | //////////////////////////////////////////////////////////////////// | ||
94 | // | 93 | // |
95 | handleWebRequest: { | 94 | handleWebRequest: { |
96 | value: function (request) { | 95 | value: function (request) { |
@@ -100,7 +99,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
100 | //console.log(request); | 99 | //console.log(request); |
101 | //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url); | 100 | //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url); |
102 | //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]}; | 101 | //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]}; |
103 | 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 | 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-web/'))[1]}; |
104 | } | 103 | } |
105 | } | 104 | } |
106 | }, | 105 | }, |
@@ -120,7 +119,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
120 | } | 119 | } |
121 | }, | 120 | }, |
122 | //////////////////////////////////////////////////////////////////// | 121 | //////////////////////////////////////////////////////////////////// |
123 | */ | ||
124 | 122 | ||
125 | 123 | ||
126 | 124 | ||