FOR REVIEW: Update to jQuery 2.0.1, LESS 1.3.3 and Bootstrap 2.3.1

src/command/Menus.js

@@ -771,7 +771,7 @@ define(function (require, exports, module) {
      * Closes all menus that are open
      */
     function closeAll() {
-        $(".dropdown").removeClass("open");
+        $(".dropdown").removeClass("open").dropdown("toggle");
     }
 
     /**
@@ -873,7 +873,7 @@ define(function (require, exports, module) {
 
         var $newMenu = $("<li class='dropdown context-menu' id='" + StringUtils.jQueryIdEscape(id) + "'></li>"),
             $popUp = $("<ul class='dropdown-menu'></ul>"),
-            $toggle = $("<a href='#' class='dropdown-toggle'></a>").hide();
+            $toggle = $("<a href='#' class='dropdown-toggle' data-toggle='dropdown'></a>").hide();
 
         // assemble the menu fragments
         $newMenu.append($toggle).append($popUp);
@@ -941,6 +941,7 @@ define(function (require, exports, module) {
         }
 
         // open the context menu at final location
+        $menuWindow.dropdown("toggle");
         $menuAnchor.addClass("open")
                    .css({"left": posLeft, "top": posTop});
     };
@@ -949,7 +950,7 @@ define(function (require, exports, module) {
      * Closes the context menu.
      */
     ContextMenu.prototype.close = function () {
-        $("#" + StringUtils.jQueryIdEscape(this.id)).removeClass("open");
+        $("#" + StringUtils.jQueryIdEscape(this.id)).removeClass("open").dropdown("toggle");
     };
 
     /**

src/extensibility/ExtensionManagerDialog.js

@@ -46,11 +46,11 @@ define(function (require, exports, module) {
 
         function updateSearch() {
             if (view.model.filterSet.length === 0) {
-                $search.attr("disabled", "disabled");
-                $searchClear.attr("disabled", "disabled");
+                $search.prop("disabled", true);
+                $searchClear.prop("disabled", true);
             } else {
-                $search.removeAttr("disabled");
-                $searchClear.removeAttr("disabled");
+                $search.prop("disabled", false);
+                $searchClear.prop("disabled", false);
             }
         }
 
@@ -90,7 +90,7 @@ define(function (require, exports, module) {
                     });
 
                 updateSearch();
-                if (!$search.attr("disabled")) {
+                if (!$search.prop("disabled")) {
                     $dlg.find(".search").focus();
                 }
             });

src/extensibility/ExtensionManagerView.js

@@ -75,7 +75,7 @@ define(function (require, exports, module) {
             self._setupEventHandlers();
             self._render();
         }).fail(function () {
-            $("<div class='alert-message error load-error'/>")
+            $("<div class='alert error load-error'/>")
                 .text(Strings.EXTENSION_MANAGER_ERROR_LOAD)
                 .appendTo(self.$el);
         }).always(function () {

src/extensibility/InstallExtensionDialog.js

@@ -121,12 +121,12 @@ define(function (require, exports, module) {
             this.$msgArea.hide();
             this.$inputArea.show();
             this.$okButton
-                .attr("disabled", "disabled")
+                .prop("disabled", true)
                 .text(Strings.INSTALL);
             break;
 
         case STATE_VALID_URL:
-            this.$okButton.removeAttr("disabled");
+            this.$okButton.prop("disabled", false);
             break;
 
         case STATE_INSTALLING:
@@ -136,7 +136,7 @@ define(function (require, exports, module) {
             this.$msg.text(StringUtils.format(Strings.INSTALLING_FROM, url))
                 .append("<span class='spinner spin'/>");
             this.$msgArea.show();
-            this.$okButton.attr("disabled", "disabled");
+            this.$okButton.prop("disabled", true);
             this._installer.install(url)
                 .done(function () {
                     self._enterState(STATE_INSTALLED);
@@ -156,7 +156,7 @@ define(function (require, exports, module) {
         case STATE_CANCELING_INSTALL:
             // This should call back the STATE_INSTALLING fail() handler above, unless it's too late to cancel
             // in which case we'll still jump to STATE_INSTALLED after this
-            this.$cancelButton.attr("disabled", "disabled");
+            this.$cancelButton.prop("disabled", true);
             this.$msg.text(Strings.CANCELING_INSTALL);
             this._installer.cancel();
             window.setTimeout(function () {
@@ -292,7 +292,7 @@ define(function (require, exports, module) {
         this.$dlg          = $(".install-extension-dialog.instance");
         this.$url          = this.$dlg.find(".url").focus();
         this.$okButton     = this.$dlg.find(".dialog-button[data-button-id='ok']");
-        this.$cancelButton = this.$dlg.find(".dialog-button[data-button-id='cancel']");
+        this.$cancelButton = this.$dlg.find(".dialog-button[data-dismiss='modal']");
         this.$inputArea    = this.$dlg.find(".input-field");
         this.$msgArea      = this.$dlg.find(".message-field");
         this.$msg          = this.$msgArea.find(".message");

src/extensions/default/DebugCommands/main.js

@@ -151,7 +151,7 @@ define(function (require, exports, module) {
 
                 function setLanguage(event) {
                     locale = $select.val();
-                    $submit.attr("disabled", false);
+                    $submit.prop("disabled", false);
                 }
 
                 // returns the localized label for the given locale

src/extensions/default/InlineColorEditor/ColorEditor.js

@@ -157,7 +157,7 @@ define(function (require, exports, module) {
             hueColor = "hsl(" + this._hsv.h + ", 100%, 50%)";
 
         this._updateColorTypeRadioButtons(colorObject.format);
-        this.$colorValue.attr("value", colorValue);
+        this.$colorValue.val(colorValue);
         this.$currentColor.css("background-color", colorValue);
         this.$selection.css("background-color", hueColor);
         this.$hueBase.css("background-color", hueColor);
@@ -597,7 +597,7 @@ define(function (require, exports, module) {
         case KeyEvent.DOM_VK_LEFT:
         case KeyEvent.DOM_VK_RIGHT:
             step = event.shiftKey ? step * STEP_MULTIPLIER : step;
-            xOffset = Number($.trim(this.$selectionBase.css("left").replace("%", "")));
+            xOffset = Number($.trim(this.$selectionBase[0].style.left.replace("%", "")));
             adjustedOffset = (event.keyCode === KeyEvent.DOM_VK_LEFT) ? (xOffset - step) : (xOffset + step);
             xOffset = Math.min(100, Math.max(0, adjustedOffset));
             hsv.s = xOffset / 100;
@@ -606,7 +606,7 @@ define(function (require, exports, module) {
         case KeyEvent.DOM_VK_DOWN:
         case KeyEvent.DOM_VK_UP:
             step = event.shiftKey ? step * STEP_MULTIPLIER : step;
-            yOffset = Number($.trim(this.$selectionBase.css("bottom").replace("%", "")));
+            yOffset = Number($.trim(this.$selectionBase[0].style.bottom.replace("%", "")));
             adjustedOffset = (event.keyCode === KeyEvent.DOM_VK_DOWN) ? (yOffset - step) : (yOffset + step);
             yOffset = Math.min(100, Math.max(0, adjustedOffset));
             hsv.v = yOffset / 100;

src/extensions/default/InlineColorEditor/unittests.js

@@ -399,7 +399,7 @@ define(function (require, exports, module) {
                     runs(function () {
                         makeUI(colorStr);
                         expect(colorEditor.getColor().toString()).toBe(colorStr);
-                        expect(colorEditor.$colorValue.attr("value")).toBe(colorStr);
+                        expect(colorEditor.$colorValue.val()).toBe(colorStr);
                         expect(tinycolor.equals(colorEditor.$currentColor.css("background-color"), colorStr)).toBe(true);
 
                         // Not sure why the tolerances need to be larger for these.
@@ -415,7 +415,7 @@ define(function (require, exports, module) {
                     runs(function () {
                         checkPercentageNear(colorEditor.$hueSelector.css("bottom"), 25);
                         checkPercentageNear(colorEditor.$opacitySelector.css("bottom"), 50);
-                        checkPercentageNear(colorEditor.$selectionBase.css("left"), 74);
+                        checkPercentageNear(colorEditor.$selectionBase[0].style.left, 74);
                         checkPercentageNear(colorEditor.$selectionBase.css("bottom"), 47);
                     });
                 });
@@ -428,7 +428,7 @@ define(function (require, exports, module) {
                         makeUI("#0a0a0a");
                         colorEditor.setColorFromString(colorStr);
                         expect(colorEditor.getColor().toString()).toBe(colorStr);
-                        expect(colorEditor.$colorValue.attr("value")).toBe(colorStr);
+                        expect(colorEditor.$colorValue.val()).toBe(colorStr);
                         expect(tinycolor.equals(colorEditor.$currentColor.css("background-color"), colorStr)).toBe(true);
                         checkNear(tinycolor(colorEditor.$selection.css("background-color")).toHsv().h, tinycolor(colorStr).toHsv().h);
                         checkNear(tinycolor(colorEditor.$hueBase.css("background-color")).toHsv().h, tinycolor(colorStr).toHsv().h);
@@ -441,7 +441,7 @@ define(function (require, exports, module) {
                     runs(function () {
                         checkPercentageNear(colorEditor.$hueSelector.css("bottom"), 25);
                         checkPercentageNear(colorEditor.$opacitySelector.css("bottom"), 50);
-                        checkPercentageNear(colorEditor.$selectionBase.css("left"), 74);
+                        checkPercentageNear(colorEditor.$selectionBase[0].style.left, 74);
                         checkPercentageNear(colorEditor.$selectionBase.css("bottom"), 47);
                     });
                 });

src/extensions/default/JSLint/htmlContent/results-table.html

@@ -1,4 +1,4 @@
-<table class="zebra-striped row-highlight condensed-table">
+<table class="table table-striped table-condensed row-highlight">
     <tbody>
         {{#reportList}}
         <tr>

src/extensions/default/UrlCodeHints/main.js

@@ -154,7 +154,7 @@ define(function (require, exports, module) {
                     self.cachedHints.queryDir   = queryDir;
                     self.cachedHints.docDir     = docDir;
 
-                    if (!self.cachedHints.deferred.isRejected()) {
+                    if (self.cachedHints.deferred.state() !== "rejected") {
                         var currentDeferred = self.cachedHints.deferred;
                         // Since we've cached the results, the next call to _getUrlList should be synchronous.
                         // If it isn't, we've got a problem and should reject both the current deferred
@@ -163,13 +163,12 @@ define(function (require, exports, module) {
                         if (syncResults instanceof Array) {
                             currentDeferred.resolveWith(self, [syncResults]);
                         } else {
-                            if (currentDeferred && !currentDeferred.isResolved() && !currentDeferred.isRejected()) {
+                            if (currentDeferred && currentDeferred.state() === "pending") {
                                 currentDeferred.reject();
                             }
 
                             if (self.cachedHints.deferred &&
-                                    !self.cachedHints.deferred.isResolved() &&
-                                    !self.cachedHints.deferred.isRejected()) {
+                                    self.cachedHints.deferred.state() === "pending") {
                                 self.cachedHints.deferred.reject();
                                 self.cachedHints.deferred = null;
                             }

src/htmlContent/extension-manager-dialog.html

@@ -4,9 +4,9 @@
         <input class="search" type="text" placeholder="Search">
         <h1 class="dialog-title">{{EXTENSION_MANAGER_TITLE}}</h1>
     </div>
-    <div class="modal-body no-padding zebra-striped"></div>
+    <div class="modal-body no-padding table-striped"></div>
     <div class="modal-footer">
         <button class="btn left install-from-url">{{INSTALL_FROM_URL}}</button>
-        <button class="dialog-button btn primary" data-button-id="close">{{CLOSE}}</button>
+        <button class="dialog-button btn primary" data-button-id="ok" data-dismiss="modal">{{CLOSE}}</button>
     </div>
 </div>

src/htmlContent/extension-manager-view-item.html

@@ -13,7 +13,7 @@
     </td>
     <td class="ext-desc">
         {{^isCompatible}}
-            <div class="alert-message warning">
+            <div class="alert warning">
                 {{#requiresNewer}}{{Strings.EXTENSION_INCOMPATIBLE_NEWER}}{{/requiresNewer}}
                 {{^requiresNewer}}{{Strings.EXTENSION_INCOMPATIBLE_OLDER}}{{/requiresNewer}}
             </div>

src/htmlContent/install-extension-dialog.html

@@ -13,6 +13,6 @@ <h1 class="dialog-title">{{INSTALL_EXTENSION_TITLE}}</h1>
     <div class="modal-footer">
         <button class="btn left browse-extensions">{{BROWSE_EXTENSIONS}}</button>
         <button class="dialog-button btn primary" data-button-id="ok" disabled>{{INSTALL}}</button>
-        <button class="dialog-button btn" data-button-id="cancel">{{CANCEL}}</button>
+        <button class="dialog-button btn" data-button-id="cancel" data-dismiss="modal">{{CANCEL}}</button>
     </div>
 </div>

src/index.html

@@ -90,14 +90,14 @@
 
     <!-- TODO (Issue #278): switch between runtime LESS compilation in dev mode and precompiled version -->
     <link rel="stylesheet/less" href="styles/brackets.less">
-    <script src="thirdparty/less-1.3.0.min.js"></script>
+    <script src="thirdparty/less-1.3.3.min.js"></script>
     <script src="thirdparty/mustache/mustache.js"></script>
     <!-- <link rel="stylesheet" href="brackets.min.css"> -->
 
     <!-- JavaScript -->
 
     <!-- Pre-load third party scripts that cannot be async loaded. -->
-    <script src="thirdparty/jquery-1.7.min.js"></script>
+    <script src="thirdparty/jquery-2.0.1.min.js"></script>
     <script src="thirdparty/CodeMirror2/lib/codemirror.js"></script>
     <script src="thirdparty/CodeMirror2/addon/edit/matchbrackets.js"></script>
     <script src="thirdparty/CodeMirror2/addon/edit/closebrackets.js"></script>

src/preferences/PreferencesDialogs.js

@@ -121,7 +121,7 @@ define(function (require, exports, module) {
 
         // Error message
         if (errorMessage) {
-            $dlg.find(".field-container").append("<div class='alert-message' style='margin-bottom: 0'>" + errorMessage + "</div>");
+            $dlg.find(".field-container").append("<div class='alert' style='margin-bottom: 0'>" + errorMessage + "</div>");
         }
 
         // Give focus to first control

src/search/FindInFiles.js

@@ -90,7 +90,7 @@ define(function (require, exports, module) {
                 $(".modal-bar .message").css("display", "none");
                 $(".modal-bar .error")
                     .css("display", "inline-block")
-                    .html("<div class='alert-message' style='margin-bottom: 0'>" + e.message + "</div>");
+                    .html("<div class='alert' style='margin-bottom: 0'>" + e.message + "</div>");
                 return null;
             }
         }
@@ -164,7 +164,7 @@ define(function (require, exports, module) {
         var $searchField = $("input#findInFilesInput");
         var that = this;
 
-        $searchField.attr("value", initialString || "");
+        $searchField.val(initialString || "");
         $searchField.get(0).select();
 
         $("#findInFilesScope").html(_labelForScope(scope));
@@ -245,7 +245,7 @@ define(function (require, exports, module) {
 
     function _showSearchResults(searchResults, query, scope) {
         if (searchResults && searchResults.length) {
-            var $resultTable = $("<table class='zebra-striped row-highlight condensed-table' />")
+            var $resultTable = $("<table class='table table-striped table-condensed row-highlight' />")
                                 .append("<tbody>");
 
             // Count the total number of matches

src/search/FindReplace.js

@@ -81,7 +81,7 @@ define(function (require, exports, module) {
             $(".modal-bar .message").css("display", "none");
             $(".modal-bar .error")
                 .css("display", "inline-block")
-                .html("<div class='alert-message' style='margin-bottom: 0'>" + e.message + "</div>");
+                .html("<div class='alert' style='margin-bottom: 0'>" + e.message + "</div>");
             return "";
         }
     }
@@ -231,7 +231,7 @@ define(function (require, exports, module) {
         if (modalBar) {
             // The modalBar was already up. When creating the new modalBar, copy the
             // current query instead of using the passed-in selected text.
-            initialQuery = getDialogTextField().attr("value");
+            initialQuery = getDialogTextField().val();
         }
 
         createModalBar(queryDialog, true);
@@ -255,7 +255,7 @@ define(function (require, exports, module) {
 
         var $input = getDialogTextField();
         $input.on("input", function () {
-            findFirst($input.attr("value"));
+            findFirst($input.val());
         });
 
         // Prepopulate the search field with the current selection, if any.
@@ -267,7 +267,7 @@ define(function (require, exports, module) {
             }
 
             $input
-                .attr("value", initialQuery)
+                .val(initialQuery)
                 .get(0).select();
             findFirst(initialQuery);
             // Clear the "findNextCalled" flag here so we have a clean start
@@ -352,7 +352,7 @@ define(function (require, exports, module) {
 
         // Prepopulate the replace field with the current selection, if any
         getDialogTextField()
-            .attr("value", cm.getSelection())
+            .val(cm.getSelection())
             .get(0).select();
     }
 

src/styles/bootstrap/accordion.less

@@ -0,0 +1,34 @@
+//
+// Accordion
+// --------------------------------------------------
+
+
+// Parent container
+.accordion {
+  margin-bottom: @baseLineHeight;
+}
+
+// Group == heading + body
+.accordion-group {
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
+  .border-radius(@baseBorderRadius);
+}
+.accordion-heading {
+  border-bottom: 0;
+}
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
+
+// General toggle styles
+.accordion-toggle {
+  cursor: pointer;
+}
+
+// Inner needs the styles because you can't animate properly with any styles on the element
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}