From bad5938cddbda1e1dc81ae97ca03e9907776eb10 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 1 Jul 2014 12:02:06 -0400 Subject: [PATCH] ES6: All list views --- .../templates/discovery/topics.js.handlebars | 2 +- .../mobile/discovery/topics.js.handlebars | 2 +- ...gories_view.js => discovery-categories.js.es6} | 2 +- .../discourse/views/discovery-top.js.es6 | 1 + .../discourse/views/list/discovery_top_view.js | 9 --------- .../discourse/views/list/user_topics_list_view.js | 15 --------------- ...c_list_item_view.js => topic-list-item.js.es6} | 12 ++---------- .../discourse/views/user-topics-list.js.es6 | 5 +++++ 8 files changed, 11 insertions(+), 37 deletions(-) rename app/assets/javascripts/discourse/views/{list/discovery_categories_view.js => discovery-categories.js.es6} (94%) create mode 100644 app/assets/javascripts/discourse/views/discovery-top.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/list/discovery_top_view.js delete mode 100644 app/assets/javascripts/discourse/views/list/user_topics_list_view.js rename app/assets/javascripts/discourse/views/{list/topic_list_item_view.js => topic-list-item.js.es6} (79%) create mode 100644 app/assets/javascripts/discourse/views/user-topics-list.js.es6 diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars b/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars index a891a56d596..6715e908bd8 100644 --- a/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars +++ b/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars @@ -62,7 +62,7 @@ {{/if}} - {{each topics itemController="topic-list-item" itemViewClass="Discourse.TopicListItemView"}} + {{each topics itemController="topic-list-item" itemView="topic-list-item"}} diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.js.handlebars b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.js.handlebars index 97a15e23f9d..e8a2119392d 100644 --- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.js.handlebars +++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.js.handlebars @@ -19,7 +19,7 @@ {{/if}} - {{collection contentBinding="topics" tagName="tbody" itemViewClass="Discourse.TopicListItemView"}} + {{collection contentBinding="topics" tagName="tbody" itemView="topic-list-item"}} {{/if}} diff --git a/app/assets/javascripts/discourse/views/list/discovery_categories_view.js b/app/assets/javascripts/discourse/views/discovery-categories.js.es6 similarity index 94% rename from app/assets/javascripts/discourse/views/list/discovery_categories_view.js rename to app/assets/javascripts/discourse/views/discovery-categories.js.es6 index bde18682645..688c999ca69 100644 --- a/app/assets/javascripts/discourse/views/list/discovery_categories_view.js +++ b/app/assets/javascripts/discourse/views/discovery-categories.js.es6 @@ -1,4 +1,4 @@ -Discourse.DiscoveryCategoriesView = Discourse.View.extend({ +export default Discourse.View.extend({ orderingChanged: function(){ if (this.get("controller.ordering")) { diff --git a/app/assets/javascripts/discourse/views/discovery-top.js.es6 b/app/assets/javascripts/discourse/views/discovery-top.js.es6 new file mode 100644 index 00000000000..95433a05722 --- /dev/null +++ b/app/assets/javascripts/discourse/views/discovery-top.js.es6 @@ -0,0 +1 @@ +export default Discourse.View.extend(Discourse.ScrollTop); diff --git a/app/assets/javascripts/discourse/views/list/discovery_top_view.js b/app/assets/javascripts/discourse/views/list/discovery_top_view.js deleted file mode 100644 index a2d5f18c52e..00000000000 --- a/app/assets/javascripts/discourse/views/list/discovery_top_view.js +++ /dev/null @@ -1,9 +0,0 @@ -/** - This view handles the rendering of the top lists - - @class DiscoveryTopView - @extends Discourse.View - @namespace Discourse - @module Discourse -**/ -Discourse.DiscoveryTopView = Discourse.View.extend(Discourse.ScrollTop); diff --git a/app/assets/javascripts/discourse/views/list/user_topics_list_view.js b/app/assets/javascripts/discourse/views/list/user_topics_list_view.js deleted file mode 100644 index 6ba601ed5f7..00000000000 --- a/app/assets/javascripts/discourse/views/list/user_topics_list_view.js +++ /dev/null @@ -1,15 +0,0 @@ -/** - This view is used for rendering a basic list of topics on a user's page. - - @class UserTopicsListView - @extends Discourse.View - @namespace Discourse - @uses Discourse.LoadMore - @module Discourse -**/ -Discourse.UserTopicsListView = Discourse.View.extend(Discourse.LoadMore, { - classNames: ['paginated-topics-list'], - eyelineSelector: '.paginated-topics-list #topic-list tr', - templateName: 'list/user_topics_list' -}); - diff --git a/app/assets/javascripts/discourse/views/list/topic_list_item_view.js b/app/assets/javascripts/discourse/views/topic-list-item.js.es6 similarity index 79% rename from app/assets/javascripts/discourse/views/list/topic_list_item_view.js rename to app/assets/javascripts/discourse/views/topic-list-item.js.es6 index a3ef7119879..e886aa99e6d 100644 --- a/app/assets/javascripts/discourse/views/list/topic_list_item_view.js +++ b/app/assets/javascripts/discourse/views/topic-list-item.js.es6 @@ -1,12 +1,4 @@ -/** - This view handles the rendering of a topic in a list - - @class TopicListItemView - @extends Discourse.GroupedView - @namespace Discourse - @module Discourse -**/ -Discourse.TopicListItemView = Discourse.GroupedView.extend({ +export default Discourse.GroupedView.extend({ tagName: 'tr', templateName: 'list/topic_list_item', classNameBindings: ['controller.checked', 'content.archived', ':topic-list-item', 'content.hasExcerpt:has-excerpt'], @@ -27,7 +19,7 @@ Discourse.TopicListItemView = Discourse.GroupedView.extend({ _highlightIfNeeded: function() { var session = Discourse.Session.current(); - // highligth the last topic viewed + // highlight the last topic viewed if (session.get('lastTopicIdViewed') === this.get('content.id')) { session.set('lastTopicIdViewed', null); this.highlight(); diff --git a/app/assets/javascripts/discourse/views/user-topics-list.js.es6 b/app/assets/javascripts/discourse/views/user-topics-list.js.es6 new file mode 100644 index 00000000000..4a2b9b12a79 --- /dev/null +++ b/app/assets/javascripts/discourse/views/user-topics-list.js.es6 @@ -0,0 +1,5 @@ +export default Discourse.View.extend(Discourse.LoadMore, { + classNames: ['paginated-topics-list'], + eyelineSelector: '.paginated-topics-list #topic-list tr', + templateName: 'list/user_topics_list' +});