From 53006d7778acf0b43aa0ce2c59b7b88bc4c765a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Tue, 7 Jan 2014 01:36:30 +0100
Subject: [PATCH] Ember wants a ListTopController, not a TopController

---
 .../{top_controller.js => list_top_controller.js}     |  4 ++--
 .../javascripts/discourse/routes/list_top_route.js    | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)
 rename app/assets/javascripts/discourse/controllers/{top_controller.js => list_top_controller.js} (90%)

diff --git a/app/assets/javascripts/discourse/controllers/top_controller.js b/app/assets/javascripts/discourse/controllers/list_top_controller.js
similarity index 90%
rename from app/assets/javascripts/discourse/controllers/top_controller.js
rename to app/assets/javascripts/discourse/controllers/list_top_controller.js
index cf5240552ee..cc0b6d0a7c5 100644
--- a/app/assets/javascripts/discourse/controllers/top_controller.js
+++ b/app/assets/javascripts/discourse/controllers/list_top_controller.js
@@ -1,12 +1,12 @@
 /**
   Controller of the top page
 
-  @class TopController
+  @class ListTopController
   @extends Discourse.ObjectController
   @namespace Discourse
   @module Discourse
 **/
-Discourse.TopController = Discourse.ObjectController.extend({
+Discourse.ListTopController = Discourse.ObjectController.extend({
 
   redirectedToTopPageReason: function() {
     // no need for a reason if the default homepage is "top"
diff --git a/app/assets/javascripts/discourse/routes/list_top_route.js b/app/assets/javascripts/discourse/routes/list_top_route.js
index ca11d830d23..d6a3fb213bd 100644
--- a/app/assets/javascripts/discourse/routes/list_top_route.js
+++ b/app/assets/javascripts/discourse/routes/list_top_route.js
@@ -1,5 +1,9 @@
 Discourse.ListTopRoute = Discourse.Route.extend({
 
+  model: function() {
+    return Discourse.TopList.find();
+  },
+
   activate: function() {
     this._super();
     // will mark the "top" navigation item as selected
@@ -9,13 +13,6 @@ Discourse.ListTopRoute = Discourse.Route.extend({
     });
   },
 
-  setupController: function() {
-    var topController = this.controllerFor("top");
-    Discourse.TopList.find().then(function (result) {
-      topController.set("model", result);
-    });
-  },
-
   renderTemplate: function() {
     this.render('top', { into: 'list', outlet: 'listView' });
   },