Merge branch 'brackets' into glenn/file-system

Conflicts:
	src/document/DocumentManager.js
	src/language/JSUtils.js
	src/project/ProjectManager.js
	src/search/FindInFiles.js

Author: Ian Wehrman

.gitignore

@@ -28,3 +28,6 @@ test/results
 
 # PhpStorm
 .idea
+
+# Files that can be automatically downloaded that we don't want to ship with our builds
+src/extensibility/node/node_modules/request/tests/

Gruntfile.js

@@ -120,10 +120,8 @@ module.exports = function (grunt) {
                 }
             }
         },
-        'jasmine-node': {
-            run: {
-                spec: 'src/extensibility/node/spec/'
-            }
+        'jasmine_node': {
+            projectRoot: 'src/extensibility/node/spec/'
         },
         jshint: {
             all: [
@@ -152,14 +150,14 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-contrib-jasmine');
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-contrib-jasmine-node');
+    grunt.loadNpmTasks('grunt-jasmine-node');
 
     // task: install
     grunt.registerTask('install', ['write-config']);
 
     // task: test
 //    grunt.registerTask('test', ['jshint:all', 'jasmine']);
-    grunt.registerTask('test', ['jshint:all', 'jasmine', 'jasmine-node']);
+    grunt.registerTask('test', ['jshint:all', 'jasmine', 'jasmine_node']);
 
     // task: set-sprint
     // Update sprint number in package.json and rewrite src/config.json

package.json

@@ -1,7 +1,7 @@
 {
     "name": "Brackets",
-    "version": "0.32.0-0",
-    "apiVersion": "0.32.0",
+    "version": "0.33.0-0",
+    "apiVersion": "0.33.0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets/issues"
@@ -14,9 +14,9 @@
     },
     "devDependencies": {
         "grunt": "0.4.1",
-        "jasmine-node": "1.9.1",
-        "grunt-contrib-jasmine-node": "0.1.0",
-        "grunt-cli": "0.1.6",
+        "jasmine-node": "1.11.0",
+        "grunt-jasmine-node": "0.1.0",
+        "grunt-cli": "0.1.9",
         "phantomjs": "1.9.0-1",
         "grunt-lib-phantomjs": "0.3.0",
         "grunt-contrib-jshint": "0.6.0",

samples/root/Getting Started/main.css

@@ -27,7 +27,7 @@ h1, h2, h3, h4, h5, h6 {
 
 samp
 {
-    /* hide <samp> from the browser so we can show cool features in Edge Code */
+    /* hide tutorial instructions so they don't show in the browser */
     display: none;
 }
 

src/LiveDevelopment/main.js

@@ -1,24 +1,24 @@
 /*
  * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
- *  
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- *  
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *  
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- * 
+ *
  */
 
 
@@ -142,7 +142,7 @@ define(function main(require, exports, module) {
 
     /** Called on status change */
     function _showStatusChangeReason(reason) {
-        // Destroy the previous twipsy (options are not updated otherwise)    
+        // Destroy the previous twipsy (options are not updated otherwise)
         _$btnGoLive.twipsy("hide").removeData("twipsy");
 
         // If there was no reason or the action was an explicit request by the user, don't show a twipsy
@@ -178,7 +178,7 @@ define(function main(require, exports, module) {
         });
         $(LiveDevelopment).on("statusChange", function statusChange(event, status, reason) {
             // status starts at -1 (error), so add one when looking up name and style
-            // See the comments at the top of LiveDevelopment.js for details on the 
+            // See the comments at the top of LiveDevelopment.js for details on the
             // various status codes.
             _setLabel(_$btnGoLive, null, _statusStyle[status + 1], _statusTooltip[status + 1]);
             _showStatusChangeReason(reason);
@@ -195,7 +195,7 @@ define(function main(require, exports, module) {
     function _setupGoLiveMenu() {
         $(LiveDevelopment).on("statusChange", function statusChange(event, status) {
             // Update the checkmark next to 'Live Preview' menu item
-            // Add checkmark when status is STATUS_ACTIVE; otherwise remove it 
+            // Add checkmark when status is STATUS_ACTIVE; otherwise remove it
             CommandManager.get(Commands.FILE_LIVE_FILE_PREVIEW).setChecked(status === LiveDevelopment.STATUS_ACTIVE);
             CommandManager.get(Commands.FILE_LIVE_HIGHLIGHT).setEnabled(status === LiveDevelopment.STATUS_ACTIVE);
         });
@@ -257,8 +257,6 @@ define(function main(require, exports, module) {
 
     // init prefs
     prefs = PreferencesManager.getPreferenceStorage(module, {highlight: true});
-    //TODO: Remove preferences migration code
-    PreferencesManager.handleClientIdChange(prefs, "com.adobe.brackets.live-development");
 
     config.highlight = prefs.getValue("highlight");
 

src/base-config/keyboard.json

@@ -270,6 +270,9 @@
             "displayKey": "Alt-↓"
         }
     ],
+    "navigate.newRule":  [
+        "Cmd-Alt-N"
+    ],
     "file.rename":  [
         "F2"
     ]

src/brackets.js

@@ -28,7 +28,8 @@
 require.config({
     paths: {
         "text"      : "thirdparty/text/text",
-        "i18n"      : "thirdparty/i18n/i18n"
+        "i18n"      : "thirdparty/i18n/i18n",
+        "lodash"    : "thirdparty/lodash.custom.min"
     },
     // Use custom brackets property until CEF sets the correct navigator.language
     // NOTE: When we change to navigator.language here, we also should change to
@@ -97,7 +98,8 @@ define(function (require, exports, module) {
         DragAndDrop             = require("utils/DragAndDrop"),
         ColorUtils              = require("utils/ColorUtils"),
         CodeInspection          = require("language/CodeInspection"),
-        NativeApp               = require("utils/NativeApp");
+        NativeApp               = require("utils/NativeApp"),
+        _                       = require("lodash");
 
     // Load modules that self-register and just need to get included in the main project
     require("command/DefaultMenus");
@@ -203,7 +205,8 @@ define(function (require, exports, module) {
         LanguageManager.ready.always(function () {
             // Load all extensions. This promise will complete even if one or more
             // extensions fail to load.
-            var extensionLoaderPromise = ExtensionLoader.init(params.get("extensions"));
+            var extensionPathOverride = params.get("extensions");  // used by unit tests
+            var extensionLoaderPromise = ExtensionLoader.init(extensionPathOverride ? extensionPathOverride.split(",") : null);
 
             // Load the initial project after extensions have loaded
             extensionLoaderPromise.always(function () {
@@ -218,8 +221,6 @@ define(function (require, exports, module) {
                     // an old version that might not have set the "afterFirstLaunch" pref.)
                     var prefs = PreferencesManager.getPreferenceStorage(module),
                         deferred = new $.Deferred();
-                    //TODO: Remove preferences migration code
-                    PreferencesManager.handleClientIdChange(prefs, "com.adobe.brackets.startup");
 
                     if (!params.get("skipSampleProjectLoad") && !prefs.getValue("afterFirstLaunch")) {
                         prefs.setValue("afterFirstLaunch", "true");

src/command/Commands.js

@@ -43,6 +43,7 @@ define(function (require, exports, module) {
     exports.FILE_SAVE_AS                = "file.saveAs";                // DocumentCommandHandlers.js   handleFileSaveAs()
     exports.FILE_CLOSE                  = "file.close";                 // DocumentCommandHandlers.js   handleFileClose()
     exports.FILE_CLOSE_ALL              = "file.close_all";             // DocumentCommandHandlers.js   handleFileCloseAll()
+    exports.FILE_CLOSE_LIST             = "file.close_list";            // DocumentCommandHandlers.js   handleFileCloseList()
     exports.FILE_ADD_TO_WORKING_SET     = "file.addToWorkingSet";       // DocumentCommandHandlers.js   handleFileAddToWorkingSet()
     exports.FILE_LIVE_FILE_PREVIEW      = "file.liveFilePreview";       // LiveDevelopment/main.js      _handleGoLiveCommand()
     exports.FILE_LIVE_HIGHLIGHT         = "file.previewHighlight";      // LiveDevelopment/main.js      _handlePreviewHighlightCommand()
@@ -115,6 +116,7 @@ define(function (require, exports, module) {
     exports.TOGGLE_QUICK_DOCS           = "navigate.toggleQuickDocs";   // EditorManager.js             _toggleInlineWidget()
     exports.QUICK_EDIT_NEXT_MATCH       = "navigate.nextMatch";         // MultiRangeInlineEditor.js    _nextRange()
     exports.QUICK_EDIT_PREV_MATCH       = "navigate.previousMatch";     // MultiRangeInlineEditor.js    _previousRange()
+    exports.CSS_QUICK_EDIT_NEW_RULE     = "navigate.newRule";           // CSSInlineEditor.js           _handleNewRule()
 
     // HELP
     exports.HELP_CHECK_FOR_UPDATE       = "help.checkForUpdate";        // HelpCommandHandlers.js       _handleCheckForUpdates()

src/command/DefaultMenus.js

@@ -137,6 +137,7 @@ define(function (require, exports, module) {
         menu.addMenuItem(Commands.TOGGLE_QUICK_EDIT);
         menu.addMenuItem(Commands.QUICK_EDIT_PREV_MATCH);
         menu.addMenuItem(Commands.QUICK_EDIT_NEXT_MATCH);
+        menu.addMenuItem(Commands.CSS_QUICK_EDIT_NEW_RULE);
         menu.addMenuDivider();
         menu.addMenuItem(Commands.TOGGLE_QUICK_DOCS);
 

src/command/Menus.js

@@ -28,14 +28,17 @@
 define(function (require, exports, module) {
     "use strict";
 
+    var _ = require("lodash");
+    
     // Load dependent modules
     var Global              = require("utils/Global"),
         Commands            = require("command/Commands"),
         KeyBindingManager   = require("command/KeyBindingManager"),
         StringUtils         = require("utils/StringUtils"),
         CommandManager      = require("command/CommandManager"),
         PopUpManager        = require("widgets/PopUpManager"),
-        ViewUtils           = require("utils/ViewUtils");
+        ViewUtils           = require("utils/ViewUtils"),
+        CollectionUtils     = require("utils/CollectionUtils");
 
     /**
      * Brackets Application Menu Constants
@@ -458,6 +461,57 @@ define(function (require, exports, module) {
         delete menuItemMap[menuItemID];
     };
 
+    /**
+     * Removes the specified menu divider from this Menu.
+     *
+     * @param {!string} menuItemID - the menu item id of the divider to remove.
+     */
+    Menu.prototype.removeMenuDivider = function (menuItemID) {
+        var menuItem,
+            $HTMLMenuItem;
+        
+        if (!menuItemID) {
+            console.error("removeMenuDivider(): missing required parameters: menuItemID");
+            return;
+        }
+        
+        menuItem = getMenuItem(menuItemID);
+        
+        if (!menuItem) {
+            console.error("removeMenuDivider(): parameter menuItemID: %s is not a valid menu item id", menuItemID);
+            return;
+        }
+        
+        if (!menuItem.isDivider) {
+            console.error("removeMenuDivider(): parameter menuItemID: %s is not a menu divider", menuItemID);
+            return;
+        }
+        
+        if (_isHTMLMenu(this.id)) {
+            // Targeting parent to get the menu divider <hr> and the <li> that contains it
+            $HTMLMenuItem = $(_getHTMLMenuItem(menuItemID)).parent();
+            if ($HTMLMenuItem) {
+                $HTMLMenuItem.remove();
+            } else {
+                console.error("removeMenuDivider(): HTML menu divider not found: %s", menuItemID);
+                return;
+            }
+        } else {
+            brackets.app.removeMenuItem(menuItemID, function (err) {
+                if (err) {
+                    console.error("removeMenuDivider() -- divider not found: %s (error: %s)", menuItemID, err);
+                }
+            });
+        }
+        
+        if (!menuItemMap[menuItemID]) {
+            console.error("removeMenuDivider(): menu divider not found in menuItemMap: %s", menuItemID);
+            return;
+        }
+        
+        delete menuItemMap[menuItemID];
+    };
+    
     /**
      * Adds a new menu item with the specified id and display text. The insertion position is
      * specified via the relativeID and position arguments which describe a position 
@@ -532,7 +586,7 @@ define(function (require, exports, module) {
         // create MenuItem DOM
         if (_isHTMLMenu(this.id)) {
             if (name === DIVIDER) {
-                $menuItem = $("<li><hr class='divider' /></li>");
+                $menuItem = $("<li><hr class='divider' id='" + id + "' /></li>");
             } else {
                 // Create the HTML Menu
                 $menuItem = $("<li><a href='#' id='" + id + "'> <span class='menu-name'></span></a></li>");
@@ -808,7 +862,7 @@ define(function (require, exports, module) {
      * @return {?Menu} the newly created Menu
      */
     function addMenu(name, id, position, relativeID) {
-        name = StringUtils.htmlEscape(name);
+        name = _.escape(name);
         var $menubar = $("#titlebar .nav"),
             menu;
 
@@ -877,6 +931,9 @@ define(function (require, exports, module) {
      *      Extensions should use the following format: "author.myextension.mymenuname".
      */
     function removeMenu(id) {
+        var menu,
+            commandID = "";
+        
         if (!id) {
             console.error("removeMenu(): missing required parameter: id");
             return;
@@ -887,6 +944,20 @@ define(function (require, exports, module) {
             return;
         }
 
+        // Remove all of the menu items in the menu
+        menu = getMenu(id);
+        
+        CollectionUtils.forEach(menuItemMap, function (value, key) {
+            if (key.substring(0, id.length) === id) {
+                if (value.isDivider) {
+                    menu.removeMenuDivider(key);
+                } else {
+                    commandID = value.getCommand();
+                    menu.removeMenuItem(commandID);
+                }
+            }
+        });
+        
         if (_isHTMLMenu(id)) {
             $(_getHTMLMenu(id)).remove();
         } else {