pull port pref at time of getServer instead of at brackets load

Author: Andy Heimdahl

src/extensions/default/StaticServer/StaticServer.js

@@ -29,8 +29,17 @@ maxerr: 50, browser: true */
 define(function (require, exports, module) {
     "use strict";
 
-    var BaseServer  = brackets.getModule("LiveDevelopment/Servers/BaseServer").BaseServer,
-        FileUtils   = brackets.getModule("file/FileUtils");
+    var BaseServer           = brackets.getModule("LiveDevelopment/Servers/BaseServer").BaseServer,
+        FileUtils            = brackets.getModule("file/FileUtils"),
+        PreferencesManager   = brackets.getModule("preferences/PreferencesManager");
+
+    
+    /**
+     * @private
+     * 
+     * Prefences manager for this extension
+     */
+    var _prefs = PreferencesManager.getExtensionPrefs("staticserver");
 
     /**
      * @constructor
@@ -44,12 +53,10 @@ define(function (require, exports, module) {
      *        pathResolver   - Function to covert absolute native paths to project relative paths
      *        root           - Native path to the project root (and base URL)
      *        nodeDomain     - An initialized NodeDomain
-     *        port           - Optional port number to serve from
      */
     function StaticServer(config) {
         this._nodeDomain = config.nodeDomain;
         this._onRequestFilter = this._onRequestFilter.bind(this);
-        this._port = config.port;
 
         BaseServer.call(this, config);
     }
@@ -104,7 +111,9 @@ define(function (require, exports, module) {
      */
     StaticServer.prototype.readyToServe = function () {
         var self = this;
-        return this._nodeDomain.exec("getServer", self._root, self._port)
+        var port = _prefs.get("port");
+
+        return this._nodeDomain.exec("getServer", self._root, port)
             .done(function (address) {
                 self._baseUrl = "http://" + address.address + ":" + address.port + "/";
             })

src/extensions/default/StaticServer/main.js

@@ -33,7 +33,6 @@ define(function (require, exports, module) {
         ExtensionUtils       = brackets.getModule("utils/ExtensionUtils"),
         FileUtils            = brackets.getModule("file/FileUtils"),
         LiveDevServerManager = brackets.getModule("LiveDevelopment/LiveDevServerManager"),
-        PreferencesManager   = brackets.getModule("preferences/PreferencesManager"),
         BaseServer           = brackets.getModule("LiveDevelopment/Servers/BaseServer").BaseServer,
         NodeDomain           = brackets.getModule("utils/NodeDomain"),
         ProjectManager       = brackets.getModule("project/ProjectManager"),
@@ -51,12 +50,6 @@ define(function (require, exports, module) {
      */
     var _nodeDomain = new NodeDomain("staticServer", _domainPath);
 
-    /**
-     * @private
-     * @type {NodeDomain} A user-specified port number for the live development server to use.
-     */
-    var _port = 0;
-    
     /**
      * @private
      * @return {StaticServerProvider} The singleton StaticServerProvider initialized
@@ -66,16 +59,13 @@ define(function (require, exports, module) {
         var config = {
             nodeDomain      : _nodeDomain,
             pathResolver    : ProjectManager.makeProjectRelativeIfPossible,
-            root            : ProjectManager.getProjectRoot().fullPath,
-            port            : _port
+            root            : ProjectManager.getProjectRoot().fullPath
         };
 
         return new StaticServer(config);
     }
 
     AppInit.appReady(function () {
-        _port = PreferencesManager.get("liveDevPort") || 0;
-
         LiveDevServerManager.registerServer({ create: _createStaticServer }, 5);
     });
 

src/extensions/default/StaticServer/node/StaticServerDomain.js

@@ -106,7 +106,7 @@
      * @param {number} port number to clean, can be string as well
      * @return {number} a valid port number or zero if a value wasn't passed in or valid.
      */
-    function sanatizePort(port) {
+    function sanitizePort(port) {
         port = parseInt(port, 10);
         port = (port && !isNaN(port) && port > 0 && port < 65536) ? port : 0;
         return port;
@@ -134,7 +134,7 @@
         var server,
             app,
             address,
-            portNum = sanatizePort(port),
+            portNum = sanitizePort(port),
             pathKey = getPathKey(path);
 
         // create a new map for this server's requests