IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

ES6: AvatarSelector and HeaderController - also includes support for controllers with

Browse Source 
camelcase via an error message.
This commit is contained in:
Robin Ward
2014-04-29 21:16:57 -04:00
parent a4e30e8f93
commit eee5f85654
7 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/avatar_selector_controller.js → app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
View File

@@ -7,7 +7,7 @@
@uses Discourse.ModalFunctionality
@module Discourse
**/
Discourse.AvatarSelectorController = Discourse.Controller.extend(Discourse.ModalFunctionality, {
export default Discourse.Controller.extend(Discourse.ModalFunctionality, {
actions: {
useUploadedAvatar: function() { this.set("use_uploaded_avatar", true); },

2
app/assets/javascripts/discourse/controllers/header_controller.js → app/assets/javascripts/discourse/controllers/header.js.es6
View File

@@ -6,7 +6,7 @@
@namespace Discourse
@module Discourse
**/
Discourse.HeaderController = Discourse.Controller.extend({
export default Discourse.Controller.extend({
topic: null,
showExtraInfo: null,
notifications: null,

20
app/assets/javascripts/discourse/ember/resolver.js
View File

@@ -9,11 +9,29 @@
**/
Discourse.Resolver = Ember.DefaultResolver.extend({
/**
For our ES6 modules, Discourse standardizes on dashed, lower case names.
This method converts camelCase to that format.
@method normalizeName
@param {String} name to convert
@returns {String} the converted name
**/
normalizeName: function(name) {
return name.replace(/([a-z])([A-Z])/g, '$1-$2').replace('_', '-').toLowerCase();
},
resolveController: function(parsedName) {
var moduleName = "discourse/controllers/" + parsedName.fullNameWithoutType,
var normalized = this.normalizeName(parsedName.fullNameWithoutType),
moduleName = "discourse/controllers/" + normalized,
module = requirejs.entries[moduleName];
if (module) {
if (normalized !== parsedName.fullNameWithoutType) {
Em.Logger.error(parsedName.fullNameWithoutType + " was used to look up an ES6 module. You should use " + normalized+ " instead.");
}
module = require(moduleName, null, null, true /* force sync */);
if (module && module['default']) { module = module['default']; }
}

9
app/assets/javascripts/discourse/routes/preferences_routes.js
View File

@@ -18,18 +18,17 @@ Discourse.PreferencesRoute = Discourse.RestrictedUserRoute.extend({
actions: {
showAvatarSelector: function() {
Discourse.Route.showModal(this, 'avatarSelector');
Discourse.Route.showModal(this, 'avatar-selector');
// all the properties needed for displaying the avatar selector modal
var avatarSelector = this.modelFor('user').getProperties(
this.controllerFor('avatar-selector').setProperties(this.modelFor('user').getProperties(
'username', 'email',
'has_uploaded_avatar', 'use_uploaded_avatar',
'gravatar_template', 'uploaded_avatar_template');
this.controllerFor('avatarSelector').setProperties(avatarSelector);
'gravatar_template', 'uploaded_avatar_template'));
},
saveAvatarSelection: function() {
var user = this.modelFor('user');
var avatarSelector = this.controllerFor('avatarSelector');
var avatarSelector = this.controllerFor('avatar-selector');
// sends the information to the server if it has changed
if (avatarSelector.get('use_uploaded_avatar') !== user.get('use_uploaded_avatar')) {
user.toggleAvatarSelection(avatarSelector.get('use_uploaded_avatar'));