IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: correctly rename scroller everywhere (#26783)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2024-04-29 08:45:37 +02:00 committed by GitHub
parent 94fe31e5b3
commit c1c823144b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs
View File

@ -747,6 +747,7 @@ export default class ChatChannel extends Component {
@channel={{@channel}} @channel={{@channel}}
@uploadDropZone={{this.uploadDropZone}} @uploadDropZone={{this.uploadDropZone}}
@onSendMessage={{this.onSendMessage}} @onSendMessage={{this.onSendMessage}}
@scroller={{this.scroller}}
/> />
{{/if}} {{/if}}
{{/if}} {{/if}}

2
plugins/chat/assets/javascripts/discourse/components/chat-composer.js
View File

@ -145,7 +145,7 @@ export default class ChatComposer extends Component {
@action @action
setup() { setup() {
this.composer.scrollable = this.args.scrollable; this.composer.scroller = this.args.scroller;
this.appEvents.on("chat:modify-selection", this, "modifySelection"); this.appEvents.on("chat:modify-selection", this, "modifySelection");
this.appEvents.on( this.appEvents.on(
"chat:open-insert-link-modal", "chat:open-insert-link-modal",

1
plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs
View File

@ -578,6 +578,7 @@ export default class ChatThread extends Component {
@thread={{@thread}} @thread={{@thread}}
@onSendMessage={{this.onSendMessage}} @onSendMessage={{this.onSendMessage}}
@uploadDropZone={{this.uploadDropZone}} @uploadDropZone={{this.uploadDropZone}}
@scroller={{this.scroller}}
/> />
{{/if}} {{/if}}

4
plugins/chat/assets/javascripts/discourse/services/chat-channel-composer.js
View File

@ -16,7 +16,7 @@ export default class ChatChannelComposer extends Service {
@service site; @service site;
@tracked textarea; @tracked textarea;
@tracked scrollable; @tracked scroller;
init() { init() {
super.init(...arguments); super.init(...arguments);
@ -34,7 +34,7 @@ export default class ChatChannelComposer extends Service {
schedule("afterRender", () => { schedule("afterRender", () => {
if (this.capabilities.isIOS && !this.capabilities.isIpadOS) { if (this.capabilities.isIOS && !this.capabilities.isIpadOS) {
disableBodyScroll(this.scrollable, { reverse: true }); disableBodyScroll(this.scroller, { reverse: true });
} }
}); });
} }

4
plugins/chat/assets/javascripts/discourse/services/chat-thread-composer.js
View File

@ -11,7 +11,7 @@ export default class ChatThreadComposer extends Service {
@service site; @service site;
@tracked textarea; @tracked textarea;
@tracked scrollable; @tracked scroller;
init() { init() {
super.init(...arguments); super.init(...arguments);
@ -29,7 +29,7 @@ export default class ChatThreadComposer extends Service {
schedule("afterRender", () => { schedule("afterRender", () => {
if (this.capabilities.isIOS && !this.capabilities.isIpadOS) { if (this.capabilities.isIOS && !this.capabilities.isIpadOS) {
disableBodyScroll(this.scrollable, { reverse: true }); disableBodyScroll(this.scroller, { reverse: true });
} }
}); });
} }