Skip to content

Commit 4c4401b

Browse files
authored
FIX: various fixes to chat styleguide (discourse#21617)
- uses current user as user for fabricators, allows for correct avatar image and presence indicator - uses a non existing channel ID to avoid setting a draft of an existing channel - attempts to make color toggle more reliable
1 parent 515529c commit 4c4401b

File tree

5 files changed

+26
-5
lines changed

5 files changed

+26
-5
lines changed

plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ export default class ChatStyleguideChatComposerMessageDetails extends Component
88
@service site;
99
@service session;
1010
@service keyValueStore;
11+
@service currentUser;
1112

1213
@cached
1314
get message() {
14-
return fabricators.message();
15+
return fabricators.message({ user: this.currentUser });
1516
}
1617

1718
@action

plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default class ChatStyleguideChatComposer extends Component {
88
@service chatChannelComposer;
99
@service chatChannelPane;
1010

11-
channel = fabricators.channel();
11+
channel = fabricators.channel({ id: -999 });
1212

1313
@action
1414
toggleDisabled() {

plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@ import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
33
import { action } from "@ember/object";
44
import ChatMessagesManager from "discourse/plugins/chat/discourse/lib/chat-messages-manager";
55
import { getOwner } from "discourse-common/lib/get-owner";
6+
import { inject as service } from "@ember/service";
67

78
export default class ChatStyleguideChatMessage extends Component {
9+
@service currentUser;
10+
811
manager = new ChatMessagesManager(getOwner(this));
912

10-
message = fabricators.message();
13+
message = fabricators.message({ user: this.currentUser });
1114

1215
@action
1316
toggleDeleted() {
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import Component from "@glimmer/component";
22
import fabricators from "discourse/plugins/chat/discourse/lib/fabricators";
3+
import { inject as service } from "@ember/service";
34

45
export default class ChatStyleguideChatThreadOriginalMessage extends Component {
5-
message = fabricators.message();
6+
@service currentUser;
7+
8+
message = fabricators.message({ user: this.currentUser });
69
}

plugins/styleguide/assets/javascripts/discourse/components/toggle-color-mode.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,33 @@ function colorSchemeOverride(type) {
1010
const lightScheme = document.querySelector("link.light-scheme");
1111
const darkScheme = document.querySelector("link.dark-scheme");
1212

13-
if (!lightScheme || !darkScheme) {
13+
if (!lightScheme && !darkScheme) {
1414
return;
1515
}
1616

1717
switch (type) {
1818
case DARK:
19+
lightScheme.origMedia = lightScheme.media;
1920
lightScheme.media = "none";
21+
darkScheme.origMedia = darkScheme.media;
2022
darkScheme.media = "all";
2123
break;
2224
case LIGHT:
25+
lightScheme.origMedia = lightScheme.media;
2326
lightScheme.media = "all";
27+
darkScheme.origMedia = darkScheme.media;
2428
darkScheme.media = "none";
2529
break;
30+
default:
31+
if (lightScheme.origMedia) {
32+
lightScheme.media = lightScheme.origMedia;
33+
lightScheme.removeAttribute("origMedia");
34+
}
35+
if (darkScheme.origMedia) {
36+
darkScheme.media = darkScheme.origMedia;
37+
darkScheme.removeAttribute("origMedia");
38+
}
39+
break;
2640
}
2741
}
2842

0 commit comments

Comments
 (0)