aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/document-controller.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-26 15:36:49 -0700
committerJose Antonio Marquez2012-03-26 15:36:49 -0700
commit7bf738bc08f6a24edce30dbc2b101a8cab2d27aa (patch)
treeaf3b114d6a83ae62dfcead8bd61bc62efe0c9516 /js/controllers/document-controller.js
parentd87cded11dcc0faf41a4a3e6b587e5549c0da6df (diff)
parent309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
downloadninja-7bf738bc08f6a24edce30dbc2b101a8cab2d27aa.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/controllers/document-controller.js')
-rwxr-xr-xjs/controllers/document-controller.js15
1 files changed, 10 insertions, 5 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 3db4c7d4..d5556fa8 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -64,16 +64,21 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
64 64
65 this.eventManager.addEventListener("styleSheetDirty", this, false); 65 this.eventManager.addEventListener("styleSheetDirty", this, false);
66 66
67 this.eventManager.addEventListener("addComponentFirstDraw", this, false);
67 } 68 }
68 }, 69 },
69 70
70 71 handleAddComponentFirstDraw: {
72 value: function (e) {
73 //TODO: Add logic to reparse the document for dynamically added styles
74 console.log(e);
75 }
76 },
71 77
72 78
73 79
74 80
75 81
76 /*
77//////////////////////////////////////////////////////////////////// 82////////////////////////////////////////////////////////////////////
78 // 83 //
79 handleWebRequest: { 84 handleWebRequest: {
@@ -81,7 +86,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
81 //TODO: Check if frameId is proper 86 //TODO: Check if frameId is proper
82 if (this._hackRootFlag && request.parentFrameId !== -1) { 87 if (this._hackRootFlag && request.parentFrameId !== -1) {
83 //TODO: Optimize creating string 88 //TODO: Optimize creating string
84 console.log(request); 89 //console.log(request);
85 //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url); 90 //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url);
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]}; 91 //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]};
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]}; 92 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]};
@@ -104,7 +109,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
104 } 109 }
105 }, 110 },
106 //////////////////////////////////////////////////////////////////// 111 ////////////////////////////////////////////////////////////////////
107*/ 112
108 113
109 114
110 115