From fed9943d909ab2da81f1e1f0a329179086486ffb Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 18 Feb 2015 14:21:36 -0500
Subject: [PATCH] Minor ES6 tweaks
---
.../javascripts/admin/controllers/admin-flags-list.js.es6 | 8 ++++----
.../discourse/controllers/discovery/topics.js.es6 | 2 +-
.../javascripts/discourse/views/discovery-topics.js.es6 | 7 +++----
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/app/assets/javascripts/admin/controllers/admin-flags-list.js.es6 b/app/assets/javascripts/admin/controllers/admin-flags-list.js.es6
index da81f2e38..9ef1a4327 100644
--- a/app/assets/javascripts/admin/controllers/admin-flags-list.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-flags-list.js.es6
@@ -5,7 +5,7 @@ export default Ember.ArrayController.extend({
adminActiveFlagsView: Em.computed.equal("query", "active"),
actions: {
- disagreeFlags: function (flaggedPost) {
+ disagreeFlags(flaggedPost) {
var self = this;
flaggedPost.disagreeFlags().then(function () {
self.removeObject(flaggedPost);
@@ -14,7 +14,7 @@ export default Ember.ArrayController.extend({
});
},
- deferFlags: function (flaggedPost) {
+ deferFlags(flaggedPost) {
var self = this;
flaggedPost.deferFlags().then(function () {
self.removeObject(flaggedPost);
@@ -23,12 +23,12 @@ export default Ember.ArrayController.extend({
});
},
- doneTopicFlags: function(item) {
+ doneTopicFlags(item) {
this.send("disagreeFlags", item);
},
},
- loadMore: function(){
+ loadMore(){
var flags = this.get("model");
return Discourse.FlaggedPost.findAll(this.get("query"),flags.length+1).then(function(data){
if(data.length===0){
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
index 9d3a7f292..520e51707 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -174,7 +174,7 @@ var controllerOpts = {
});
}.property('allLoaded', 'topics.length'),
- loadMoreTopics: function() {
+ loadMoreTopics() {
return this.get('model').loadMore();
}
};
diff --git a/app/assets/javascripts/discourse/views/discovery-topics.js.es6 b/app/assets/javascripts/discourse/views/discovery-topics.js.es6
index cdafd0e5c..4e1ae4e8c 100644
--- a/app/assets/javascripts/discourse/views/discovery-topics.js.es6
+++ b/app/assets/javascripts/discourse/views/discovery-topics.js.es6
@@ -5,7 +5,7 @@ export default Discourse.View.extend(LoadMore, UrlRefresh, {
eyelineSelector: '.topic-list-item',
actions: {
- loadMore: function() {
+ loadMore() {
var self = this;
Discourse.notifyTitle(0);
this.get('controller').loadMoreTopics().then(function (hasMoreResults) {
@@ -34,14 +34,13 @@ export default Discourse.View.extend(LoadMore, UrlRefresh, {
}.observes('controller.topicTrackingState.incomingCount'),
// Remember where we were scrolled to
- saveScrollPosition: function() {
+ saveScrollPosition() {
this.session.set('topicListScrollPosition', $(window).scrollTop());
},
// When the topic list is scrolled
- scrolled: function() {
+ scrolled() {
this._super();
this.saveScrollPosition();
}
});
-