github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-23 22:01:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ES6: More views converted and deprecated

Browse Source
This commit is contained in:
Robin Ward
2014-06-12 11:13:05 -04:00
parent 39ab0ed0af
commit 61bba4d074
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/initializers/deprecations.js.es6
View File

@ -4,7 +4,8 @@ var deprecatedViewHelpers = {
textField: 'text-field', textField: 'text-field',
userSelector: 'user-selector', userSelector: 'user-selector',
combobox: 'combo-box', combobox: 'combo-box',
categoryChooser: 'category-chooser' categoryChooser: 'category-chooser',
chooseTopic: 'choose-topic'
}; };
export default { export default {

3
app/assets/javascripts/discourse/initializers/view-helpers.js.es6
View File

@ -3,7 +3,8 @@ var helpers = ['input-tip',
'text-field', 'text-field',
'user-selector', 'user-selector',
'category-chooser', 'category-chooser',
'combo-box']; 'combo-box',
'choose-topic'];
/** /**
Creates view helpers for some views. Many of these should probably be converted Creates view helpers for some views. Many of these should probably be converted

2
app/assets/javascripts/discourse/templates/modal/merge_topic.js.handlebars
View File

@ -8,7 +8,7 @@
<p>{{{i18n topic.merge_topic.instructions count="selectedPostsCount"}}}</p> <p>{{{i18n topic.merge_topic.instructions count="selectedPostsCount"}}}</p>
<form> <form>
{{chooseTopic selectedTopicId=selectedTopicId}} {{choose-topic selectedTopicId=selectedTopicId}}
</form> </form>
</div> </div>

5
app/assets/javascripts/discourse/views/choose_topic_view.js → app/assets/javascripts/discourse/views/choose-topic.js.es6
View File

@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
Discourse.ChooseTopicView = Discourse.View.extend({ export default Discourse.View.extend({
templateName: 'choose_topic', templateName: 'choose_topic',
topicTitleChanged: function() { topicTitleChanged: function() {
@ -53,6 +53,3 @@ Discourse.ChooseTopicView = Discourse.View.extend({
} }
}); });
Discourse.View.registerHelper('chooseTopic', Discourse.ChooseTopicView);

2
app/assets/javascripts/discourse/views/discovery_topics_view.js → app/assets/javascripts/discourse/views/discovery-topics.js.es6
View File

@ -7,7 +7,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
Discourse.DiscoveryTopicsView = Discourse.View.extend(Discourse.LoadMore, { export default Discourse.View.extend(Discourse.LoadMore, {
eyelineSelector: '.topic-list-item', eyelineSelector: '.topic-list-item',
actions: { actions: {