From 229566fc323293ffa54ec1349ac4e7a83fd85c31 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 4 Sep 2014 15:01:12 -0400 Subject: [PATCH] Remove deprecated `Ember.Set` --- .../discourse/controllers/composer-messages.js.es6 | 2 +- .../javascripts/discourse/controllers/topic.js.es6 | 7 +++---- .../javascripts/discourse/models/post_stream.js | 13 ++++++------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/composer-messages.js.es6 b/app/assets/javascripts/discourse/controllers/composer-messages.js.es6 index 0a49c13313f..3b8865416e7 100644 --- a/app/assets/javascripts/discourse/controllers/composer-messages.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer-messages.js.es6 @@ -66,7 +66,7 @@ export default Ember.ArrayController.extend({ reset: function() { this.clear(); this.set('messagesByTemplate', {}); - this.set('queuedForTyping', new Em.Set()); + this.set('queuedForTyping', []); this.set('checkedMessages', false); }, diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index aedd0997049..3737a93be1e 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -40,8 +40,8 @@ export default ObjectController.extend(Discourse.SelectedPostsCount, { init: function() { this._super(); - this.set('selectedPosts', new Em.Set()); - this.set('selectedReplies', new Em.Set()); + this.set('selectedPosts', []); + this.set('selectedReplies', []); }, actions: { @@ -275,8 +275,7 @@ export default ObjectController.extend(Discourse.SelectedPostsCount, { var selectedPosts = self.get('selectedPosts'), selectedReplies = self.get('selectedReplies'), postStream = self.get('postStream'), - toRemove = new Ember.Set(); - + toRemove = []; Discourse.Post.deleteMany(selectedPosts, selectedReplies); postStream.get('posts').forEach(function (p) { diff --git a/app/assets/javascripts/discourse/models/post_stream.js b/app/assets/javascripts/discourse/models/post_stream.js index 7451ff69fba..89cb99c4740 100644 --- a/app/assets/javascripts/discourse/models/post_stream.js +++ b/app/assets/javascripts/discourse/models/post_stream.js @@ -122,8 +122,7 @@ Discourse.PostStream = Em.Object.extend({ var userFilters = this.get('userFilters'); if (!Em.isEmpty(userFilters)) { - var userFiltersArray = this.get('userFilters').toArray(); - if (userFiltersArray.length > 0) { result.username_filters = userFiltersArray.join(","); } + result.username_filters = userFilters.join(","); } return result; @@ -215,9 +214,9 @@ Discourse.PostStream = Em.Object.extend({ this.set('summary', false); this.set('show_deleted', true); if (userFilters.contains(username)) { - userFilters.remove(username); + userFilters.removeObject(username); } else { - userFilters.add(username); + userFilters.addObject(username); } return this.refresh(); }, @@ -904,9 +903,9 @@ Discourse.PostStream.reopenClass({ create: function() { var postStream = this._super.apply(this, arguments); postStream.setProperties({ - posts: Em.A(), - stream: Em.A(), - userFilters: Em.Set.create(), + posts: [], + stream: [], + userFilters: [], postIdentityMap: Em.Map.create(), summary: false, loaded: false,