Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ES6: Most controllers converted over now.

This commit is contained in:
Robin Ward 2014-05-27 10:51:03 -04:00
parent 20c640355d
commit 663c57a0f0
7 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
View File

@ -7,7 +7,7 @@
@module Discourse
**/
export default Em.Controller.extend({
needs: ['topicBulkActions'],
needs: ['topic-bulk-actions'],
notificationLevelId: null,
@ -27,7 +27,7 @@ export default Em.Controller.extend({
actions: {
changeNotificationLevel: function() {
this.get('controllers.topicBulkActions').performAndRefresh({
this.get('controllers.topic-bulk-actions').performAndRefresh({
type: 'change_notification_level',
notification_level_id: this.get('notificationLevelId')
});

3
app/assets/javascripts/discourse/controllers/topic_admin_menu_controller.js → app/assets/javascripts/discourse/controllers/topic-admin-menu.js.es6
View File

@ -6,7 +6,7 @@
@namespace Discourse
@module Discourse
**/
Discourse.TopicAdminMenuController = Discourse.ObjectController.extend({
export default Discourse.ObjectController.extend({
menuVisible: false,
needs: ['modal'],
@ -21,5 +21,4 @@ Discourse.TopicAdminMenuController = Discourse.ObjectController.extend({
},
showRecover: Em.computed.and('deleted', 'details.can_recover')
});

2
app/assets/javascripts/discourse/controllers/topic_bulk_actions_controller.js → app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
View File

@ -7,7 +7,7 @@
@uses Discourse.ModalFunctionality
@module Discourse
**/
Discourse.TopicBulkActionsController = Ember.ArrayController.extend(Discourse.ModalFunctionality, {
export default Ember.ArrayController.extend(Discourse.ModalFunctionality, {
needs: ['discovery/topics'],
onShow: function() {

2
app/assets/javascripts/discourse/controllers/topic_list_item_controller.js → app/assets/javascripts/discourse/controllers/topic-list-item.js.es6
View File

@ -6,7 +6,7 @@
@namespace Discourse
@module Discourse
**/
Discourse.TopicListItemController = Ember.ObjectController.extend({
export default Ember.ObjectController.extend({
needs: ['discovery/topics'],
canStar: Em.computed.alias('controllers.discovery/topics.currentUser.id'),

2
app/assets/javascripts/discourse/controllers/user_controller.js → app/assets/javascripts/discourse/controllers/user.js.es6
View File

@ -6,7 +6,7 @@
@namespace Discourse
@module Discourse
**/
Discourse.UserController = Discourse.ObjectController.extend({
export default Discourse.ObjectController.extend({
viewingSelf: function() {
return this.get('content.username') === Discourse.User.currentProp('username');

2
app/assets/javascripts/discourse/routes/discovery_route.js
View File

@ -53,7 +53,7 @@ Discourse.DiscoveryRoute = Discourse.Route.extend(Discourse.ScrollTop, Discourse
var controllerName = w.replace('modal/', ''),
factory = this.container.lookupFactory('controller:' + controllerName);
this.render(w, {into: 'topicBulkActions', outlet: 'bulkOutlet', controller: factory ? controllerName : 'topicBulkActions'});
this.render(w, {into: 'topicBulkActions', outlet: 'bulkOutlet', controller: factory ? controllerName : 'topic-bulk-actions'});
},
showBulkActions: function() {

2
app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars
View File

@ -62,7 +62,7 @@
{{/if}}
<tbody>
{{each topics itemController="topicListItem" itemViewClass="Discourse.TopicListItemView"}}
{{each topics itemController="topic-list-item" itemViewClass="Discourse.TopicListItemView"}}
</tbody>
</table>