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

FIX: Use computed properties instead of manual HTML for buttons

Browse Source 
This way they receive the proper classes
This commit is contained in:
Robin Ward
2017-10-17 11:23:44 -04:00
parent 62b260b3f9
commit 77652f4387
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/assets/javascripts/discourse/controllers/flag.js.es6
View File

@ -1,4 +1,3 @@
import { iconHTML } from 'discourse-common/lib/icon-library';
import ModalFunctionality from 'discourse/mixins/modal-functionality'; import ModalFunctionality from 'discourse/mixins/modal-functionality';
import ActionSummary from 'discourse/models/action-summary'; import ActionSummary from 'discourse/models/action-summary';
import { MAX_MESSAGE_LENGTH } from 'discourse/models/post-action-type'; import { MAX_MESSAGE_LENGTH } from 'discourse/models/post-action-type';
@ -97,13 +96,18 @@ export default Ember.Controller.extend(ModalFunctionality, {
return !flagTopic && !isCustomFlag && this.currentUser.get('staff'); return !flagTopic && !isCustomFlag && this.currentUser.get('staff');
}, },
submitText: function(){ @computed('selected.is_custom_flag')
if (this.get('selected.is_custom_flag')) { submitIcon(isCustomFlag) {
return iconHTML('envelope') + (I18n.t(this.get('flagTopic') ? "flagging_topic.notify_action" : "flagging.notify_action")); return isCustomFlag ? "envelope" : "flag";
} else { },
return iconHTML('flag') + (I18n.t(this.get('flagTopic') ? "flagging_topic.action" : "flagging.action"));
@computed('selected.is_custom_flag', 'flagTopic')
submitLabel(isCustomFlag, flagTopic) {
if (isCustomFlag) {
return flagTopic ? "flagging_topic.notify_action" : "flagging.notify_action";
} }
}.property('selected.is_custom_flag'), return flagTopic ? "flagging_topic.action" : "flagging.action";
},
actions: { actions: {
deleteSpammer() { deleteSpammer() {

3
app/assets/javascripts/discourse/templates/modal/flag.hbs
View File

@ -18,7 +18,8 @@
action=(action "createFlag") action=(action "createFlag")
disabled=submitDisabled disabled=submitDisabled
title="flagging.submit_tooltip" title="flagging.submit_tooltip"
translatedLabel=submitText}} icon=submitIcon
label=submitLabel}}
{{#if canSendWarning}} {{#if canSendWarning}}
{{d-button {{d-button