Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Correct the app-events service injections (#21413)

This commit is contained in:
Jarek Radosz 2023-05-08 10:48:56 +02:00 committed by GitHub
parent e4b68dab5c
commit fdf38335ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/models/rest.js
View File

@ -113,7 +113,7 @@ RestModel.reopenClass({
args.siteSettings = owner.lookup("service:site-settings"); args.siteSettings = owner.lookup("service:site-settings");
} }
if (!args.appEvents) { if (!args.appEvents) {
args.appEvents = owner.lookup("service:appEvents"); args.appEvents = owner.lookup("service:app-events");
} }
args.__munge = this.munge; args.__munge = this.munge;

2
app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
View File

@ -326,7 +326,7 @@ export function acceptance(name, optionsOrCallback) {
updateCurrentUser(userChanges); updateCurrentUser(userChanges);
} }
User.current().appEvents = getOwner(this).lookup("service:appEvents"); User.current().appEvents = getOwner(this).lookup("service:app-events");
User.current().trackStatus(); User.current().trackStatus();
} }

2
plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js
View File

@ -19,7 +19,7 @@ export default {
initialize(container) { initialize(container) {
this.chatService = container.lookup("service:chat"); this.chatService = container.lookup("service:chat");
this.siteSettings = container.lookup("service:site-settings"); this.siteSettings = container.lookup("service:site-settings");
this.appEvents = container.lookup("service:appEvents"); this.appEvents = container.lookup("service:app-events");
this.appEvents.on("discourse:focus-changed", this, "_handleFocusChanged"); this.appEvents.on("discourse:focus-changed", this, "_handleFocusChanged");
if (!this.chatService.userCanChat) { if (!this.chatService.userCanChat) {

4
plugins/chat/test/javascripts/components/chat-composer-uploads-test.js
View File

@ -66,7 +66,7 @@ module("Discourse Chat | Component | chat-composer-uploads", function (hooks) {
`); `);
const done = assert.async(); const done = assert.async();
this.appEvents = this.container.lookup("service:appEvents"); this.appEvents = this.container.lookup("service:app-events");
this.appEvents.on( this.appEvents.on(
"upload-mixin:chat-composer-uploader:upload-success", "upload-mixin:chat-composer-uploader:upload-success",
(fileName, upload) => { (fileName, upload) => {
@ -116,7 +116,7 @@ module("Discourse Chat | Component | chat-composer-uploads", function (hooks) {
const image = createFile("avatar.png"); const image = createFile("avatar.png");
const done = assert.async(); const done = assert.async();
this.appEvents = this.container.lookup("service:appEvents"); this.appEvents = this.container.lookup("service:app-events");
this.appEvents.on( this.appEvents.on(
`upload-mixin:chat-composer-uploader:upload-cancelled`, `upload-mixin:chat-composer-uploader:upload-cancelled`,