From 61bba4d07420b46f988de7ffbe3912ec4e2793cd Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 12 Jun 2014 11:13:05 -0400
Subject: [PATCH] ES6: More views converted and deprecated

---
 .../javascripts/discourse/initializers/deprecations.js.es6   | 3 ++-
 .../javascripts/discourse/initializers/view-helpers.js.es6   | 3 ++-
 .../discourse/templates/modal/merge_topic.js.handlebars      | 2 +-
 .../views/{choose_topic_view.js => choose-topic.js.es6}      | 5 +----
 .../{discovery_topics_view.js => discovery-topics.js.es6}    | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename app/assets/javascripts/discourse/views/{choose_topic_view.js => choose-topic.js.es6} (91%)
 rename app/assets/javascripts/discourse/views/{discovery_topics_view.js => discovery-topics.js.es6} (94%)

diff --git a/app/assets/javascripts/discourse/initializers/deprecations.js.es6 b/app/assets/javascripts/discourse/initializers/deprecations.js.es6
index d3883854b57..20d15cba1f3 100644
--- a/app/assets/javascripts/discourse/initializers/deprecations.js.es6
+++ b/app/assets/javascripts/discourse/initializers/deprecations.js.es6
@@ -4,7 +4,8 @@ var deprecatedViewHelpers = {
   textField: 'text-field',
   userSelector: 'user-selector',
   combobox: 'combo-box',
-  categoryChooser: 'category-chooser'
+  categoryChooser: 'category-chooser',
+  chooseTopic: 'choose-topic'
 };
 
 export default {
diff --git a/app/assets/javascripts/discourse/initializers/view-helpers.js.es6 b/app/assets/javascripts/discourse/initializers/view-helpers.js.es6
index b3483a0e707..1a79d2b3cb1 100644
--- a/app/assets/javascripts/discourse/initializers/view-helpers.js.es6
+++ b/app/assets/javascripts/discourse/initializers/view-helpers.js.es6
@@ -3,7 +3,8 @@ var helpers = ['input-tip',
                'text-field',
                'user-selector',
                'category-chooser',
-               'combo-box'];
+               'combo-box',
+               'choose-topic'];
 
 /**
   Creates view helpers for some views. Many of these should probably be converted
diff --git a/app/assets/javascripts/discourse/templates/modal/merge_topic.js.handlebars b/app/assets/javascripts/discourse/templates/modal/merge_topic.js.handlebars
index a7eabdf3c55..29e97b4bb62 100644
--- a/app/assets/javascripts/discourse/templates/modal/merge_topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/merge_topic.js.handlebars
@@ -8,7 +8,7 @@
   <p>{{{i18n topic.merge_topic.instructions count="selectedPostsCount"}}}</p>
 
   <form>
-    {{chooseTopic selectedTopicId=selectedTopicId}}
+    {{choose-topic selectedTopicId=selectedTopicId}}
   </form>
 </div>
 
diff --git a/app/assets/javascripts/discourse/views/choose_topic_view.js b/app/assets/javascripts/discourse/views/choose-topic.js.es6
similarity index 91%
rename from app/assets/javascripts/discourse/views/choose_topic_view.js
rename to app/assets/javascripts/discourse/views/choose-topic.js.es6
index 5a44f09d2a6..c5f3cc9e582 100644
--- a/app/assets/javascripts/discourse/views/choose_topic_view.js
+++ b/app/assets/javascripts/discourse/views/choose-topic.js.es6
@@ -6,7 +6,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.ChooseTopicView = Discourse.View.extend({
+export default Discourse.View.extend({
   templateName: 'choose_topic',
 
   topicTitleChanged: function() {
@@ -53,6 +53,3 @@ Discourse.ChooseTopicView = Discourse.View.extend({
   }
 
 });
-
-
-Discourse.View.registerHelper('chooseTopic', Discourse.ChooseTopicView);
diff --git a/app/assets/javascripts/discourse/views/discovery_topics_view.js b/app/assets/javascripts/discourse/views/discovery-topics.js.es6
similarity index 94%
rename from app/assets/javascripts/discourse/views/discovery_topics_view.js
rename to app/assets/javascripts/discourse/views/discovery-topics.js.es6
index c083ec0ef9d..ccb7ae91532 100644
--- a/app/assets/javascripts/discourse/views/discovery_topics_view.js
+++ b/app/assets/javascripts/discourse/views/discovery-topics.js.es6
@@ -7,7 +7,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.DiscoveryTopicsView = Discourse.View.extend(Discourse.LoadMore, {
+export default Discourse.View.extend(Discourse.LoadMore, {
   eyelineSelector: '.topic-list-item',
 
   actions: {