Merge branch 'master' into cmv4

Author: Narciso Jaramillo

package.json

@@ -1,7 +1,7 @@
 {
     "name": "Brackets",
-    "version": "0.37.0-0",
-    "apiVersion": "0.37.0",
+    "version": "0.38.0-0",
+    "apiVersion": "0.38.0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets/issues"

src/config.json

@@ -19,8 +19,8 @@
         "linting.enabled_by_default": true
     },
     "name": "Brackets",
-    "version": "0.37.0-0",
-    "apiVersion": "0.37.0",
+    "version": "0.38.0-0",
+    "apiVersion": "0.38.0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets/issues"
@@ -58,7 +58,7 @@
     },
     "scripts": {
         "postinstall": "grunt install",
-        "test": "grunt test"
+        "test": "grunt cla-check-pull test"
     },
     "licenses": [
         {

src/filesystem/FileSystem.js

@@ -92,6 +92,7 @@ define(function (require, exports, module) {
     var Directory       = require("filesystem/Directory"),
         File            = require("filesystem/File"),
         FileIndex       = require("filesystem/FileIndex"),
+        FileSystemError = require("filesystem/FileSystemError"),
         WatchedRoot     = require("filesystem/WatchedRoot");
 
     /**
@@ -886,7 +887,7 @@ define(function (require, exports, module) {
         callback = callback || function () {};
 
         if (!watchedRoot) {
-            callback("Root is not watched.");
+            callback(FileSystemError.ROOT_NOT_WATCHED);
             return;
         }
 

src/filesystem/FileSystemError.js

@@ -35,15 +35,18 @@ define(function (require, exports, module) {
     "use strict";
 
     module.exports = {
-        UNKNOWN             : "Unknown",
-        INVALID_PARAMS      : "InvalidParams",
-        NOT_FOUND           : "NotFound",
-        NOT_READABLE        : "NotReadable",
-        NOT_WRITABLE        : "NotWritable",
-        OUT_OF_SPACE        : "OutOfSpace",
-        TOO_MANY_ENTRIES    : "TooManyEntries",
-        ALREADY_EXISTS      : "AlreadyExists",
-        CONTENTS_MODIFIED   : "ContentsModified"
+        UNKNOWN                     : "Unknown",
+        INVALID_PARAMS              : "InvalidParams",
+        NOT_FOUND                   : "NotFound",
+        NOT_READABLE                : "NotReadable",
+        NOT_SUPPORTED               : "NotSupported",
+        NOT_WRITABLE                : "NotWritable",
+        OUT_OF_SPACE                : "OutOfSpace",
+        TOO_MANY_ENTRIES            : "TooManyEntries",
+        ALREADY_EXISTS              : "AlreadyExists",
+        CONTENTS_MODIFIED           : "ContentsModified",
+        ROOT_NOT_WATCHED            : "RootNotBeingWatched"
+        
         // FUTURE: Add remote connection errors: timeout, not logged in, connection err, etc.
     };
 });

src/filesystem/impls/appshell/AppshellFileSystem.js

@@ -46,6 +46,8 @@ define(function (require, exports, module) {
         _domainPath     = [_bracketsPath, _modulePath, _nodePath].join("/"),
         _nodeDomain     = new NodeDomain("fileWatcher", _domainPath);
 
+    var _isRunningOnWindowsXP = navigator.userAgent.indexOf("Windows NT 5.") >= 0;
+    
     // If the connection closes, notify the FileSystem that watchers have gone offline.
     $(_nodeDomain.connection).on("close", function (event, promise) {
         if (_offlineCallback) {
@@ -485,11 +487,15 @@ define(function (require, exports, module) {
      * cleared when the offlineCallback is called.
      * 
      * @param {function(?string, FileSystemStats=)} changeCallback
-     * @param {function()=} callback
+     * @param {function()=} offlineCallback
      */
     function initWatchers(changeCallback, offlineCallback) {
         _changeCallback = changeCallback;
         _offlineCallback = offlineCallback;
+        
+        if (_isRunningOnWindowsXP && _offlineCallback) {
+            _offlineCallback();
+        }
     }
 
     /**
@@ -504,6 +510,10 @@ define(function (require, exports, module) {
      * @param {function(?string)=} callback
      */
     function watchPath(path, callback) {
+        if (_isRunningOnWindowsXP) {
+            callback(FileSystemError.NOT_SUPPORTED);
+            return;
+        }
         appshell.fs.isNetworkDrive(path, function (err, isNetworkDrive) {
             if (err || isNetworkDrive) {
                 callback(FileSystemError.UNKNOWN);
@@ -563,8 +573,7 @@ define(function (require, exports, module) {
      *
      * @type {boolean}
      */
-    exports.recursiveWatch = (appshell.platform === "mac" ||
-        (appshell.platform === "win" && navigator.userAgent.indexOf("Windows NT 5.") === -1));
+    exports.recursiveWatch = (appshell.platform === "mac" || appshell.platform === "win");
 
     /**
      * Indicates whether or not the filesystem should expect and normalize UNC

src/project/ProjectManager.js

@@ -201,15 +201,26 @@ define(function (require, exports, module) {
      */
     var _allFilesCachePromise = null;
 
+    /**
+     * @private
+     * @type {boolean}
+     * Current sort order for the tree, true if directories are first. This is
+     * initialized in _generateSortPrefixes.
+     */
+    var _dirFirst;
 
     /**
      * @private
      * Generates the prefixes used for sorting the files in the project tree
+     * @return {boolean} true if the sort prefixes have changed
      */
     function _generateSortPrefixes() {
-        var dirFirst    = PreferencesManager.get("sortDirectoriesFirst");
-        _sortPrefixDir  = dirFirst ? "0" : "";
-        _sortPrefixFile = dirFirst ? "1" : "";
+        var previousDirFirst  = _dirFirst;
+        _dirFirst             = PreferencesManager.get("sortDirectoriesFirst");
+        _sortPrefixDir        = _dirFirst ? "0" : "";
+        _sortPrefixFile       = _dirFirst ? "1" : "";
+        
+        return previousDirFirst !== _dirFirst;
     }
 
     /**
@@ -2207,8 +2218,9 @@ define(function (require, exports, module) {
     // Initialize the sort prefixes and make sure to change them when the sort pref changes
     _generateSortPrefixes();
     PreferencesManager.on("change", "sortDirectoriesFirst", function () {
-        _generateSortPrefixes();
-        refreshFileTree();
+        if (_generateSortPrefixes()) {
+            refreshFileTree();
+        }
     });
 
     // Event Handlers