mirror of
https://github.com/discourse/discourse.git
synced 2025-03-26 20:57:23 +08:00
FIX: hidden was defined as static instead of relying on attribute (#10701)
This commit also: - deprecate an old way of using actions for future removal - removes all the hidden/block/... logic, as we just rely on parent being displayed or not
This commit is contained in:
parent
ce686a008f
commit
cc2a306936
app/assets/javascripts/discourse/app
components
templates/composer
@ -1,22 +1,21 @@
|
||||
import deprecated from "discourse-common/lib/deprecated";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import Component from "@ember/component";
|
||||
import { getOwner } from "discourse-common/lib/get-owner";
|
||||
|
||||
export default Component.extend({
|
||||
classNameBindings: [":composer-popup", ":hidden", "message.extraClass"],
|
||||
classNameBindings: [":composer-popup", "message.extraClass"],
|
||||
|
||||
@discourseComputed("message.templateName")
|
||||
layout(templateName) {
|
||||
return getOwner(this).lookup(`template:composer/${templateName}`);
|
||||
},
|
||||
|
||||
didInsertElement() {
|
||||
this._super(...arguments);
|
||||
this.element.style.display = "block";
|
||||
},
|
||||
|
||||
actions: {
|
||||
closeMessage() {
|
||||
deprecated(
|
||||
'You should use `action=(closeMessage message)` instead of `action=(action "closeMessage")`'
|
||||
);
|
||||
this.closeMessage(this.message);
|
||||
},
|
||||
},
|
||||
|
@ -1,3 +1,3 @@
|
||||
<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
|
||||
<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
|
||||
{{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
|
||||
<p>{{html-safe message.body}}</p>
|
||||
|
@ -1,2 +1,2 @@
|
||||
<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
|
||||
<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
|
||||
{{html-safe message.body}}
|
||||
|
@ -1,2 +1,2 @@
|
||||
<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
|
||||
<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
|
||||
{{html-safe message.body}}
|
||||
|
@ -1,4 +1,4 @@
|
||||
<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
|
||||
<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
|
||||
<h3>{{i18n "composer.similar_topics"}}</h3>
|
||||
|
||||
<ul class="topics">
|
||||
|
Loading…
x
Reference in New Issue
Block a user