From ea4385add0e9087487ccded929c2d6674d326db8 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Wed, 18 Apr 2012 00:29:52 -0700
Subject: - collapse panels for code view, restore for design view - apply
 theme selection to all code view documents

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../ui/code-editor-view-options.reel/code-editor-view-options.css     | 2 ++
 .../ui/code-editor-view-options.reel/code-editor-view-options.html    | 2 +-
 .../ui/code-editor-view-options.reel/code-editor-view-options.js      | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'js/code-editor')

diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css
index 91054fb9..79468768 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css
@@ -20,10 +20,12 @@
 .viewOptions .format{
     float:left;
     margin-left:5px;
+    height: 20px;
 }
 
 .viewOptions .themeOptions{
     float: right;
+    margin-right:5px;
 }
 
 .viewOptions .themeOptions select{
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
index 4a6cfa59..31e96adf 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
@@ -60,7 +60,7 @@
             <button id="uncomment" value="uncomment" class="nj-skinned format">uncomment</button>
         </div>
         <div class="themeOptions">
-            <span>Theme</span>
+            <span>Theme :</span>
             <select id="themeSelect">
                 <option value="default" selected="">DEFAULT</option>
                 <option value="night">NIGHT</option>
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
index 0625dad9..237be46c 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
@@ -68,8 +68,8 @@ var CodeEditorViewOptions = exports.CodeEditorViewOptions = Montage.create(Compo
 
         handleThemeSelection:{
             value: function(evt){
-                var theme = this.themeSelect.options[this.themeSelect.selectedIndex].value;
-                this.application.ninja.codeEditorController.handleThemeSelection(theme);
+                this.application.ninja.codeEditorController.editorTheme = this.themeSelect.options[this.themeSelect.selectedIndex].value;
+                this.application.ninja.codeEditorController.handleThemeSelection();
             }
         }
 
-- 
cgit v1.2.3