From f9ca13b33bd22eb504d37bbff5893fa706bab2a1 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 28 May 2014 14:59:41 -0400 Subject: [PATCH] ES6: Migrate a few components over --- ...rm_component.js => auto-close-form.js.es6} | 3 +- ...t_component.js => basic-topic-list.js.es6} | 2 +- ...rumbs_component.js => bread-crumbs.js.es6} | 2 +- ...oup_component.js => category-group.js.es6} | 35 +++++++++---------- ...ome_logo_component.js => home-logo.js.es6} | 3 +- 5 files changed, 21 insertions(+), 24 deletions(-) rename app/assets/javascripts/discourse/components/{auto_close_form_component.js => auto-close-form.js.es6} (93%) rename app/assets/javascripts/discourse/components/{basic_topic_list_component.js => basic-topic-list.js.es6} (93%) rename app/assets/javascripts/discourse/components/{bread_crumbs_component.js => bread-crumbs.js.es6} (95%) rename app/assets/javascripts/discourse/components/{category_group_component.js => category-group.js.es6} (55%) rename app/assets/javascripts/discourse/components/{home_logo_component.js => home-logo.js.es6} (87%) diff --git a/app/assets/javascripts/discourse/components/auto_close_form_component.js b/app/assets/javascripts/discourse/components/auto-close-form.js.es6 similarity index 93% rename from app/assets/javascripts/discourse/components/auto_close_form_component.js rename to app/assets/javascripts/discourse/components/auto-close-form.js.es6 index b760c710930..d63a5cc1630 100644 --- a/app/assets/javascripts/discourse/components/auto_close_form_component.js +++ b/app/assets/javascripts/discourse/components/auto-close-form.js.es6 @@ -1,5 +1,4 @@ -Discourse.AutoCloseFormComponent = Ember.Component.extend({ - +export default Ember.Component.extend({ autoCloseValid: false, label: function() { diff --git a/app/assets/javascripts/discourse/components/basic_topic_list_component.js b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 similarity index 93% rename from app/assets/javascripts/discourse/components/basic_topic_list_component.js rename to app/assets/javascripts/discourse/components/basic-topic-list.js.es6 index 03a7368d4f8..62373cce4db 100644 --- a/app/assets/javascripts/discourse/components/basic_topic_list_component.js +++ b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 @@ -6,7 +6,7 @@ @namespace Discourse @module Discourse **/ -Discourse.BasicTopicListComponent = Ember.Component.extend({ +export default Ember.Component.extend({ loaded: function() { var topicList = this.get('topicList'); diff --git a/app/assets/javascripts/discourse/components/bread_crumbs_component.js b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 similarity index 95% rename from app/assets/javascripts/discourse/components/bread_crumbs_component.js rename to app/assets/javascripts/discourse/components/bread-crumbs.js.es6 index fe44de26aca..2e59c25a583 100644 --- a/app/assets/javascripts/discourse/components/bread_crumbs_component.js +++ b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 @@ -6,7 +6,7 @@ @namespace Discourse @module Discourse **/ -Discourse.BreadCrumbsComponent = Ember.Component.extend({ +export default Ember.Component.extend({ classNames: ['category-breadcrumb'], tagName: 'ol', parentCategory: Em.computed.alias('category.parentCategory'), diff --git a/app/assets/javascripts/discourse/components/category_group_component.js b/app/assets/javascripts/discourse/components/category-group.js.es6 similarity index 55% rename from app/assets/javascripts/discourse/components/category_group_component.js rename to app/assets/javascripts/discourse/components/category-group.js.es6 index 9fae6cc23eb..2859e3bd0ec 100644 --- a/app/assets/javascripts/discourse/components/category_group_component.js +++ b/app/assets/javascripts/discourse/components/category-group.js.es6 @@ -1,4 +1,19 @@ -Discourse.CategoryGroupComponent = Ember.Component.extend({ +// Compile and memoize a template +var compiled; +function templateFunction() { + compiled = compiled || Handlebars.compile("
" + + "" + + "
"); + return compiled; +} + +export default Ember.Component.extend({ didInsertElement: function(){ var self = this; @@ -22,26 +37,10 @@ Discourse.CategoryGroupComponent = Ember.Component.extend({ }); self.set("categories", categories); }, - template: Discourse.CategoryGroupComponent.templateFunction(), + template: templateFunction(), transformComplete: function(category) { return Discourse.HTML.categoryBadge(category, {allowUncategorized: true}); } }); } - -}); - -Discourse.CategoryGroupComponent.reopenClass({ - templateFunction: function(){ - this.compiled = this.compiled || Handlebars.compile("
" + - "" + - "
"); - return this.compiled; - } }); diff --git a/app/assets/javascripts/discourse/components/home_logo_component.js b/app/assets/javascripts/discourse/components/home-logo.js.es6 similarity index 87% rename from app/assets/javascripts/discourse/components/home_logo_component.js rename to app/assets/javascripts/discourse/components/home-logo.js.es6 index e605a42407f..97fc2cb2e14 100644 --- a/app/assets/javascripts/discourse/components/home_logo_component.js +++ b/app/assets/javascripts/discourse/components/home-logo.js.es6 @@ -1,4 +1,4 @@ -Discourse.HomeLogoComponent = Ember.Component.extend({ +export default Ember.Component.extend({ classNames: ["title"], linkUrl: function() { @@ -12,5 +12,4 @@ Discourse.HomeLogoComponent = Ember.Component.extend({ smallLogoUrl: Discourse.computed.setting('logo_small_url'), bigLogoUrl: Discourse.computed.setting('logo_url'), title: Discourse.computed.setting('title'), - });