Revert 98901 - Call prepareSort before any sorting happens.

chrome/browser/resources/shared/js/cr/ui/array_data_model.js

 // Copyright (c) 2011 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.
 
 /**
  * @fileoverview This is a data model representin
  */
 
 cr.define('cr.ui', function() {
   const EventTarget = cr.EventTarget;
@@ skipping 130 matching lines @@
 
       var arr = this.array_;
 
       // TODO(arv): Maybe unify splice and change events?
       var spliceEvent = new Event('splice');
       spliceEvent.index = index;
       spliceEvent.removed = arr.slice(index, index + deleteCount);
       spliceEvent.added = Array.prototype.slice.call(arguments, 2);
 
       var rv = arr.splice.apply(arr, arguments);
-      var self = this;
 
       // if sortStatus.field is null, this restores original order.
-      this.prepareSort(this.sortStatus.field, function() {
-        var sortPermutation = self.doSort_(self.sortStatus.field,
-                                           self.sortStatus.direction);
-        if (sortPermutation) {
-          var splicePermutation = deletePermutation.map(function(element) {
-              return element != -1 ? sortPermutation[element] : -1;
-            });
-          self.dispatchPermutedEvent_(splicePermutation);
-        } else {
-          self.dispatchPermutedEvent_(deletePermutation);
-        }
+      var sortPermutation = this.doSort_(this.sortStatus.field,
+                                         this.sortStatus.direction);
+      if (sortPermutation) {
+        var splicePermutation = deletePermutation.map(function(element) {
+          return element != -1 ? sortPermutation[element] : -1;
+        });
+        this.dispatchPermutedEvent_(splicePermutation);
+      } else {
+        this.dispatchPermutedEvent_(deletePermutation);
+      }
 
-        self.dispatchEvent(spliceEvent);
-      });
-
+      this.dispatchEvent(spliceEvent);
       return rv;
     },
 
     /**
      * Appends items to the end of the model.
      *
      * This dispatches a splice event.
      *
      * @param {...*} The items to append.
      * @return {number} The new length of the model.
@@ skipping 15 matching lines @@
     updateIndex: function(index) {
       if (index < 0 || index >= this.length)
         throw Error('Invalid index, ' + index);
 
       // TODO(arv): Maybe unify splice and change events?
       var e = new Event('change');
       e.index = index;
       this.dispatchEvent(e);
 
       if (this.sortStatus.field) {
-        var self = this;
-        this.prepareSort(self.sortStatus.field, function() {
-          var sortPermutation = self.doSort_(self.sortStatus.field,
-                                             self.sortStatus.direction);
-          if (sortPermutation)
-            self.dispatchPermutedEvent_(sortPermutation);
-        });
+        var sortPermutation = this.doSort_(this.sortStatus.field,
+                                           this.sortStatus.direction);
+        if (sortPermutation)
+          this.dispatchPermutedEvent_(sortPermutation);
       }
     },
 
     /**
      * Creates sort status with given field and direction.
      * @param {string} field Sort field.
      * @param {string} direction Sort direction.
      * @return {!Object} Created sort status.
      */
     createSortStatus: function(field, direction) {
@@ skipping 126 matching lines @@
       if (a > b)
         return 1;
       return 0;
     }
   };
 
   return {
     ArrayDataModel: ArrayDataModel
   };
 });