Merge pull request #1500 from DennisKehrig/dk/card-472-tabs-spaces

jasonsanjose · jasonsanjose · commit 42339e97b7b5 · 2012-09-04T17:32:13.000-07:00
Made setting "Use Tab Characters" persistent across launches
diff --git a/src/editor/Editor.js b/src/editor/Editor.js
@@ -61,17 +61,20 @@
 define(function (require, exports, module) {
     "use strict";
     
-    var EditorManager   = require("editor/EditorManager"),
-        CodeHintManager = require("editor/CodeHintManager"),
-        Commands        = require("command/Commands"),
-        CommandManager  = require("command/CommandManager"),
-        Menus           = require("command/Menus"),
-        PerfUtils       = require("utils/PerfUtils"),
-        Strings         = require("strings"),
-        TextRange       = require("document/TextRange").TextRange,
-        ViewUtils       = require("utils/ViewUtils");
+    var EditorManager      = require("editor/EditorManager"),
+        CodeHintManager    = require("editor/CodeHintManager"),
+        Commands           = require("command/Commands"),
+        CommandManager     = require("command/CommandManager"),
+        Menus              = require("command/Menus"),
+        PerfUtils          = require("utils/PerfUtils"),
+        PreferencesManager = require("preferences/PreferencesManager"),
+        Strings            = require("strings"),
+        TextRange          = require("document/TextRange").TextRange,
+        ViewUtils          = require("utils/ViewUtils");
+    
+    var PREFERENCES_CLIENT_ID = "com.adobe.brackets.Editor",
+        defaultPrefs = { useTabChar: false };
     
-
     /**
      * @private
      * Handle Tab key press.
@@ -225,6 +228,8 @@ define(function (require, exports, module) {
         }
     }
     
+    /** Editor preferences */
+    var _prefs = PreferencesManager.getPreferenceStorage(PREFERENCES_CLIENT_ID, defaultPrefs);
     
     /**
      * List of all current (non-destroy()ed) Editor instances. Needed when changing global preferences
@@ -234,7 +239,7 @@ define(function (require, exports, module) {
     var _instances = [];
     
     /** @type {boolean}  Global setting: When inserting new text, use tab characters? (instead of spaces) */
-    var _useTabChar = false;
+    var _useTabChar = _prefs.getValue("useTabChar");
     
     
     
@@ -1046,6 +1051,9 @@ define(function (require, exports, module) {
         _instances.forEach(function (editor) {
             editor._codeMirror.setOption("indentWithTabs", _useTabChar);
         });
+        
+        // Remember the setting across launches
+        _prefs.setValue("useTabChar", Boolean(_useTabChar));
     };
     
     /** @type {boolean}  Gets whether all Editors use tab characters (vs. spaces) when inserting new text */
