aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-17 11:25:41 -0700
committerJose Antonio Marquez2012-07-17 11:25:41 -0700
commit17d464e5bd224cdd8940855409359b411325f1df (patch)
tree1ebdc306a8e88a6738fbece21cb1943fc9fa19e6 /js/components/layout
parent928cc57730d1938c03013d3512c324677f5b8d2c (diff)
downloadninja-17d464e5bd224cdd8940855409359b411325f1df.tar.gz
New: Adding re-render method to switching view
This now re-renders the design view when switching from code view. There are many outstanding issues, the Time-Line completely breaks and blocks Ninja, it is unknown why, there are too many dependencies. To make it work, we disabled that feature, although this check in does not include that, so it can be fixed proper. Also, the document controller creates a new tab per switch as it does not check that it is the same document. That bug must also be fixed. Finally, we need to hook up a new code view to the document, the current code view will not work as desired, so a new code view must be built and implemented.
Diffstat (limited to 'js/components/layout')
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js13
1 files changed, 12 insertions, 1 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 1a580284..dbb4fcad 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -171,6 +171,14 @@ exports.DocumentBar = Montage.create(Component, {
171 }, 171 },
172 //////////////////////////////////////////////////////////////////// 172 ////////////////////////////////////////////////////////////////////
173 // 173 //
174 renderDesignView: {
175 value: function () {
176 //Reloading in design view (with updates from other view)
177 this.reloadView('design', this.fileTemplate);
178 }
179 },
180 ////////////////////////////////////////////////////////////////////
181 //
174 showViewDesign: { 182 showViewDesign: {
175 value: function () { 183 value: function () {
176 // 184 //
@@ -179,11 +187,14 @@ exports.DocumentBar = Montage.create(Component, {
179 this._currentDocument.model.switchViewTo('design'); 187 this._currentDocument.model.switchViewTo('design');
180 this.btnCode.setAttribute('class', 'inactive'); 188 this.btnCode.setAttribute('class', 'inactive');
181 this.btnDesign.removeAttribute('class'); 189 this.btnDesign.removeAttribute('class');
190 //this._currentDocument.model.file.content.body = '<div class="test">hello</div><div class="test">hello</div>';
191 var render = this.renderDesignView.bind(this._currentDocument);
192 render();
182 } 193 }
183 } 194 }
184 }, 195 },
185 //////////////////////////////////////////////////////////////////// 196 ////////////////////////////////////////////////////////////////////
186 // 197 //TODO: Implement code with that updates the file template through the ninja document parser
187 showViewCode: { 198 showViewCode: {
188 value: function () { 199 value: function () {
189 // 200 //