Browse Source

fixes issue with the old Ace editor defaults getting stored in the application settings file

Shaddock Heath 9 years ago
parent
commit
c9917d28f0
1 changed files with 7 additions and 9 deletions
  1. 7 9
      Script/AtomicEditor/editor/Preferences.ts

+ 7 - 9
Script/AtomicEditor/editor/Preferences.ts

@@ -290,9 +290,8 @@ interface WindowData {
     maximized: boolean;
     maximized: boolean;
 }
 }
 
 
-interface AceEditorSettings {
+interface MonacoEditorSettings {
     theme: string;
     theme: string;
-    keyboardHandler: string;
     fontSize: number;
     fontSize: number;
     showInvisibles: boolean;
     showInvisibles: boolean;
     useSoftTabs: boolean;
     useSoftTabs: boolean;
@@ -341,9 +340,8 @@ class PreferencesFormat {
             maximized: false
             maximized: false
         };
         };
 
 
-        this.codeEditorSettings = {
-            theme: "ace/theme/monokai",
-            keyboardHandler: "ace/keyboard/textinput",
+        this.codeEditor = {
+            theme: "vs-dark",
             fontSize: 12,
             fontSize: 12,
             showInvisibles: false,
             showInvisibles: false,
             useSoftTabs: true,
             useSoftTabs: true,
@@ -360,7 +358,7 @@ class PreferencesFormat {
 
 
         this.editorBuildData = {
         this.editorBuildData = {
             lastEditorBuildSHA: "Unversioned Build"
             lastEditorBuildSHA: "Unversioned Build"
-        }
+        };
 
 
     }
     }
 
 
@@ -387,8 +385,8 @@ class PreferencesFormat {
             updatedMissingDefaults = true;
             updatedMissingDefaults = true;
         }
         }
 
 
-        if (!prefs.codeEditorSettings) {
-            prefs.codeEditorSettings = this.codeEditorSettings;
+        if (!prefs.codeEditor) {
+            prefs.codeEditor = this.codeEditor;
             updatedMissingDefaults = true;
             updatedMissingDefaults = true;
         }
         }
 
 
@@ -408,7 +406,7 @@ class PreferencesFormat {
     recentProjects: string[];
     recentProjects: string[];
     editorWindow: WindowData;
     editorWindow: WindowData;
     playerWindow: WindowData;
     playerWindow: WindowData;
-    codeEditorSettings: AceEditorSettings;
+    codeEditor: MonacoEditorSettings;
     uiData: UserInterfaceData;
     uiData: UserInterfaceData;
     editorBuildData: EditorBuildData;
     editorBuildData: EditorBuildData;
 }
 }