Merge pull request #8475 from MiguelCastillo/themes-8461

dangoor · dangoor · commit ef13232ddbaf · 2014-07-21T09:14:43.000-04:00
Renamed preferences key from "brackets-themes" to "themes" to avoid conf...
diff --git a/src/themes/FontCommandsManager.js b/src/themes/FontCommandsManager.js
@@ -14,7 +14,7 @@ define(function (require, exports, module) {
     var ThemeSettings       = require("view/ThemeSettings"),
         ViewCommandHandlers = require("view/ViewCommandHandlers"),
         PreferencesManager  = require("preferences/PreferencesManager"),
-        prefs               = PreferencesManager.getExtensionPrefs("brackets-themes");
+        prefs               = PreferencesManager.getExtensionPrefs("themes");
 
     function updateThemeFontSize(evt, adjustment, fontSize /*, lineHeight*/) {
         prefs.set("fontSize", fontSize);
diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
@@ -39,7 +39,7 @@ define(function (require, exports, module) {
         ThemeView          = require("view/ThemeView"),
         AppInit            = require("utils/AppInit"),
         PreferencesManager = require("preferences/PreferencesManager"),
-        prefs              = PreferencesManager.getExtensionPrefs("brackets-themes");
+        prefs              = PreferencesManager.getExtensionPrefs("themes");
 
     var loadedThemes    = {},
         currentTheme    = null,
diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
@@ -31,9 +31,8 @@ define(function (require, exports, module) {
         Dialogs            = require("widgets/Dialogs"),
         Strings            = require("strings"),
         PreferencesManager = require("preferences/PreferencesManager"),
-        settingsTemplate   = require("text!htmlContent/themes-settings.html");
-
-    var prefs = PreferencesManager.getExtensionPrefs("brackets-themes");
+        settingsTemplate   = require("text!htmlContent/themes-settings.html"),
+        prefs              = PreferencesManager.getExtensionPrefs("themes");
 
     /**
      * @type {Object}
diff --git a/src/view/ThemeView.js b/src/view/ThemeView.js
@@ -32,7 +32,7 @@ define(function (require, exports, module) {
     var _                  = require("thirdparty/lodash"),
         CodeMirror         = require("thirdparty/CodeMirror2/lib/codemirror"),
         PreferencesManager = require("preferences/PreferencesManager"),
-        prefs              = PreferencesManager.getExtensionPrefs("brackets-themes");
+        prefs              = PreferencesManager.getExtensionPrefs("themes");
 
 
     var templates = {
