Fix deprecation warnings

artoale · Jan 23, 2017 · 5ffc047 · 5ffc047
1 parent d25ccef
commit 5ffc047
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 14 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -21,7 +21,6 @@
   "globals": {
     "define": false,
     "brackets": false,
-    "Mustache": false,
     "$": false
   }
 }
diff --git a/package.json b/package.json
@@ -14,6 +14,6 @@
     "author": "Alessandro Artoni <artoale@gmail.com> (http://artoale.com)",
     "license": "MIT",
     "engines": {
-        "brackets": ">=0.31.0"
+        "brackets": "^1.8.0"
     }
 }
diff --git a/src/panel.js b/src/panel.js
@@ -2,7 +2,8 @@ define(function (require, exports, module) {
     'use strict';
 
     /* Brackets dependencies */
-    var PanelManager = brackets.getModule('view/PanelManager'),
+    var WorkspaceManager = brackets.getModule('view/WorkspaceManager'),
+        Mustache = brackets.getModule('thirdparty/mustache/mustache'),
 
         /* Internal dependencies */
         tabTemplate = require('text!htmlContent/tab-header.html'),
@@ -16,7 +17,7 @@ define(function (require, exports, module) {
             exportObj = {};
 
         var _createPanel = function () {
-            _brPanel = PanelManager.createBottomPanel('bash.terminal', $(panelTemplate), 100);
+            _brPanel = WorkspaceManager.createBottomPanel('bash.terminal', $(panelTemplate), 100);
             exportObj.$panel = _$panel = _brPanel.$panel;
         };
 

diff --git a/src/settings.js b/src/settings.js
@@ -2,32 +2,72 @@ define(function (require, exports) {
     'use strict';
 
     var PreferencesManager = brackets.getModule('preferences/PreferencesManager'),
+        Mustache = brackets.getModule('thirdparty/mustache/mustache'),
         Dialogs = brackets.getModule('widgets/Dialogs'),
         dialogTemplate = require('text!htmlContent/settings-dialog.html');
 
-    var TERMINAL_SETTINGS_CLIENT_ID = 'bracketsTerminal.settings';
-
-    var settings;
+    var TERMINAL_SETTINGS_CLIENT_ID = 'bracketsTerminal',
+        SETTINGS = 'settings';
 
     var defaults = {
         port: 8080,
         fontSize: 15
     };
 
-    var storage;
+    var prefs = PreferencesManager.getExtensionPrefs(TERMINAL_SETTINGS_CLIENT_ID);
+    prefs.definePreference('settings', 'object', undefined, {
+        keys: {
+            port: {
+                type: 'number',
+                initial: defaults.port
+            },
+            fontSize: {
+                type: 'number',
+                initial: defaults.fontSize
+            }
+        }
+    });
+
+    function _getAllValues() {
+        var settings = prefs.get(SETTINGS) || defaults;
+
+        Object.keys(defaults).forEach(function (key) {
+            var value = settings[key];
+            if (typeof value === 'undefined') {
+                value = defaults[key];
+            }
+            settings[key] = value;
+        });
+
+        return settings;
+    }
+
+    function _setAllValues(newSettings) {
+        var oldSettings = prefs.get(SETTINGS);
+
+        Object.keys(defaults).forEach(function (key) {
+            var value = newSettings[key];
+            if (typeof value === 'undefined') {
+                newSettings[key] = oldSettings[key];
+            }
+        });
+
+        prefs.set(SETTINGS, newSettings);
+    }
+
+    var settings;
 
     var _init = function () {
-        storage = PreferencesManager.getPreferenceStorage(TERMINAL_SETTINGS_CLIENT_ID, defaults);
-        settings = storage.getAllValues();
+        settings = _getAllValues();
     };
 
     var _handleSave = function () {
         var inputValues = $('.brackets-terminal-settings-dialog').find('input').serializeArray();
         inputValues.forEach(function (configElement) {
             settings[configElement.name] = configElement.value;
         });
-        storage.setAllValues(settings);
-        settings = storage.getAllValues();
+        _setAllValues(settings);
+        settings = _getAllValues();
         $('#brackets-terminal-save').off('click', _handleSave);
     };
 
@@ -38,8 +78,8 @@ define(function (require, exports) {
 
     var _set = function (key, value) {
         settings[key] = value;
-        storage.setAllValues(settings);
-        settings = storage.getAllValues();
+        _setAllValues(settings);
+        settings = _getAllValues();
     };
 
     var _getAll = function () {