aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js13
1 files changed, 6 insertions, 7 deletions
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index 31ace49c..46d74e13 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -123,7 +123,7 @@ exports.StageView = Montage.create(Component, {
123 switchDocument:{ 123 switchDocument:{
124 value: function(doc){ 124 value: function(doc){
125 //save editor cursor position 125 //save editor cursor position
126 if(!!this.application.ninja.documentController.activeDocument.editor){ 126 if(!!this.application.ninja.documentController.activeDocument && !!this.application.ninja.documentController.activeDocument.editor){
127 this.application.ninja.documentController.activeDocument.hline = this.application.ninja.documentController.activeDocument.editor.getCursor(true); 127 this.application.ninja.documentController.activeDocument.hline = this.application.ninja.documentController.activeDocument.editor.getCursor(true);
128 } 128 }
129 this.application.ninja.documentController._hideCurrentDocument(); 129 this.application.ninja.documentController._hideCurrentDocument();
@@ -136,7 +136,7 @@ exports.StageView = Montage.create(Component, {
136 var documentController = this.application.ninja.documentController; 136 var documentController = this.application.ninja.documentController;
137 137
138 //restore editor cursor position 138 //restore editor cursor position
139 if(!!this.application.ninja.documentController.activeDocument.editor){ 139 if(!!this.application.ninja.documentController.activeDocument && !!this.application.ninja.documentController.activeDocument.editor){
140 this.application.ninja.documentController.activeDocument.editor.setCursor(this.application.ninja.documentController.activeDocument.hline); 140 this.application.ninja.documentController.activeDocument.editor.setCursor(this.application.ninja.documentController.activeDocument.hline);
141 document.getElementById("codeMirror_"+this.application.ninja.documentController.activeDocument.uuid).getElementsByClassName("CodeMirror")[0].focus(); 141 document.getElementById("codeMirror_"+this.application.ninja.documentController.activeDocument.uuid).getElementsByClassName("CodeMirror")[0].focus();
142 } 142 }
@@ -187,7 +187,6 @@ exports.StageView = Montage.create(Component, {
187 }, 187 },
188 hideOtherDocuments:{ 188 hideOtherDocuments:{
189 value:function(docUuid){ 189 value:function(docUuid){
190 //use CodeMirror toTextArea() to remove editor and save content into textarea
191 this.application.ninja.documentController._documents.forEach(function(aDoc){ 190 this.application.ninja.documentController._documents.forEach(function(aDoc){
192 if(aDoc.currentView === "design"){ 191 if(aDoc.currentView === "design"){
193 aDoc.container.parentNode.style["display"] = "none"; 192 aDoc.container.parentNode.style["display"] = "none";
@@ -199,14 +198,14 @@ exports.StageView = Montage.create(Component, {
199 }, 198 },
200 showRulers:{ 199 showRulers:{
201 value:function(){ 200 value:function(){
202 this.application.ninja.rulerTop.style.display = "block"; 201 this.application.ninja.rulerTop.style.background = "url('../images/temp/ruler-top.png')";
203 this.application.ninja.rulerLeft.style.display = "block"; 202 this.application.ninja.rulerLeft.style.background = "url('../images/temp/ruler-left.png')";
204 } 203 }
205 }, 204 },
206 hideRulers:{ 205 hideRulers:{
207 value:function(){ 206 value:function(){
208 this.application.ninja.rulerTop.style.display = "none"; 207 this.application.ninja.rulerTop.style.background = "rgb(128,128,128)";
209 this.application.ninja.rulerLeft.style.display = "none"; 208 this.application.ninja.rulerLeft.style.background = "rgb(128,128,128)";
210 } 209 }
211 }, 210 },
212 211