From 5cd7e1b387213e03c46cf2546aa892c0e0989e85 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 28 Jul 2014 13:39:20 -0400
Subject: [PATCH] ES6: Convert more routes over

---
 .../{badges_index_route.js => badges-index.js.es6}  |  9 +--------
 .../{badges_show_route.js => badges-show.js.es6}    | 10 +---------
 .../javascripts/discourse/routes/exception.js.es6   |  5 +++++
 .../javascripts/discourse/routes/exception_route.js | 13 -------------
 .../{group_index_route.js => group-index.js.es6}    | 10 +---------
 ...{group_members_route.js => group-members.js.es6} | 10 +---------
 .../routes/{group_route.js => group.js.es6}         | 10 +---------
 .../routes/{login_route.js => login.js.es6}         |  4 ++--
 .../routes/{signup_route.js => signup.js.es6}       |  6 +++---
 .../javascripts/discourse/views/badges-show.js.es6  |  8 --------
 10 files changed, 15 insertions(+), 70 deletions(-)
 rename app/assets/javascripts/discourse/routes/{badges_index_route.js => badges-index.js.es6} (69%)
 rename app/assets/javascripts/discourse/routes/{badges_show_route.js => badges-show.js.es6} (80%)
 create mode 100644 app/assets/javascripts/discourse/routes/exception.js.es6
 delete mode 100644 app/assets/javascripts/discourse/routes/exception_route.js
 rename app/assets/javascripts/discourse/routes/{group_index_route.js => group-index.js.es6} (53%)
 rename app/assets/javascripts/discourse/routes/{group_members_route.js => group-members.js.es6} (64%)
 rename app/assets/javascripts/discourse/routes/{group_route.js => group.js.es6} (74%)
 rename app/assets/javascripts/discourse/routes/{login_route.js => login.js.es6} (61%)
 rename app/assets/javascripts/discourse/routes/{signup_route.js => signup.js.es6} (51%)

