diff options
author | Valerio Virgillito | 2012-02-16 11:39:42 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-16 11:39:42 -0800 |
commit | eaee73ccaf271f5c82fdf67b35c71510f308fb6e (patch) | |
tree | 798eb17a926cd8fd16bd025ecd392d3e2f63226e /js/stage/stage-view.reel | |
parent | b12b167116b757e1a945c05f45991d0ed385aed3 (diff) | |
parent | 71619045b692015b0889a4f5c381c1dee9c056cd (diff) | |
download | ninja-eaee73ccaf271f5c82fdf67b35c71510f308fb6e.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/stage/stage-view.reel')
-rwxr-xr-x | js/stage/stage-view.reel/stage-view.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js index 31ace49c..cd19f361 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"; |