From f90548f88a3fb2b8dc1394f560580c4ff3668f31 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 14 May 2014 11:38:05 -0400 Subject: [PATCH] ES6: Just a few more controllers --- .../{preferences_controller.js => preferences.js.es6} | 2 +- .../badge-title.js.es6} | 2 +- .../email.js.es6} | 2 +- .../username.js.es6} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename app/assets/javascripts/discourse/controllers/{preferences_controller.js => preferences.js.es6} (98%) rename app/assets/javascripts/discourse/controllers/{preferences_badge_title_controller.js => preferences/badge-title.js.es6} (95%) rename app/assets/javascripts/discourse/controllers/{preferences_email_controller.js => preferences/email.js.es6} (92%) rename app/assets/javascripts/discourse/controllers/{preferences_username_controller.js => preferences/username.js.es6} (96%) diff --git a/app/assets/javascripts/discourse/controllers/preferences_controller.js b/app/assets/javascripts/discourse/controllers/preferences.js.es6 similarity index 98% rename from app/assets/javascripts/discourse/controllers/preferences_controller.js rename to app/assets/javascripts/discourse/controllers/preferences.js.es6 index d837e6ac1e7..ae50f06aa7c 100644 --- a/app/assets/javascripts/discourse/controllers/preferences_controller.js +++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6 @@ -6,7 +6,7 @@ @namespace Discourse @module Discourse **/ -Discourse.PreferencesController = Discourse.ObjectController.extend({ +export default Discourse.ObjectController.extend({ allowAvatarUpload: Discourse.computed.setting('allow_uploaded_avatars'), allowUserLocale: Discourse.computed.setting('allow_user_locale'), diff --git a/app/assets/javascripts/discourse/controllers/preferences_badge_title_controller.js b/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6 similarity index 95% rename from app/assets/javascripts/discourse/controllers/preferences_badge_title_controller.js rename to app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6 index a7af81ee4b6..a600b00f03f 100644 --- a/app/assets/javascripts/discourse/controllers/preferences_badge_title_controller.js +++ b/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6 @@ -6,7 +6,7 @@ @namespace Discourse @module Discourse **/ -Discourse.PreferencesBadgeTitleController = Ember.ArrayController.extend({ +export default Ember.ArrayController.extend({ saving: false, saved: false, diff --git a/app/assets/javascripts/discourse/controllers/preferences_email_controller.js b/app/assets/javascripts/discourse/controllers/preferences/email.js.es6 similarity index 92% rename from app/assets/javascripts/discourse/controllers/preferences_email_controller.js rename to app/assets/javascripts/discourse/controllers/preferences/email.js.es6 index 36426f848ad..48c925fb078 100644 --- a/app/assets/javascripts/discourse/controllers/preferences_email_controller.js +++ b/app/assets/javascripts/discourse/controllers/preferences/email.js.es6 @@ -6,7 +6,7 @@ @namespace Discourse @module Discourse **/ -Discourse.PreferencesEmailController = Discourse.ObjectController.extend({ +export default Discourse.ObjectController.extend({ taken: false, saving: false, error: false, diff --git a/app/assets/javascripts/discourse/controllers/preferences_username_controller.js b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 similarity index 96% rename from app/assets/javascripts/discourse/controllers/preferences_username_controller.js rename to app/assets/javascripts/discourse/controllers/preferences/username.js.es6 index d9ae9d74476..e75bd1fde7e 100644 --- a/app/assets/javascripts/discourse/controllers/preferences_username_controller.js +++ b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 @@ -6,7 +6,7 @@ @namespace Discourse @module Discourse **/ -Discourse.PreferencesUsernameController = Discourse.ObjectController.extend({ +export default Discourse.ObjectController.extend({ taken: false, saving: false, error: false,