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: More controllers

Browse Source
This commit is contained in:
Robin Ward
2014-05-07 11:46:33 -04:00
parent efcf99c21d
commit 804a489c7b
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.jshintignore
View File

@@ -5,6 +5,7 @@ lib/javascripts/locale/
lib/javascripts/messageformat.js lib/javascripts/messageformat.js
lib/javascripts/moment.js lib/javascripts/moment.js
lib/javascripts/moment_locale/ lib/javascripts/moment_locale/
lib/es6_module_transpiler/support/es6-module-transpiler.js
public/javascripts/ public/javascripts/
spec/phantom_js/smoke_test.js spec/phantom_js/smoke_test.js
vendor/ vendor/

2
app/assets/javascripts/discourse/controllers/group_index_controller.js → app/assets/javascripts/discourse/controllers/group/index.js.es6
View File

@@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
Discourse.GroupIndexController = Ember.ArrayController.extend({ export default Ember.ArrayController.extend({
needs: ['group'], needs: ['group'],
loading: false, loading: false,

2
app/assets/javascripts/discourse/controllers/group_post_controller.js → app/assets/javascripts/discourse/controllers/group/post.js.es6
View File

@@ -1,4 +1,4 @@
Discourse.GroupPostController = Em.ObjectController.extend({ export default Em.ObjectController.extend({
byName: function() { byName: function() {
var result = "", var result = "",

2
app/assets/javascripts/discourse/controllers/invite_private_controller.js → app/assets/javascripts/discourse/controllers/invite-private.js.es6
View File

@@ -7,7 +7,7 @@
@uses Discourse.ModalFunctionality @uses Discourse.ModalFunctionality
@module Discourse @module Discourse
**/ **/
Discourse.InvitePrivateController = Discourse.ObjectController.extend(Discourse.ModalFunctionality, { export default Discourse.ObjectController.extend(Discourse.ModalFunctionality, {
modalClass: 'invite', modalClass: 'invite',
onShow: function(){ onShow: function(){

2
app/assets/javascripts/discourse/controllers/invite_controller.js → app/assets/javascripts/discourse/controllers/invite.js.es6
View File

@@ -7,7 +7,7 @@
@uses Discourse.ModalFunctionality @uses Discourse.ModalFunctionality
@module Discourse @module Discourse
**/ **/
Discourse.InviteController = Discourse.ObjectController.extend(Discourse.ModalFunctionality, { export default Discourse.ObjectController.extend(Discourse.ModalFunctionality, {
/** /**
Can we submit the form? Can we submit the form?

3
app/assets/javascripts/discourse/controllers/keyboard_shortcuts_help_controller.js → app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
View File

@@ -7,11 +7,10 @@
@uses Discourse.ModalFunctionality @uses Discourse.ModalFunctionality
@module Discourse @module Discourse
**/ **/
Discourse.KeyboardShortcutsHelpController = Discourse.Controller.extend(Discourse.ModalFunctionality, { export default Discourse.Controller.extend(Discourse.ModalFunctionality, {
needs: ['modal'], needs: ['modal'],
onShow: function() { onShow: function() {
this.set('controllers.modal.modalClass', 'keyboard-shortcuts-modal'); this.set('controllers.modal.modalClass', 'keyboard-shortcuts-modal');
} }
}); });

2
app/assets/javascripts/discourse/templates/group/index.js.handlebars
View File

@@ -1,5 +1,5 @@
<div class='user-stream'> <div class='user-stream'>
{{#each model itemController="groupPost"}} {{#each model itemController="group/post"}}
<div class='item'> <div class='item'>
<div class='clearfix info'> <div class='clearfix info'>
{{#link-to 'user' user class="avatar-link"}}<div class='avatar-wrapper'>{{avatar user imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div>{{/link-to}} {{#link-to 'user' user class="avatar-link"}}<div class='avatar-wrapper'>{{avatar user imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div>{{/link-to}}