diff options
| author | Jonathan Duran | 2012-03-06 17:08:55 -0800 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-06 17:08:55 -0800 |
| commit | bb6a1d82b2884b410f5859cc0c2cafd380acbe6a (patch) | |
| tree | 6ec3e960a0c38ce8fd88c9bc17f5227d072ebe76 /js | |
| parent | 2815adfd7c19b3dff89dc3e1bda9af8d30dca8d6 (diff) | |
| parent | 2e3943a8f751ec572066f168b58464c24b9f29e5 (diff) | |
| download | ninja-bb6a1d82b2884b410f5859cc0c2cafd380acbe6a.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js')
113 files changed, 12026 insertions, 663 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 64ff2c7e..194496a6 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
| @@ -76,11 +76,14 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
| 76 | // | 76 | // |
| 77 | handleWebRequest: { | 77 | handleWebRequest: { |
| 78 | value: function (request) { | 78 | value: function (request) { |
| 79 | if (this._hackRootFlag && request.url.indexOf('js/document/templates/montage-html') !== -1) { | 79 | //TODO: Check if frameId is proper |
| 80 | if (this._hackRootFlag && request.parentFrameId !== -1) { | ||
| 80 | //TODO: Optimize creating string | 81 | //TODO: Optimize creating string |
| 81 | 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]}; | 82 | //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url); |
| 82 | } | 83 | //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]}; |
| 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(chrome.extension.getURL('js/document/templates/montage-html/'))[1]}; | ||
| 83 | } | 85 | } |