diff --git a/app/assets/javascripts/discourse/routes/badges_index_route.js b/app/assets/javascripts/discourse/routes/badges-index.js.es6
similarity index 69%
rename from app/assets/javascripts/discourse/routes/badges_index_route.js
rename to app/assets/javascripts/discourse/routes/badges-index.js.es6
index 4c8fc6344d7..48992756b25 100644
--- a/app/assets/javascripts/discourse/routes/badges_index_route.js
+++ b/app/assets/javascripts/discourse/routes/badges-index.js.es6
@@ -1,12 +1,5 @@
-/**
-  Shows a list of all badges.
+export default Discourse.Route.extend({
 
-  @class BadgesIndexRoute
-  @extends Discourse.Route
-  @namespace Discourse
-  @module Discourse
-**/
-Discourse.BadgesIndexRoute = Discourse.Route.extend({
   model: function() {
     if (PreloadStore.get('badges')) {
       return PreloadStore.getAndRemove('badges').then(function(json) {
diff --git a/app/assets/javascripts/discourse/routes/badges_show_route.js b/app/assets/javascripts/discourse/routes/badges-show.js.es6
similarity index 80%
rename from app/assets/javascripts/discourse/routes/badges_show_route.js
rename to app/assets/javascripts/discourse/routes/badges-show.js.es6
index 4da70063b44..e0b817a5e50 100644
--- a/app/assets/javascripts/discourse/routes/badges_show_route.js
+++ b/app/assets/javascripts/discourse/routes/badges-show.js.es6
@@ -1,12 +1,4 @@
-/**
-  Shows a particular badge.
-
-  @class BadgesShowRoute
-  @extends Discourse.Route
-  @namespace Discourse
-  @module Discourse
-**/
-Discourse.BadgesShowRoute = Ember.Route.extend({
+export default Ember.Route.extend({
   serialize: function(model) {
     return {id: model.get('id'), slug: model.get('name').replace(/[^A-Za-z0-9_]+/g, '-').toLowerCase()};
   },
diff --git a/app/assets/javascripts/discourse/routes/exception.js.es6 b/app/assets/javascripts/discourse/routes/exception.js.es6
new file mode 100644
index 00000000000..26152e058b5
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/exception.js.es6
@@ -0,0 +1,5 @@
+export default Discourse.Route.extend({
+  serialize: function() {
+    return "";
+  }
+});
diff --git a/app/assets/javascripts/discourse/routes/exception_route.js b/app/assets/javascripts/discourse/routes/exception_route.js
deleted file mode 100644
index 8640600e07d..00000000000
--- a/app/assets/javascripts/discourse/routes/exception_route.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
-  Client-side pseudo-route for showing an error page.
-
-  @class ExceptionRoute
-  @extends Discourse.Route
-  @namespace Discourse
-  @module Discourse
-**/
-Discourse.ExceptionRoute = Discourse.Route.extend({
-  serialize: function() {
-    return "";
-  }
-});
diff --git a/app/assets/javascripts/discourse/routes/group_index_route.js b/app/assets/javascripts/discourse/routes/group-index.js.es6
similarity index 53%
rename from app/assets/javascripts/discourse/routes/group_index_route.js
rename to app/assets/javascripts/discourse/routes/group-index.js.es6
index 3976e0e9ddb..a3a19968c1a 100644
--- a/app/assets/javascripts/discourse/routes/group_index_route.js
+++ b/app/assets/javascripts/discourse/routes/group-index.js.es6
@@ -1,12 +1,4 @@
-/**
-  The route for the index of a Group
-
-  @class GroupIndexRoute
-  @extends Discourse.Route
-  @namespace Discourse
-  @module Discourse
-**/
-Discourse.GroupIndexRoute = Discourse.Route.extend({
+export default Discourse.Route.extend({
   model: function() {
     return this.modelFor('group').findPosts();
   },
diff --git a/app/assets/javascripts/discourse/routes/group_members_route.js b/app/assets/javascripts/discourse/routes/group-members.js.es6
similarity index 64%
rename from app/assets/javascripts/discourse/routes/group_members_route.js
rename to app/assets/javascripts/discourse/routes/group-members.js.es6
index 4cea70c09ce..93d12740127 100644
--- a/app/assets/javascripts/discourse/routes/group_members_route.js
+++ b/app/assets/javascripts/discourse/routes/group-members.js.es6
@@ -1,12 +1,4 @@
-/**
-  Set things up to display the members of a group
-
-  @class GroupMembersRoute
-  @extends Discourse.Route
-  @namespace Discourse
-  @module Discourse
-**/
-Discourse.GroupMembersRoute = Discourse.Route.extend({
+export default Discourse.Route.extend({
   model: function() {
     return this.modelFor('group');
   },
diff --git a/app/assets/javascripts/discourse/routes/group_route.js b/app/assets/javascripts/discourse/routes/group.js.es6
similarity index 74%
rename from app/assets/javascripts/discourse/routes/group_route.js
rename to app/assets/javascripts/discourse/routes/group.js.es6
index 971c2fe7940..a33a4f63760 100644
--- a/app/assets/javascripts/discourse/routes/group_route.js
+++ b/app/assets/javascripts/discourse/routes/group.js.es6
@@ -1,12 +1,4 @@
-/**
-  The base route for a group
-
-  @class GroupRoute
-  @extends Discourse.Route
-  @namespace Discourse
-  @module Discourse
-**/
-Discourse.GroupRoute = Discourse.Route.extend({
+export default Discourse.Route.extend({
 
   model: function(params) {
     return Discourse.Group.find(params.name);
diff --git a/app/assets/javascripts/discourse/routes/login_route.js b/app/assets/javascripts/discourse/routes/login.js.es6
similarity index 61%
rename from app/assets/javascripts/discourse/routes/login_route.js
rename to app/assets/javascripts/discourse/routes/login.js.es6
index 074efb3803e..7e68316ef82 100644
--- a/app/assets/javascripts/discourse/routes/login_route.js
+++ b/app/assets/javascripts/discourse/routes/login.js.es6
@@ -1,7 +1,7 @@
-Discourse.LoginRoute = Discourse.Route.extend({
+export default Discourse.Route.extend({
   beforeModel: function() {
     if (!Discourse.SiteSetting.login_required) {
-      this.transitionTo('discovery.latest').then(function(e) {
+      this.replaceWith('discovery.latest').then(function(e) {
         Ember.run.next(function() {
           e.send('showLogin');
         });
diff --git a/app/assets/javascripts/discourse/routes/signup_route.js b/app/assets/javascripts/discourse/routes/signup.js.es6
similarity index 51%
rename from app/assets/javascripts/discourse/routes/signup_route.js
rename to app/assets/javascripts/discourse/routes/signup.js.es6
index e6a1b77a0fc..54e35374d85 100644
--- a/app/assets/javascripts/discourse/routes/signup_route.js
+++ b/app/assets/javascripts/discourse/routes/signup.js.es6
@@ -1,9 +1,9 @@
-Discourse.SignupRoute = Discourse.Route.extend({
+export default Discourse.Route.extend({
   beforeModel: function() {
-    this.transitionTo('discovery.latest').then(function(e) {
+    this.replaceWith('discovery.latest').then(function(e) {
       Ember.run.next(function() {
         e.send('showCreateAccount');
       });
     });
-  }
+  },
 });
diff --git a/app/assets/javascripts/discourse/views/badges-show.js.es6 b/app/assets/javascripts/discourse/views/badges-show.js.es6
index b26d1e8932d..62790685863 100644
--- a/app/assets/javascripts/discourse/views/badges-show.js.es6
+++ b/app/assets/javascripts/discourse/views/badges-show.js.es6
@@ -1,11 +1,3 @@
-/**
-  View for showing a particular badge.
-
-  @class BadgesShowView
-  @extends Discourse.View
-  @namespace Discourse
-  @module Discourse
-**/
 export default Discourse.View.extend(Discourse.LoadMore, {
   eyelineSelector: '.badge-user',
   tickOrX: function(field){