mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-30 21:20:24 +02:00
Code Issues Releases Wiki Activity

Use component prototypes instead of instances

Browse Source 
This means the component instance is created in the template, meaning
properties can be overridden in the view helper. It also just makes
more sense - a view instance doesn’t need to exist until it is rendered
in the template.
This commit is contained in:
Toby Zerner
2015-02-26 09:43:53 +10:30
parent 12c4b60730
commit 8683025ef6
14 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ember/app/components/composer/composer-discussion.js
View File

@@ -16,7 +16,7 @@ export default ComposerBody.extend({
title: '',
populateControls: function(items) {
var title = Ember.Component.create({
var title = Ember.Component.extend({
tagName: 'h3',
layout: precompileTemplate('{{ui/text-input value=component.title class="form-control" placeholder=component.titlePlaceholder disabled=component.disabled autoGrow=true}}'),
component: this

2
ember/app/components/composer/composer-edit.js
View File

@@ -15,7 +15,7 @@ export default ComposerBody.extend({
originalContent: Ember.computed.oneWay('post.content'),
populateControls: function(controls) {
var title = Ember.Component.create({
var title = Ember.Component.extend({
tagName: 'h3',
layout: precompileTemplate('Editing Post #{{component.post.number}} in <em>{{discussion.title}}</em>'),
discussion: this.get('post.discussion'),

2
ember/app/components/composer/composer-reply.js
View File

@@ -12,7 +12,7 @@ export default ComposerBody.extend({
submitLabel: 'Post Reply',
populateControls: function(items) {
var title = Ember.Component.create({
var title = Ember.Component.extend({
tagName: 'h3',
layout: precompileTemplate('Replying to <em>{{component.discussion.title}}</em>'),
component: this

8
ember/app/components/discussion/post-comment.js
View File

@@ -49,10 +49,10 @@ export default Ember.Component.extend(FadeIn, HasItemLists, UseComposer, {
populateHeader: function(items) {
var properties = this.getProperties('post');
items.pushObjectWithTag(PostHeaderUser.create(properties), 'user');
items.pushObjectWithTag(PostHeaderMeta.create(properties), 'meta');
items.pushObjectWithTag(PostHeaderEdited.create(properties), 'edited');
items.pushObjectWithTag(PostHeaderToggle.create(properties, {parent: this}), 'toggle');
items.pushObjectWithTag(PostHeaderUser.extend(properties), 'user');
items.pushObjectWithTag(PostHeaderMeta.extend(properties), 'meta');
items.pushObjectWithTag(PostHeaderEdited.extend(properties), 'edited');
items.pushObjectWithTag(PostHeaderToggle.extend(properties, {parent: this}), 'toggle');
},
savePost: function(post, data) {

3
ember/app/components/index/discussion-listing.js
View File

@@ -64,7 +64,8 @@ export default Ember.Component.extend(FadeIn, HasItemLists, {
layoutName: 'components/index/discussion-info/terminal-post',
discussion: Ember.computed.alias('parent.discussion'),
displayLastPost: Ember.computed.alias('parent.displayLastPost'),
}).create({parent: this}), 'terminalPost');
parent: this
}), 'terminalPost');
},
actions: {

2
ember/app/components/ui/item-list.js
View File

@@ -14,7 +14,7 @@ export default Ember.Component.extend({
return [];
}
items.forEach(function(item) {
item.set('isListItem', item.get('tagName') === 'li');
item.reopenClass({isListItem: item.proto().tagName === 'li'});
});
return items;
})

2
ember/app/components/ui/text-editor.js
View File

@@ -22,7 +22,7 @@ export default Ember.Component.extend(HasItemLists, {
},
populateControls: function(items) {
this.addActionItem(items, 'submit', this.get('submitLabel')).set('className', 'btn btn-primary');
this.addActionItem(items, 'submit', this.get('submitLabel')).reopen({className: 'btn btn-primary'});
},
actions: {