diff --git a/app/assets/javascripts/discourse/routes/list_categories_route.js b/app/assets/javascripts/discourse/routes/list_categories_route.js index 93f2d9d1bc9..43b1bfdd881 100644 --- a/app/assets/javascripts/discourse/routes/list_categories_route.js +++ b/app/assets/javascripts/discourse/routes/list_categories_route.js @@ -8,7 +8,7 @@ **/ Discourse.ListCategoriesRoute = Discourse.Route.extend({ - template: function(){ + template: function() { return Discourse.SiteSettings.enable_wide_category_list ? 'listWideCategories' : 'listCategories'; }.property(), @@ -46,7 +46,7 @@ Discourse.ListCategoriesRoute = Discourse.Route.extend({ }); }, - enter: function() { + activate: function() { this.controllerFor('list').setProperties({ filterMode: 'categories', category: null diff --git a/app/assets/javascripts/discourse/templates/list/wide_categories.js.handlebars b/app/assets/javascripts/discourse/templates/list/wide_categories.js.handlebars index 4421fc5b6c9..01169551a9e 100644 --- a/app/assets/javascripts/discourse/templates/list/wide_categories.js.handlebars +++ b/app/assets/javascripts/discourse/templates/list/wide_categories.js.handlebars @@ -14,7 +14,7 @@ - {{#collection contentBinding="model.categories"}} + {{#each model.categories}} {{#if controller.ordering}} @@ -69,7 +69,7 @@ {{/with}} - {{/collection}} + {{/each}} diff --git a/vendor/assets/javascripts/development/ember.js b/vendor/assets/javascripts/development/ember.js index 466487d9c76..ad2f514558e 100755 --- a/vendor/assets/javascripts/development/ember.js +++ b/vendor/assets/javascripts/development/ember.js @@ -1,4 +1,4 @@ - // Version: 1.1.2 + // Version: 1.1.3+pre.5a35fc76 (function() { /*global __fail__*/ @@ -174,7 +174,7 @@ if (!Ember.testing) { })(); - // Version: 1.1.2 + // Version: 1.1.3+pre.5a35fc76 (function() { var define, requireModule; @@ -239,7 +239,7 @@ var define, requireModule; @class Ember @static - @version 1.1.2 + @version 1.1.3+pre.5a35fc76 */ if ('undefined' === typeof Ember) { @@ -266,10 +266,10 @@ Ember.toString = function() { return "Ember"; }; /** @property VERSION @type String - @default '1.1.2' + @default '1.1.3+pre.5a35fc76' @final */ -Ember.VERSION = '1.1.2'; +Ember.VERSION = '1.1.3+pre.5a35fc76'; /** Standard environmental variables. You can define these in a global `ENV` @@ -15587,7 +15587,6 @@ CoreObject.PrototypeMixin = Mixin.create({ ```javascript App.Person = Ember.Object.extend({ init: function() { - this._super(); alert('Name is ' + this.get('name')); } }); @@ -20317,9 +20316,8 @@ Ember.View = Ember.CoreView.extend( /** The name of the template to lookup if no template is provided. - `Ember.View` will look for a template with this name in this view's - `templates` object. By default, this will be a global object - shared in `Ember.TEMPLATES`. + By default `Ember.View` will lookup a template with this name in + `Ember.TEMPLATES` (a shared global object). @property templateName @type String @@ -20330,9 +20328,8 @@ Ember.View = Ember.CoreView.extend( /** The name of the layout to lookup if no layout is provided. - `Ember.View` will look for a template with this name in this view's - `templates` object. By default, this will be a global object - shared in `Ember.TEMPLATES`. + By default `Ember.View` will lookup a template with this name in + `Ember.TEMPLATES` (a shared global object). @property layoutName @type String @@ -20340,15 +20337,6 @@ Ember.View = Ember.CoreView.extend( */ layoutName: null, - /** - The hash in which to look for `templateName`. - - @property templates - @type Ember.Object - @default Ember.TEMPLATES - */ - templates: Ember.TEMPLATES, - /** The template used to render the view. This should be a function that accepts an optional context parameter and returns a string of HTML that @@ -23958,8 +23946,8 @@ if (!Handlebars && typeof require === 'function') { Handlebars = require('handlebars'); } -Ember.assert("Ember Handlebars requires Handlebars version 1.0.0. Include a SCRIPT tag in the HTML HEAD linking to the Handlebars file before you link to Ember.", Handlebars); -Ember.assert("Ember Handlebars requires Handlebars version 1.0.0, COMPILER_REVISION expected: 4, got: " + Handlebars.COMPILER_REVISION + " - Please note: Builds of master may have other COMPILER_REVISION values.", Handlebars.COMPILER_REVISION === 4); +Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1. Include a SCRIPT tag in the HTML HEAD linking to the Handlebars file before you link to Ember.", Handlebars); +Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1, COMPILER_REVISION expected: 4, got: " + Handlebars.COMPILER_REVISION + " - Please note: Builds of master may have other COMPILER_REVISION values.", Handlebars.COMPILER_REVISION === 4); /** Prepares the Handlebars templating library for use inside Ember's view @@ -31238,8 +31226,8 @@ Ember.Route = Ember.Object.extend(Ember.ActionHandler, { deactivate: Ember.K, /** - This hook is executed when the router enters the route for the first time. - It is not executed when the model for the route changes. + This hook is executed when the router enters the route. It is not executed + when the model for the route changes. @method activate */ diff --git a/vendor/assets/javascripts/production/ember.js b/vendor/assets/javascripts/production/ember.js index de9392edf35..b216f91ec0b 100644 --- a/vendor/assets/javascripts/production/ember.js +++ b/vendor/assets/javascripts/production/ember.js @@ -61,7 +61,7 @@ var define, requireModule; @class Ember @static - @version 1.1.2 + @version 1.1.3+pre.5a35fc76 */ if ('undefined' === typeof Ember) { @@ -88,10 +88,10 @@ Ember.toString = function() { return "Ember"; }; /** @property VERSION @type String - @default '1.1.2' + @default '1.1.3+pre.5a35fc76' @final */ -Ember.VERSION = '1.1.2'; +Ember.VERSION = '1.1.3+pre.5a35fc76'; /** Standard environmental variables. You can define these in a global `ENV` @@ -15401,7 +15401,6 @@ CoreObject.PrototypeMixin = Mixin.create({ ```javascript App.Person = Ember.Object.extend({ init: function() { - this._super(); alert('Name is ' + this.get('name')); } }); @@ -20124,9 +20123,8 @@ Ember.View = Ember.CoreView.extend( /** The name of the template to lookup if no template is provided. - `Ember.View` will look for a template with this name in this view's - `templates` object. By default, this will be a global object - shared in `Ember.TEMPLATES`. + By default `Ember.View` will lookup a template with this name in + `Ember.TEMPLATES` (a shared global object). @property templateName @type String @@ -20137,9 +20135,8 @@ Ember.View = Ember.CoreView.extend( /** The name of the layout to lookup if no layout is provided. - `Ember.View` will look for a template with this name in this view's - `templates` object. By default, this will be a global object - shared in `Ember.TEMPLATES`. + By default `Ember.View` will lookup a template with this name in + `Ember.TEMPLATES` (a shared global object). @property layoutName @type String @@ -20147,15 +20144,6 @@ Ember.View = Ember.CoreView.extend( */ layoutName: null, - /** - The hash in which to look for `templateName`. - - @property templates - @type Ember.Object - @default Ember.TEMPLATES - */ - templates: Ember.TEMPLATES, - /** The template used to render the view. This should be a function that accepts an optional context parameter and returns a string of HTML that @@ -31024,8 +31012,8 @@ Ember.Route = Ember.Object.extend(Ember.ActionHandler, { deactivate: Ember.K, /** - This hook is executed when the router enters the route for the first time. - It is not executed when the model for the route changes. + This hook is executed when the router enters the route. It is not executed + when the model for the route changes. @method activate */