TeaSpeak/TeaWeb
TeaSpeak/TeaWeb
1
0
Fork 0
Code Issues 1 Pull requests Activity

Improved MSEdge experience by adding SimpleBar

Browse source
This commit is contained in:
WolverinDEV 2019-12-21 21:50:59 +01:00
parent 0cbd4b5fac
commit a2951a3f50
No known key found for this signature in database
GPG key ID: 77A6C15085150EEB
7 changed files with 156 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
shared/css/static/frame-chat.scss
View file

@ -401,10 +401,14 @@ $client_info_avatar_size: 10em;
flex-shrink: 1;
}
.messages {
.container-messages {
@include user-select(none);
display: block;
&[data-simplebar] {
display: flex;
}
position: relative;
flex-grow: 0;
@ -566,6 +570,7 @@ $client_info_avatar_size: 10em;
flex-grow: 1;
flex-shrink: 0;
min-height: calc(1.5em + 10px);
height: auto; /* fallback */
height: min-content;
display: flex;
@ -733,6 +738,7 @@ $client_info_avatar_size: 10em;
justify-content: stretch;
position: relative;
overflow: hidden;
flex-grow: 1;
flex-shrink: 1;
@ -756,11 +762,15 @@ $client_info_avatar_size: 10em;
flex-shrink: 1;
display: block;
&[data-simplebar] {
display: flex;
}
position: relative;
overflow-y: auto;
overflow-x: hidden;
@include chat-scrollbar();
min-height: 2em;
@ -906,7 +916,6 @@ $client_info_avatar_size: 10em;
}
}
@include chat-scrollbar();
}
.new-message {

47
shared/css/static/mixin.scss
View file

@ -67,32 +67,15 @@
}
@mixin chat-scrollbar() {
& {
/* for moz */
scrollbar-color: #353535 #555;
}
&::-webkit-scrollbar-track {
//-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
border-radius: .25em;
background-color: transparent;
}
&::-webkit-scrollbar {
width: .5em;
background-color: transparent;
}
&::-webkit-scrollbar-thumb {
border-radius: .25em;
//-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
background-color: #555;
}
//We've currently no difference
@include chat-scrollbar-vertical();
//@include chat-scrollbar-horizontal();
}
@mixin chat-scrollbar-vertical() {
/*
& {
/* for moz */
// for moz
scrollbar-color: #353535 #555;
scrollbarWidth: .5em;
}
@ -115,11 +98,28 @@
//-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
background-color: #555;
}
*/
& > .simplebar-track {
.simplebar-scrollbar {
&:before {
background: #555;
width: .5em;
left: unset;
right: unset;
border-radius: .25em;
}
&.simplebar-visible:before {
opacity: 1;
}
}
}
}
@mixin chat-scrollbar-horizontal() {
/*
& {
/* for moz */
// MOZ
scrollbar-color: #353535 #555;
scrollbarWidth: .5em;
}
@ -142,6 +142,7 @@
//-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
background-color: #555;
}
*/
}
@mixin text-dotdotdot() {

4
shared/html/templates.html
View file

@ -284,7 +284,7 @@
<div class="container-seperator vertical" seperator-id="seperator-conversation-list-messages"></div>
<div class="conversation">
<div class="spacer"></div>
<div class="messages"></div>
<div class="container-messages"></div>
<div class="chatbox">
<div class="container-typing">{{tr "Partner is typing..." /}}</div>
<node key="chatbox"></node>
@ -4355,7 +4355,7 @@
<div class="container-name">{{tr "Your bookmarks" /}}</div>
<div class="container-address"></div>
</div>
<div class="container-settings">
<div class="container-settings" data-simplebar data-simplebar-auto-hide="false">
<div class="group">
<div class="row">
<div class="key">{{tr "Bookmark Name" /}}</div>

123
shared/js/ui/frames/chat_frame.ts
View file

@ -1166,25 +1166,14 @@ test
this.save_history();
}
fix_scroll(animate: boolean) {
if(!this._html_message_container)
return;
unread_message_scroll_offset() : number | undefined {
if(!this._spacer_unread_message) return undefined;
return this._displayed_message_first_tag(this._spacer_unread_message)[0].offsetTop
}
let offset;
if(this._spacer_unread_message) {
offset = this._displayed_message_first_tag(this._spacer_unread_message)[0].offsetTop;
} else if(typeof(this._scroll_position) !== "undefined") {
offset = this._scroll_position;
} else {
offset = this._html_message_container[0].scrollHeight;
}
if(animate) {
this._html_message_container.stop(true).animate({
scrollTop: offset
}, 'slow');
} else {
this._html_message_container.stop(true).scrollTop(offset);
}
fix_scroll(animate: boolean) {
if(this.handle.current_conversation() === this)
this.handle.fix_scroll(animate);
}
private _update_message_timestamp() {
@ -1567,6 +1556,8 @@ test
private _current_conversation: PrivateConveration = undefined;
private _select_read_timer: number;
private _scrollbar: SimpleBar;
constructor(handle: Frame) {
this.handle = handle;
this._chat_box = new ChatBox();
@ -1609,6 +1600,7 @@ test
destroy() {
this._chat_box && this._chat_box.destroy();
this._chat_box = undefined;
this._scrollbar = undefined;
for(const conversation of this._conversations)
conversation.destroy();
@ -1730,7 +1722,7 @@ test
this._current_conversation.set_unread_flag(false, true);
}, 20 * 1000); /* Lets guess you've read the new messages within 5 seconds */
}
this._current_conversation.fix_scroll(false);
this.fix_scroll(false);
this._current_conversation.entry_tag().addClass("selected");
this.update_chatbox_state();
}
@ -1753,16 +1745,21 @@ test
this._current_conversation.set_unread_flag(false, true); /* only updates everything if the state changes */
});
this._container_conversation_messages = this._container_conversation.find(".messages");
this._container_conversation_messages.on('scroll', event => {
this._container_conversation_messages = this._container_conversation.find(".container-messages");
if('SimpleBar' in window) {
this._scrollbar = new SimpleBar(this._container_conversation_messages[0]);
this._container_conversation_messages = $(this._scrollbar.getContentElement());
}
(this._scrollbar ? $(this._scrollbar.getScrollElement()) : this._container_conversation_messages).on('scroll', event => {
if(!this._current_conversation)
return;
const current_view = this._container_conversation_messages[0].scrollTop + this._container_conversation_messages[0].clientHeight + this._container_conversation_messages[0].clientHeight * .125;
if(current_view > this._container_conversation_messages[0].scrollHeight)
const scroll_element = this._scrollbar ? this._scrollbar.getScrollElement() : this._container_conversation_messages[0];
const current_view = scroll_element.scrollTop + scroll_element.clientHeight + scroll_element.clientHeight * .125;
if(current_view > scroll_element.scrollHeight)
this._current_conversation._scroll_position = undefined;
else
this._current_conversation._scroll_position = this._container_conversation_messages[0].scrollTop;
this._current_conversation._scroll_position = scroll_element.scrollTop;
});
this._container_conversation_list = this._html_tag.find(".conversation-list");
@ -1776,8 +1773,9 @@ test
}
on_show() {
if(this._current_conversation)
this._current_conversation.fix_scroll(false);
if(this._scrollbar)
this._scrollbar.init();
this.fix_scroll(false);
}
update_input_format_helper() {
@ -1788,6 +1786,30 @@ test
tag.addClass("hidden");
}
}
fix_scroll(animate: boolean) {
if(!this._current_conversation) return;
if(this._scrollbar)
this._scrollbar.recalculate();
const scroll_element = this._scrollbar ? $(this._scrollbar.getScrollElement()) : this._container_conversation_messages;
let offset = this._current_conversation.unread_message_scroll_offset();
if(typeof(offset) === "undefined") {
if(typeof(this._current_conversation._scroll_position) !== "undefined") {
offset = this._current_conversation._scroll_position;
} else {
offset = scroll_element[0].scrollHeight;
}
}
if(animate) {
scroll_element.stop(true).animate({
scrollTop: offset
}, 'slow');
} else {
scroll_element.stop(true).scrollTop(offset);
}
}
}
export namespace channel {
@ -1836,6 +1858,8 @@ test
private _first_unread_message: Message;
private _first_unread_message_pointer: ViewEntry;
private _scrollbar: SimpleBar;
private _scroll_position: number | undefined; /* undefined to follow bottom | position for special stuff */
constructor(handle: ConversationManager, channel_id: number) {
@ -1847,16 +1871,20 @@ test
html_tag() : JQuery { return this._html_tag; }
destroy() {
this._first_unread_message_pointer.html_element.detach();
this._first_unread_message_pointer.html_element.remove();
this._first_unread_message_pointer = undefined;
this._view_older_messages.html_element.detach();
this._view_older_messages.html_element.remove();
this._view_older_messages = undefined;
this._scrollbar = undefined;
for(const view_entry of this._view_entries) {
view_entry.html_element.detach();
view_entry.html_element.remove();
clearTimeout(view_entry.update_timer);
}
this._html_tag.remove();
this._view_entries = [];
}
@ -1869,13 +1897,17 @@ test
this._container_no_support = this._html_tag.find(".not-supported").hide();
this._container_messages = this._html_tag.find(".container-messages");
this._container_messages.on('scroll', event => {
const exact_position = this._container_messages[0].scrollTop + this._container_messages[0].clientHeight;
const current_view = exact_position + this._container_messages[0].clientHeight * .125;
if(current_view > this._container_messages[0].scrollHeight) {
if('SimpleBar' in window)
this._scrollbar = new SimpleBar(this._container_messages[0]);
(this._scrollbar ? $(this._scrollbar.getScrollElement()) : this._container_messages).on('scroll', event => {
const message_scroller = this._scrollbar ? this._scrollbar.getScrollElement() : this._container_messages[0];
const exact_position = message_scroller.scrollTop + message_scroller.clientHeight;
const current_view = exact_position + message_scroller.clientHeight * .125;
if(current_view > message_scroller.scrollHeight) {
this._scroll_position = undefined;
} else {
this._scroll_position = this._container_messages[0].scrollTop;
this._scroll_position = message_scroller.scrollTop;
}
const will_visible = !!this._first_unread_message && this._first_unread_message_pointer.html_element[0].offsetTop > exact_position;
@ -1892,7 +1924,7 @@ test
this._view_older_messages = this._generate_view_spacer(tr("Load older messages"), "old");
this._first_unread_message_pointer = this._generate_view_spacer(tr("Unread messages"), "new");
this._view_older_messages.html_element.appendTo(this._container_messages).on('click', event => {
this._view_older_messages.html_element.appendTo(this._scrollbar ? this._scrollbar.getContentElement() : this._container_messages).on('click', event => {
this.fetch_older_messages();
});
@ -2095,7 +2127,7 @@ test
this._first_unread_message = entry;
this._first_unread_message_pointer.html_element.insertBefore(entry.html_element);
this._container_messages.trigger('scroll'); /* updates the new message stuff */
(this._scrollbar ? $(this._scrollbar.getScrollElement()) : this._container_messages).trigger('scroll'); /* updates the new message stuff */
}
if(typeof(update_view) !== "boolean" || update_view)
this.fix_scroll(true);
@ -2111,6 +2143,11 @@ test
private _scroll_fix_timer: number;
private _scroll_animate: boolean;
on_show() {
if(this._scrollbar)
this._scrollbar.init();
}
fix_scroll(animate: boolean) {
if(this._scroll_fix_timer) {
this._scroll_animate = this._scroll_animate && animate;
@ -2120,21 +2157,23 @@ test
this._scroll_fix_timer = setTimeout(() => {
this._scroll_fix_timer = undefined;
if(this._scrollbar) this._scrollbar.recalculate();
const scroll_element = this._scrollbar ? $(this._scrollbar.getScrollElement()) : this._container_messages;
let offset;
if(this._first_unread_message) {
offset = this._first_unread_message.html_element[0].offsetTop;
} else if(typeof(this._scroll_position) !== "undefined") {
offset = this._scroll_position;
} else {
offset = this._container_messages[0].scrollHeight;
offset = scroll_element[0].scrollHeight;
}
if(this._scroll_animate) {
this._container_messages.stop(true).animate({
scroll_element.stop(true).animate({
scrollTop: offset
}, 'slow');
} else {
this._container_messages.stop(true).scrollTop(offset);
scroll_element.stop(true).scrollTop(offset);
}
}, 5);
}
@ -2246,6 +2285,7 @@ test
return;
}
if(this._scrollbar) this._scrollbar.recalculate();
//TODO remove in cache? (_last_messages)
}
@ -2348,6 +2388,7 @@ test
if(this._current_conversation) {
this._container_conversation.children().detach();
this._container_conversation.append(conversation.html_tag());
this._current_conversation.on_show();
this._current_conversation.fix_view_size();
this._current_conversation.fix_scroll(false);
this.update_chat_box();
@ -2386,8 +2427,10 @@ test
}
on_show() {
if(this._current_conversation)
if(this._current_conversation) {
this._current_conversation.on_show();
this._current_conversation.fix_scroll(false);
}
}
update_input_format_helper() {

23
shared/js/ui/view.ts
View file

@ -7,7 +7,14 @@
/// <reference path="elements/context_menu.ts" />
/// <reference path="modal/ModalCreateChannel.ts" />
/// <reference path="../../backend/ppt.d.ts" />
declare class SimpleBar {
constructor(element: HTMLElement);
init();
recalculate();
getContentElement() : HTMLElement;
getScrollElement() : HTMLElement;
}
class ChannelTree {
client: ConnectionHandler;
@ -32,11 +39,15 @@ class ChannelTree {
private _listener_document_click;
private _listener_document_key;
private _scroll_bar: SimpleBar;
constructor(client) {
this.client = client;
this._tag_container = $.spawn("div").addClass("channel-tree-container");
this._tag_entries = $.spawn("div").addClass("channel-tree");
if('SimpleBar' in window) /* for MSEdge, and may consider Firefox? */
this._scroll_bar = new SimpleBar(this._tag_container[0]);
this.client_mover = new ClientMover(this);
this.reset();
@ -108,12 +119,16 @@ class ChannelTree {
show_channel_tree() {
this._tree_detached = false;
this._tag_entries.appendTo(this._tag_container);
if(this._scroll_bar)
this._tag_entries.appendTo(this._scroll_bar.getContentElement());
else
this._tag_entries.appendTo(this._tag_container);
this.channels.forEach(e => {
e.recalculate_repetitive_name();
e.reorderClients();
});
this._scroll_bar.recalculate();
}
showContextMenu(x: number, y: number, on_close: () => void = undefined) {
@ -187,6 +202,8 @@ class ChannelTree {
if(channel == this.channel_last)
this.channel_last = channel.channel_previous;
if(this._scroll_bar) this._scroll_bar.recalculate();
}
insertChannel(channel: ChannelEntry) {
@ -244,6 +261,7 @@ class ChannelTree {
channel.initializeListener();
channel.update_family_index();
if(this._scroll_bar) this._scroll_bar.recalculate();
}
findChannel(channelId: number) : ChannelEntry | undefined {
@ -354,6 +372,7 @@ class ChannelTree {
}
}
client.set_audio_handle(undefined);
if(this._scroll_bar) this._scroll_bar.recalculate();
}
registerClient(client: ClientEntry) {
@ -368,7 +387,6 @@ class ChannelTree {
unregisterClient(client: ClientEntry) {
if(!this.clients.remove(client))
return;
client.tree_unregistered();
}
private _update_timer: number;
@ -407,6 +425,7 @@ class ChannelTree {
}
client.update_family_index(); /* why the hell is this here?! */
if(this._scroll_bar) this._scroll_bar.recalculate();
return client;
}

7
shared/loader/app.ts
View file

@ -131,6 +131,10 @@ const loader_javascript = {
});
}
await loader.load_scripts([
["https://unpkg.com/simplebar@latest/dist/simplebar.min.js"]
]);
/* load some extends classes */
await loader.load_scripts([
["js/connection/ConnectionBase.js"]
@ -323,6 +327,9 @@ const loader_style = {
},
load_style_debug: async () => {
await loader.load_styles([
"https://unpkg.com/simplebar@latest/dist/simplebar.css"
]);
await loader.load_styles([
"css/static/main.css",
"css/static/main-layout.css",

11
shared/loader/loader.ts
View file

@ -407,8 +407,10 @@ namespace loader {
};
tag.onload = () => {
cleanup();
{
try {
const css: CSSStyleSheet = tag.sheet as CSSStyleSheet;
const rules = css.cssRules;
const rules_remove: number[] = [];
const rules_add: string[] = [];
@ -431,11 +433,14 @@ namespace loader {
}
for(const rule of rules_add)
css.insertRule(rule, rules_remove[0]);
} catch(ex) {
if(!(ex instanceof DOMException && ex.message.indexOf("Cannot access rules") != 0))
console.error("Failed to postprocess style sheet: %o", ex);
}
if(config.verbose) console.debug("Style sheet %o loaded", path);
setTimeout(resolve, 100);
};
setTimeout(resolve, 0);
}
document.getElementById("style").appendChild(tag);
tag.href = path + (cache_tag || "");