Merge remote-tracking branch 'juggy/ember-13'

# Conflicts: # ember-model.js # packages/ember-model/lib/has_many_array.js
ebryn · Nov 20, 2015 · 71ba340 · 71ba340
2 parents b3ae068 + 19b6db2
commit 71ba340
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/ember-model.js b/ember-model.js
@@ -381,22 +381,22 @@ Ember.ManyArray = Ember.RecordArray.extend({
     this._super(index, removed, added);
   },
 
-  _contentWillChange: function() {
+ _contentDidChange: function() {
     var content = get(this, 'content');
+    var contentPrev = this._content;
 
-    if (content) {
-      this.arrayWillChange(content, 0, get(content, 'length'), 0);
-      content.removeArrayObserver(this);
+    if (contentPrev && contentPrev !== content) {
+      this.arrayWillChange(contentPrev, 0, get(contentPrev, 'length'), 0);
+      contentPrev.removeArrayObserver(this);
       this._setupOriginalContent(content);
     }
-  }.observesBefore('content'),
 
-  _contentDidChange: function() {
-    var content = get(this, 'content');
     if (content) {
       content.addArrayObserver(this);
       this.arrayDidChange(content, 0, 0, get(content, 'length'));
     }
+
+    this._content = content;
   }.observes('content'),
 
   arrayWillChange: function(item, idx, removedCnt, addedCnt) {
@@ -2202,11 +2202,4 @@ Ember.onLoad('Ember.Application', function(Application) {
 });
 
 
-})();
-
-(function() {
-
-
-
-
 })();
diff --git a/packages/ember-model/lib/has_many_array.js b/packages/ember-model/lib/has_many_array.js
@@ -70,7 +70,7 @@ Ember.ManyArray = Ember.RecordArray.extend({
     this._super(index, removed, added);
   },
 
-  _contentDidChange: function() {
+ _contentDidChange: function() {
     var content = get(this, 'content');
     var contentPrev = this._content;