aboutsummaryrefslogtreecommitdiff
path: root/js/code-editor/ui
diff options
context:
space:
mode:
Diffstat (limited to 'js/code-editor/ui')
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css2
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html2
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js4
3 files changed, 5 insertions, 3 deletions
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 @@
20.viewOptions .format{ 20.viewOptions .format{
21 float:left; 21 float:left;
22 margin-left:5px; 22 margin-left:5px;
23 height: 20px;
23} 24}
24 25
25.viewOptions .themeOptions{ 26.viewOptions .themeOptions{
26 float: right; 27 float: right;
28 margin-right:5px;
27} 29}
28 30
29.viewOptions .themeOptions select{ 31.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 @@
60 <button id="uncomment" value="uncomment" class="nj-skinned format">uncomment</button> 60 <button id="uncomment" value="uncomment" class="nj-skinned format">uncomment</button>
61 </div> 61 </div>
62 <div class="themeOptions"> 62 <div class="themeOptions">
63 <span>Theme</span> 63 <span>Theme :</span>
64 <select id="themeSelect"> 64 <select id="themeSelect">
65 <option value="default" selected="">DEFAULT</option> 65 <option value="default" selected="">DEFAULT</option>
66 <option value="night">NIGHT</option> 66 <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
68 68
69 handleThemeSelection:{ 69 handleThemeSelection:{
70 value: function(evt){ 70 value: function(evt){
71 var theme = this.themeSelect.options[this.themeSelect.selectedIndex].value; 71 this.application.ninja.codeEditorController.editorTheme = this.themeSelect.options[this.themeSelect.selectedIndex].value;
72 this.application.ninja.codeEditorController.handleThemeSelection(theme); 72 this.application.ninja.codeEditorController.handleThemeSelection();
73 } 73 }
74 } 74 }
75 75