aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'js/controllers')
-rw-r--r--js/controllers/code-editor-controller.js18
-rwxr-xr-xjs/controllers/document-controller.js1
2 files changed, 13 insertions, 6 deletions
diff --git a/js/controllers/code-editor-controller.js b/js/controllers/code-editor-controller.js
index cf0503a0..2302730c 100644
--- a/js/controllers/code-editor-controller.js
+++ b/js/controllers/code-editor-controller.js
@@ -33,9 +33,16 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
33 33
34 automaticCodeComplete:{ 34 automaticCodeComplete:{
35 get: function(){return this._automaticCodeComplete;}, 35 get: function(){return this._automaticCodeComplete;},
36 set: function(value){ 36 set: function(value){this._automaticCodeComplete = value;}
37 //console.log("$$$ automaticCodeComplete setter : "+value); 37 },
38 this._automaticCodeComplete = value;} 38
39 _editorTheme: {
40 value:"default"
41 },
42
43 editorTheme:{
44 get: function(){return this._editorTheme;},
45 set: function(value){this._editorTheme = value;}
39 }, 46 },
40 47
41 originalEditorFont:{ 48 originalEditorFont:{
@@ -189,9 +196,8 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
189 }, 196 },
190 197
191 handleThemeSelection:{ 198 handleThemeSelection:{
192 value: function(theme){ 199 value: function(){
193 this.application.ninja.documentController.activeDocument.editor.setOption("theme", theme); 200 this.application.ninja.documentController.activeDocument.editor.setOption("theme", this.editorTheme);
194 } 201 }
195 } 202 }
196
197}); \ No newline at end of file 203}); \ No newline at end of file
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 079eb754..0d9b37ed 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -434,6 +434,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
434// appDelegateModule.MyAppDelegate.onSetActiveDocument(); 434// appDelegateModule.MyAppDelegate.onSetActiveDocument();
435 435
436 this.application.ninja.stage.stageView.showCodeViewBar(false); 436 this.application.ninja.stage.stageView.showCodeViewBar(false);
437 this.application.ninja.stage.stageView.restoreAllPanels();
437 } 438 }
438 }, 439 },
439 440