aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnanya Sen2012-02-16 11:13:05 -0800
committerAnanya Sen2012-02-16 11:13:05 -0800
commit302ae3c1812086d976eb67c9cf693c43205f3904 (patch)
tree9fab5d67dab44cfa411b395f0ac73285b456062a
parent2e766c9eaa98fa20f311b3eb2f892a1a240e90cf (diff)
downloadninja-302ae3c1812086d976eb67c9cf693c43205f3904.tar.gz
hide the rulers when no document is open
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
-rwxr-xr-xcss/ninja.css4
-rwxr-xr-xjs/ninja.reel/ninja.css2
-rwxr-xr-xjs/ninja.reel/ninja.html4
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js4
-rwxr-xr-xscss/imports/scss/_MainWindow.scss2
5 files changed, 8 insertions, 8 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 0be30434..824a675a 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -118,9 +118,9 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
118 118
119#sceneBar { height: 70px; background-color: #474747; } 119#sceneBar { height: 70px; background-color: #474747; }
120 120
121#mainContainer #rulerTop { background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; } 121#mainContainer #rulerTop { background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; display:none;}
122 122
123#rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; } 123#rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; display:none;}
124 124
125#stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } 125#stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; }
126 126
diff --git a/js/ninja.reel/ninja.css b/js/ninja.reel/ninja.css
index 99fa9a4f..83c0e569 100755
--- a/js/ninja.reel/ninja.css
+++ b/js/ninja.reel/ninja.css
@@ -7,5 +7,3 @@
7.main { 7.main {
8 padding: 100px; 8 padding: 100px;
9} 9}
10
11
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 2d00d8dc..9a1a6b97 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -348,10 +348,10 @@
348 <div id="openDocumentsTabComponent"></div> 348 <div id="openDocumentsTabComponent"></div>
349 </section> 349 </section>
350 350
351 <section id="rulerTop" style="display:none;"></section> 351 <section id="rulerTop"></section>
352 352
353 <section id="mainContent"> 353 <section id="mainContent">
354 <section id="rulerLeft" style="display:none;"></section> 354 <section id="rulerLeft"></section>
355 <section id="stageAndScenesContainer"></section> 355 <section id="stageAndScenesContainer"></section>
356 </section> 356 </section>
357 357
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index 2144af84..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 }
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index b5ff42bc..0b0649dc 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -204,12 +204,14 @@
204 background: url("../images/temp/ruler-top.png"); 204 background: url("../images/temp/ruler-top.png");
205 height:15px; 205 height:15px;
206 margin-bottom: 0px; 206 margin-bottom: 0px;
207 display:none;
207} 208}
208 209
209#rulerLeft { 210#rulerLeft {
210 // TODO: temporary background please replace when component is implemented 211 // TODO: temporary background please replace when component is implemented
211 background: url("../images/temp/ruler-left.png"); 212 background: url("../images/temp/ruler-left.png");
212 width:16px; 213 width:16px;
214 display:none;
213} 215}
214 216
215#stateBar { 217#stateBar {