[MD Extensions] Fix item sorting

chrome/browser/resources/md_extensions/manager.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('extensions', function() {
+  'use strict';
+
+  /**
+   * Compares two extensions to determine which should come first in the list.

[Devlin, 2015/11/18 00:38:57]

note: copy-paste from service.js

+   * @param {chrome.developerPrivate.ExtensionInfo} a
+   * @param {chrome.developerPrivate.ExtensionInfo} b
+   * @return {number}
+   */
+  var compareExtensions = function(a, b) {
+    function compare(x, y) {
+      return x < y ? -1 : (x > y ? 1 : 0);
+    }
+    function compareLocation(x, y) {
+      if (x.location == y.location)
+        return 0;
+      if (x.location == chrome.developerPrivate.Location.UNPACKED)
+        return -1;
+      if (y.location == chrome.developerPrivate.Location.UNPACKED)
+        return 1;
+      return 0;
+    }
+    return compareLocation(a, b) ||
+           compare(a.name.toLowerCase(), b.name.toLowerCase()) ||
+           compare(a.id, b.id);
+  };
+
   var Manager = Polymer({
     is: 'extensions-manager',
 
     properties: {
       sidebar: {

[michaelpg, 2015/11/18 09:08:45]

/** @type {extensions.Sidebar} */

[Devlin, 2015/11/18 17:16:59]

Ah, didn't realize that worked.  Done.

         type: Object,
       }
     },
 
     ready: function() {
+      /** @type {extensions.Sidebar} */
       this.sidebar = this.$$('extensions-sidebar');
       extensions.Service.getInstance().managerReady(this);
       this.sidebar.setScrollDelegate(new ScrollHelper(this));
     },
 
     /**
      * Creates and adds a new extensions-item element to the list.

[michaelpg, 2015/11/18 09:08:45]

nit: ", inserting it into its sorted position in the relevant section" or
something.

[Devlin, 2015/11/18 17:16:59]

Done.

      * @param {!chrome.developerPrivate.ExtensionInfo} extension The extension
      *     the item is representing.
      * @param {!extensions.ItemDelegate} delegate The delegate for the item.
-     * @param {!number=} opt_index The index at which to place the item. If
-     *     not present, the item is appended to the end of the list.
      */
-    addItem: function(extension, delegate, opt_index) {
+    addItem: function(extension, delegate) {
       var listId;
       var ExtensionType = chrome.developerPrivate.ExtensionType;
       switch (extension.type) {
         case ExtensionType.HOSTED_APP:
         case ExtensionType.LEGACY_PACKAGED_APP:
           listId = 'websites-list';
           break;
         case ExtensionType.PLATFORM_APP:
           listId = 'apps-list';
           break;
         case ExtensionType.EXTENSION:
         case ExtensionType.SHARED_MODULE:
           listId = 'extensions-list';
           break;
         case ExtensionType.THEME:
           assertNotReached(
               'Don\'t send themes to the chrome://extensions page');
           break;
       }
       assert(listId);
       var extensionItem = new extensions.Item(extension, delegate);
       var itemList = this.$[listId];
-      var refNode = opt_index !== undefined ?
-          itemList.children[opt_index] : undefined;
-      itemList.insertBefore(extensionItem, refNode);
+
+      var insertBeforeChild = Array.prototype.find.call(itemList.children,
+                                                        function(item) {
+        return compareExtensions(item.data, extension) > 0;
+      });
+      itemList.insertBefore(extensionItem, insertBeforeChild);
     },
 
     /**
      * @param {string} id The id of the extension to get the item for.
      * @return {?extensions.Item}
      */
     getItem: function(id) {
       return this.$$('#' + id);
     },
 
@@ skipping 40 matching lines @@
 
     /** @override */
     scrollToWebsites: function() {
       this.items_.scrollTop =
           this.items_.querySelector('#websites-header').offsetTop;
     },
   };
 
   return {Manager: Manager};
 });