diff --git a/client/css/style.css b/client/css/style.css index ca61b039..68f80085 100644 --- a/client/css/style.css +++ b/client/css/style.css @@ -369,12 +369,12 @@ p { .context-menu-action-revoke-mode::before { content: "\f068"; /* http://fontawesome.io/icon/minus/ */ } .context-menu-network::before { content: "\f233"; /* https://fontawesome.com/icons/server?style=solid */ } .context-menu-edit::before { content: "\f303"; /* https://fontawesome.com/icons/pencil-alt?style=solid */ } + .context-menu-clear-favorites::before, .context-menu-clear-history::before { content: "\f1f8"; /* https://fontawesome.com/icons/trash?style=solid */ } .context-menu-mute::before { content: "\f6a9"; /* https://fontawesome.com/v5.15/icons/volume-mute?style=solid */ } .context-menu-favorite::before { content: "\f005"; /* http://fontawesome.io/icon/star/ */ } - .channel-list-item .not-secure-icon::before { content: "\f071"; /* https://fontawesome.com/icons/exclamation-triangle?style=solid */ } @@ -512,7 +512,6 @@ p { color: #2ecc40; } - #chat .msg[data-type="action"] .from::before { content: "\f005"; /* http://fontawesome.io/icon/star/ */ } diff --git a/test/models/chan.js b/test/models/chan.js index c62e87cb..55811790 100644 --- a/test/models/chan.js +++ b/test/models/chan.js @@ -220,7 +220,8 @@ describe("Chan", function () { "topic", "type", "unread", - "users" + "users", + "favorite" ); }); diff --git a/test/models/network.js b/test/models/network.js index 1b5a1ed1..18d46e0a 100644 --- a/test/models/network.js +++ b/test/models/network.js @@ -79,12 +79,17 @@ describe("Network", function () { saslAccount: "testaccount", saslPassword: "testpassword", channels: [ - new Chan({name: "#thelounge", key: "", muted: false}), - new Chan({name: "&foobar", key: "", muted: false}), - new Chan({name: "#secret", key: "foo", muted: false}), - new Chan({name: "&secure", key: "bar", muted: true}), - new Chan({name: "Channel List", type: Chan.Type.SPECIAL}), - new Chan({name: "PrivateChat", type: Chan.Type.QUERY, muted: true}), + new Chan({name: "#thelounge", key: "", muted: false, favorite: true}), + new Chan({name: "&foobar", key: "", muted: false, favorite: false}), + new Chan({name: "#secret", key: "foo", muted: false, favorite: true}), + new Chan({name: "&secure", key: "bar", muted: true, favorite: false}), + new Chan({name: "Channel List", type: Chan.Type.SPECIAL, favorite: false}), + new Chan({ + name: "PrivateChat", + type: Chan.Type.QUERY, + muted: true, + favorite: false, + }), ], }); network.setNick("chillin`"); @@ -113,11 +118,11 @@ describe("Network", function () { proxyPassword: "", proxyUsername: "", channels: [ - {name: "#thelounge", key: "", muted: false}, - {name: "&foobar", key: "", muted: false}, - {name: "#secret", key: "foo", muted: false}, - {name: "&secure", key: "bar", muted: true}, - {name: "PrivateChat", type: "query", muted: true}, + {name: "#thelounge", key: "", muted: false, favorite: true}, + {name: "&foobar", key: "", muted: false, favorite: false}, + {name: "#secret", key: "foo", muted: false, favorite: true}, + {name: "&secure", key: "bar", muted: true, favorite: false}, + {name: "PrivateChat", type: "query", muted: true, favorite: false}, ], ignoreList: [], });