From 1ae6c726dcc5534df15ff024ea78fd3fbfa6b9a1 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 11 Apr 2014 12:51:09 -0400
Subject: [PATCH] Removes duplicate Controller definition

---
 .../javascripts/discourse/controllers/_discovery_controller.js | 3 +++
 .../javascripts/discourse/routes/discovery_route_builders.js   | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/controllers/_discovery_controller.js b/app/assets/javascripts/discourse/controllers/_discovery_controller.js
index fe94813e5..8ecfe16df 100644
--- a/app/assets/javascripts/discourse/controllers/_discovery_controller.js
+++ b/app/assets/javascripts/discourse/controllers/_discovery_controller.js
@@ -7,6 +7,9 @@
   @module Discourse
 **/
 Discourse.DiscoveryController = Discourse.ObjectController.extend({
+  loading: false,
+  loadingSpinner: false,
+  scheduledSpinner: null,
 
   showMoreUrl: function(period) {
     var url = '', category = this.get('category');
diff --git a/app/assets/javascripts/discourse/routes/discovery_route_builders.js b/app/assets/javascripts/discourse/routes/discovery_route_builders.js
index 5bc00c8be..64a8effb0 100644
--- a/app/assets/javascripts/discourse/routes/discovery_route_builders.js
+++ b/app/assets/javascripts/discourse/routes/discovery_route_builders.js
@@ -137,7 +137,6 @@ function buildCategoryRoute(filter, params) {
 
 // Finally, build all the routes with the helpers we created
 Discourse.addInitializer(function() {
-  Discourse.DiscoveryController = Em.Controller.extend({});
   Discourse.DiscoveryCategoryRoute = buildCategoryRoute('latest');
   Discourse.DiscoveryCategoryNoneRoute = buildCategoryRoute('latest', {no_subcategories: true});