Merge pull request #17841 from rwjblue/fix-sort

[BUGFIX] Ensure @sort works on non-Ember.Objects.
emberjs · Apr 3, 2019 · 4b099ee · 4b099ee
2 parents d059ad6 + 00a0c0b
commit 4b099ee
Show file tree

Hide file tree

Showing 2 changed files with 477 additions and 464 deletions.
diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.js b/packages/@ember/object/lib/computed/reduce_computed_macros.js
@@ -3,7 +3,13 @@
 */
 import { DEBUG } from '@glimmer/env';
 import { assert } from '@ember/debug';
-import { get, computed, addObserver, removeObserver } from '@ember/-internals/metal';
+import {
+  get,
+  computed,
+  addObserver,
+  removeObserver,
+  notifyPropertyChange,
+} from '@ember/-internals/metal';
 import { compare, isArray, A as emberA, uniqBy as uniqByArray } from '@ember/-internals/runtime';
 
 function reduceMacro(dependentKey, callback, initialValue, name) {
@@ -1427,7 +1433,7 @@ function propertySort(itemsKey, sortPropertiesKey) {
 
     if (!sortPropertyDidChangeMap.has(this)) {
       sortPropertyDidChangeMap.set(this, function() {
-        this.notifyPropertyChange(key);
+        notifyPropertyChange(this, key);
       });
     }