FIX: properly check key values for shortcuts
This commit is contained in:
parent
a655a009fa
commit
1f89b68e0f
|
|
@ -11,7 +11,7 @@
|
|||
@valueProperty="value"
|
||||
@value={{assignableLevel}}
|
||||
@content={{assignableLevelOptions}}
|
||||
@class="groups-form-assignable-level"
|
||||
class="groups-form-assignable-level"
|
||||
@onChange={{action (mut model.assignable_level)}}
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -72,8 +72,8 @@ export default Controller.extend(ModalFunctionality, {
|
|||
},
|
||||
|
||||
@action
|
||||
handleTextAreaKeydown(value, event) {
|
||||
if ((event.ctrlKey || event.metaKey) && event.key === "Enter") {
|
||||
handleTextAreaKeydown(value) {
|
||||
if ((value.ctrlKey || value.metaKey) && value.key === "Enter") {
|
||||
this.assign();
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div class="controls controls-dropdown">
|
||||
<label>{{i18n "discourse_assign.reminders_frequency.description"}}</label>
|
||||
<ComboBox
|
||||
@id="remind-assigns-frequency"
|
||||
id="remind-assigns-frequency"
|
||||
@valueProperty="value"
|
||||
@content={{availableFrequencies}}
|
||||
@value={{selectedFrequency}}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<DModalBody @class="assign">
|
||||
<DModalBody class="assign">
|
||||
<div>
|
||||
<div class="control-group {{if this.assigneeError 'assignee-error'}}">
|
||||
<label>{{i18n "discourse_assign.assign_modal.assignee_label"}}</label>
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
<div class="control-group assign-status">
|
||||
<label>{{i18n "discourse_assign.assign_modal.status_label"}}</label>
|
||||
<ComboBox
|
||||
@id="assign-status"
|
||||
id="assign-status"
|
||||
@content={{availableStatuses}}
|
||||
@value={{status}}
|
||||
@onChange={{action (mut model.status)}}
|
||||
|
|
@ -60,16 +60,16 @@
|
|||
</DModalBody>
|
||||
|
||||
<div class="modal-footer">
|
||||
{{d-button
|
||||
label=(if
|
||||
<DButton
|
||||
@label={{(if
|
||||
model.reassign
|
||||
"discourse_assign.reassign.title"
|
||||
"discourse_assign.assign_modal.assign"
|
||||
)
|
||||
icon=inviteIcon
|
||||
action=(action "assign")
|
||||
)}}
|
||||
@icon={{inviteIcon}}
|
||||
@action={{(action "assign")}}
|
||||
class="btn-primary"
|
||||
disabled=disabled
|
||||
}}
|
||||
@disabled={{disabled}}
|
||||
/>
|
||||
<DModalCancel @close={{route-action "closeModal"}} />
|
||||
</div>
|
||||
Loading…
Reference in New Issue