IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated Ember.Set

Browse Source
This commit is contained in:
Robin Ward 2014-09-04 15:01:12 -04:00
parent 52e25c9272
commit 229566fc32
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/composer-messages.js.es6
View File

@ -66,7 +66,7 @@ export default Ember.ArrayController.extend({
reset: function() { reset: function() {
this.clear(); this.clear();
this.set('messagesByTemplate', {}); this.set('messagesByTemplate', {});
this.set('queuedForTyping', new Em.Set()); this.set('queuedForTyping', []);
this.set('checkedMessages', false); this.set('checkedMessages', false);
}, },

7
app/assets/javascripts/discourse/controllers/topic.js.es6
View File

@ -40,8 +40,8 @@ export default ObjectController.extend(Discourse.SelectedPostsCount, {
init: function() { init: function() {
this._super(); this._super();
this.set('selectedPosts', new Em.Set()); this.set('selectedPosts', []);
this.set('selectedReplies', new Em.Set()); this.set('selectedReplies', []);
}, },
actions: { actions: {
@ -275,8 +275,7 @@ export default ObjectController.extend(Discourse.SelectedPostsCount, {
var selectedPosts = self.get('selectedPosts'), var selectedPosts = self.get('selectedPosts'),
selectedReplies = self.get('selectedReplies'), selectedReplies = self.get('selectedReplies'),
postStream = self.get('postStream'), postStream = self.get('postStream'),
toRemove = new Ember.Set(); toRemove = [];
Discourse.Post.deleteMany(selectedPosts, selectedReplies); Discourse.Post.deleteMany(selectedPosts, selectedReplies);
postStream.get('posts').forEach(function (p) { postStream.get('posts').forEach(function (p) {

13
app/assets/javascripts/discourse/models/post_stream.js
View File

@ -122,8 +122,7 @@ Discourse.PostStream = Em.Object.extend({
var userFilters = this.get('userFilters'); var userFilters = this.get('userFilters');
if (!Em.isEmpty(userFilters)) { if (!Em.isEmpty(userFilters)) {
var userFiltersArray = this.get('userFilters').toArray(); result.username_filters = userFilters.join(",");
if (userFiltersArray.length > 0) { result.username_filters = userFiltersArray.join(","); }
} }
return result; return result;
@ -215,9 +214,9 @@ Discourse.PostStream = Em.Object.extend({
this.set('summary', false); this.set('summary', false);
this.set('show_deleted', true); this.set('show_deleted', true);
if (userFilters.contains(username)) { if (userFilters.contains(username)) {
userFilters.remove(username); userFilters.removeObject(username);
} else { } else {
userFilters.add(username); userFilters.addObject(username);
} }
return this.refresh(); return this.refresh();
}, },
@ -904,9 +903,9 @@ Discourse.PostStream.reopenClass({
create: function() { create: function() {
var postStream = this._super.apply(this, arguments); var postStream = this._super.apply(this, arguments);
postStream.setProperties({ postStream.setProperties({
posts: Em.A(), posts: [],
stream: Em.A(), stream: [],
userFilters: Em.Set.create(), userFilters: [],
postIdentityMap: Em.Map.create(), postIdentityMap: Em.Map.create(),
summary: false, summary: false,
loaded: false, loaded: false,