codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 15:48:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removes duplicate Controller definition

Browse source
This commit is contained in:
Robin Ward 2014-04-11 12:51:09 -04:00
parent 0b42228663
commit 1ae6c726dc
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/discourse/controllers/_discovery_controller.js
View file

@ -7,6 +7,9 @@
@module Discourse @module Discourse
**/ **/
Discourse.DiscoveryController = Discourse.ObjectController.extend({ Discourse.DiscoveryController = Discourse.ObjectController.extend({
loading: false,
loadingSpinner: false,
scheduledSpinner: null,
showMoreUrl: function(period) { showMoreUrl: function(period) {
var url = '', category = this.get('category'); var url = '', category = this.get('category');

1
app/assets/javascripts/discourse/routes/discovery_route_builders.js
View file

@ -137,7 +137,6 @@ function buildCategoryRoute(filter, params) {
// Finally, build all the routes with the helpers we created // Finally, build all the routes with the helpers we created
Discourse.addInitializer(function() { Discourse.addInitializer(function() {
Discourse.DiscoveryController = Em.Controller.extend({});
Discourse.DiscoveryCategoryRoute = buildCategoryRoute('latest'); Discourse.DiscoveryCategoryRoute = buildCategoryRoute('latest');
Discourse.DiscoveryCategoryNoneRoute = buildCategoryRoute('latest', {no_subcategories: true}); Discourse.DiscoveryCategoryNoneRoute = buildCategoryRoute('latest', {no_subcategories: true});