minor visual fixes for deleted topics

This commit is contained in:
or-else
2022-05-23 15:47:34 -07:00
parent 46b6a816eb
commit a9677cee8b
8 changed files with 18 additions and 8 deletions
+1 -2
View File
@@ -1121,7 +1121,6 @@ img.channel {
right: 0; right: 0;
bottom: 0; bottom: 0;
background-color: white; background-color: white;
padding-left: 0.5px;
} }
/* END of avatar box */ /* END of avatar box */
@@ -2324,7 +2323,7 @@ ul.tabbar li.active > a {
white-space: nowrap; white-space: nowrap;
font-size: 90%; font-size: 90%;
max-width: 12rem; max-width: 12rem;
overflow-x: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
+1 -1
View File
File diff suppressed because one or more lines are too long
+6
View File
@@ -1488,6 +1488,12 @@ class TinodeWeb extends React.Component {
defaultTopicContextMenu(topicName) { defaultTopicContextMenu(topicName) {
const topic = this.tinode.getTopic(topicName); const topic = this.tinode.getTopic(topicName);
if (topic._deleted) {
return [
'topic_delete'
];
}
let muted = false, blocked = false, self_blocked = false, subscribed = false, deleter = false, archived = false; let muted = false, blocked = false, self_blocked = false, subscribed = false, deleter = false, archived = false;
if (topic) { if (topic) {
subscribed = topic.isSubscribed(); subscribed = topic.isSubscribed();
+1 -1
View File
@@ -109,12 +109,12 @@ class ContactList extends React.Component {
selected={selected} selected={selected}
showOnline={this.props.showOnline && !isChannel} showOnline={this.props.showOnline && !isChannel}
isChannel={isChannel} isChannel={isChannel}
onSelected={this.props.onTopicSelected}
showContextMenu={this.props.showContextMenu} showContextMenu={this.props.showContextMenu}
isVerified={c.trusted && c.trusted.verified} isVerified={c.trusted && c.trusted.verified}
isStaff={c.trusted && c.trusted.staff} isStaff={c.trusted && c.trusted.staff}
isDangerous={c.trusted && c.trusted.danger} isDangerous={c.trusted && c.trusted.danger}
deleted={c._deleted} deleted={c._deleted}
onSelected={this.props.onTopicSelected}
item={key} item={key}
index={contactNodes.length} index={contactNodes.length}
key={key} /> key={key} />
+6 -1
View File
@@ -8994,6 +8994,11 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
defaultTopicContextMenu(topicName) { defaultTopicContextMenu(topicName) {
const topic = this.tinode.getTopic(topicName); const topic = this.tinode.getTopic(topicName);
if (topic._deleted) {
return ['topic_delete'];
}
let muted = false, let muted = false,
blocked = false, blocked = false,
self_blocked = false, self_blocked = false,
@@ -11321,12 +11326,12 @@ class ContactList extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
selected: selected, selected: selected,
showOnline: this.props.showOnline && !isChannel, showOnline: this.props.showOnline && !isChannel,
isChannel: isChannel, isChannel: isChannel,
onSelected: this.props.onTopicSelected,
showContextMenu: this.props.showContextMenu, showContextMenu: this.props.showContextMenu,
isVerified: c.trusted && c.trusted.verified, isVerified: c.trusted && c.trusted.verified,
isStaff: c.trusted && c.trusted.staff, isStaff: c.trusted && c.trusted.staff,
isDangerous: c.trusted && c.trusted.danger, isDangerous: c.trusted && c.trusted.danger,
deleted: c._deleted, deleted: c._deleted,
onSelected: this.props.onTopicSelected,
item: key, item: key,
index: contactNodes.length, index: contactNodes.length,
key: key key: key
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long