From 302ae3c1812086d976eb67c9cf693c43205f3904 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 16 Feb 2012 11:13:05 -0800
Subject: hide the rulers when no document is open

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/ninja.reel/ninja.css                | 2 --
 js/ninja.reel/ninja.html               | 4 ++--
 js/stage/stage-view.reel/stage-view.js | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'js')

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 @@
 .main {
     padding: 100px;
 }
-
-
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 @@
                             <div id="openDocumentsTabComponent"></div>
                         </section>
 
-                        <section id="rulerTop" style="display:none;"></section>
+                        <section id="rulerTop"></section>
 
                         <section id="mainContent">
-                            <section id="rulerLeft" style="display:none;"></section>
+                            <section id="rulerLeft"></section>
                             <section id="stageAndScenesContainer"></section>
                         </section>
 
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, {
     switchDocument:{
         value: function(doc){
             //save editor cursor position
-            if(!!this.application.ninja.documentController.activeDocument.editor){
+            if(!!this.application.ninja.documentController.activeDocument && !!this.application.ninja.documentController.activeDocument.editor){
                 this.application.ninja.documentController.activeDocument.hline = this.application.ninja.documentController.activeDocument.editor.getCursor(true);
             }
             this.application.ninja.documentController._hideCurrentDocument();
@@ -136,7 +136,7 @@ exports.StageView = Montage.create(Component, {
             var documentController = this.application.ninja.documentController;
 
             //restore editor cursor position
-            if(!!this.application.ninja.documentController.activeDocument.editor){
+            if(!!this.application.ninja.documentController.activeDocument && !!this.application.ninja.documentController.activeDocument.editor){
                 this.application.ninja.documentController.activeDocument.editor.setCursor(this.application.ninja.documentController.activeDocument.hline);
                 document.getElementById("codeMirror_"+this.application.ninja.documentController.activeDocument.uuid).getElementsByClassName("CodeMirror")[0].focus();
             }
-- 
cgit v1.2.3