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

Improved client rename functionality

canary
WolverinDEV 2019-04-26 00:32:19 +02:00
parent 3a255b2316
commit 74b03209df
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
shared/css/static/channel-tree.scss
View File

@ -174,6 +174,13 @@
&.client-name-own { &.client-name-own {
font-weight: bold; font-weight: bold;
} }
line-height: 16px;
flex-grow: 1;
flex-shrink: 1;
min-width: 75px;
} }
.container-icons { .container-icons {
@ -204,6 +211,15 @@
.client-name { .client-name {
color: whitesmoke; color: whitesmoke;
&:focus {
color: black;
padding-top: 1px;
padding-bottom: 1px;
z-index: 1000;
}
} }
} }
} }

4
shared/js/ui/client.ts
View File

@ -869,6 +869,8 @@ class LocalClientEntry extends ClientEntry {
openRename() : void { openRename() : void {
const _self = this; const _self = this;
this.channelTree.client_mover.enabled = false;
const elm = this.tag.find(".client-name"); const elm = this.tag.find(".client-name");
elm.attr("contenteditable", "true"); elm.attr("contenteditable", "true");
elm.removeClass("client-name-own"); elm.removeClass("client-name-own");
@ -884,6 +886,8 @@ class LocalClientEntry extends ClientEntry {
}); });
elm.focusout(e => { elm.focusout(e => {
this.channelTree.client_mover.enabled = true;
if(!_self.renaming) return; if(!_self.renaming) return;
_self.renaming = false; _self.renaming = false;

8
shared/js/ui/client_move.ts
View File

@ -10,6 +10,8 @@ class ClientMover {
hovered_channel: HTMLDivElement; hovered_channel: HTMLDivElement;
callback: (channel?: ChannelEntry) => any; callback: (channel?: ChannelEntry) => any;
enabled: boolean = true;
private _bound_finish; private _bound_finish;
private _bound_move; private _bound_move;
private _active: boolean = false; private _active: boolean = false;
@ -43,6 +45,9 @@ class ClientMover {
activate(client: ClientEntry | ClientEntry[], callback: (channel?: ChannelEntry) => any, event: any) { activate(client: ClientEntry | ClientEntry[], callback: (channel?: ChannelEntry) => any, event: any) {
this.finish_listener(undefined); this.finish_listener(undefined);
if(!this.enabled)
return false;
this.selected_client = client; this.selected_client = client;
this.callback = callback; this.callback = callback;
console.log(tr("Starting mouse move")); console.log(tr("Starting mouse move"));
@ -58,6 +63,9 @@ class ClientMover {
} }
private move_listener(event) { private move_listener(event) {
if(!this.enabled)
return;
//console.log("Mouse move: " + event.pageX + " - " + event.pageY); //console.log("Mouse move: " + event.pageX + " - " + event.pageY);
if(!event.pageX || !event.pageY) return; if(!event.pageX || !event.pageY) return;
if(!this.origin_point) if(!this.origin_point)