Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
WolverinDEV committed Jun 12, 2020
2 parents 4de68bc + cb616b5 commit e950eed
Show file tree
Hide file tree
Showing 98 changed files with 7,772 additions and 6,225 deletions.
24 changes: 24 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,28 @@
# Changelog:
* **12.06.20**
- Added a copy/paste menu for all HTML input elements

* **11.06.20**
- Fixed channel tree deletions
- Removed layout recalculate bottleneck on connection handler switching
- Fixed empty channel tree on tab change, if the tree has some scroll offset
- Added the ability to duplicate bookmarks
- Fixed issue [#106](https://github.com/TeaSpeak/TeaWeb/issues/106)
- Fixed issue [#90](https://github.com/TeaSpeak/TeaWeb/issues/90)

* **10.06.20**
- Finalize the channel file explorer
- Reworked the file transfer system
- Using an appropriate hash function for the avatar id generation
- Fixed icon over clipping for the channel tree and favorites

* **21.05.20**
- Updated the volume adjustment bar

* **18.05.20**
- Fixed client name change does not update the name in the channel tree
- Fixed hostbanner height

* **03.05.20**
- Splitup the file transfer & management part
- Added the ability to register a custom file transfer provider (required for the native client)
Expand Down
8 changes: 6 additions & 2 deletions loader/app/loader/loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import * as template_loader from "./template_loader";
declare global {
interface Window {
tr(message: string) : string;
tra(message: string, ...args: any[]);
tra(message: string, ...args: (string | number | boolean)[]) : string;
tra(message: string, ...args: any[]) : JQuery[];

log: any;
StaticSettings: any;
Expand All @@ -16,12 +17,15 @@ export interface Config {
loader_groups: boolean;
verbose: boolean;
error: boolean;

baseUrl: string;
}

export let config: Config = {
loader_groups: false,
verbose: false,
error: true
error: true,
baseUrl: "./"
};

export type Task = {
Expand Down
2 changes: 1 addition & 1 deletion loader/app/loader/script_loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function load_script_url(url: string) : Promise<void> {

document.getElementById("scripts").appendChild(script_tag);

script_tag.src = url;
script_tag.src = config.baseUrl + url;
})).then(result => {
/* cleanup memory */
_script_promises[url] = Promise.resolve(); /* this promise does not holds the whole script tag and other memory */
Expand Down
2 changes: 1 addition & 1 deletion loader/app/loader/style_loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function load_style_url(url: string) : Promise<void> {
};

document.getElementById("style").appendChild(tag);
tag.href = url;
tag.href = config.baseUrl + url;
})).then(result => {
/* cleanup memory */
_style_promises[url] = Promise.resolve(); /* this promise does not holds the whole script tag and other memory */
Expand Down
2 changes: 1 addition & 1 deletion loader/app/loader/template_loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function load_template_url(url: string) : Promise<void> {
return _template_promises[url];

return (_template_promises[url] = (async () => {
const response = await $.ajax(url);
const response = await $.ajax(config.baseUrl + url);

let node = document.createElement("html");
node.innerHTML = response;
Expand Down
3 changes: 2 additions & 1 deletion loader/app/targets/app.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as loader from "../loader/loader";
import {config} from "../loader/loader";

declare global {
interface Window {
Expand Down Expand Up @@ -74,7 +75,7 @@ const loader_javascript = {

let manifest: Manifest;
try {
const response = await fetch("js/manifest.json");
const response = await fetch(config.baseUrl + "js/manifest.json");
if(!response.ok) throw response.status + " " + response.statusText;

manifest = await response.json();
Expand Down
1 change: 1 addition & 0 deletions loader/exports/loader.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ export interface Config {
loader_groups: boolean;
verbose: boolean;
error: boolean;
baseUrl: string;
}

export enum BackendType {
Expand Down
64 changes: 64 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,11 @@
"sass-loader": "^8.0.2",
"sha256": "^0.2.0",
"style-loader": "^1.1.3",
"svg-inline-loader": "^0.8.2",
"terser": "^4.2.1",
"terser-webpack-plugin": "latest",
"ts-loader": "^6.2.2",
"tsd": "latest",
"typescript": "^3.7.0",
"wabt": "^1.0.13",
"webpack": "^4.42.1",
Expand All @@ -85,6 +87,7 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"resize-observer-polyfill": "^1.5.1",
"simplebar-react": "^2.2.0",
"webrtc-adapter": "^7.5.1"
}
}
7 changes: 6 additions & 1 deletion shared/css/static/general.scss
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,14 @@ button, input, optgroup, select, textarea {

select {
-webkit-border-radius: 1px!important;
outline: none;

option {
color: black;
color: #999999;
}

&:focus {
outline: none !important;
}
}

Expand Down
1 change: 1 addition & 0 deletions shared/css/static/hostbanner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

flex-grow: 1;
flex-shrink: 1;
min-height: 0;

text-align: center;

Expand Down
4 changes: 2 additions & 2 deletions shared/css/static/main-layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ $animation_length: .5s;
height: 1.5em;

background: #252525;
color: #353535;
color: #666666;

border-radius: 0 0 5px 5px;
padding-right: 5px;
Expand Down Expand Up @@ -165,7 +165,7 @@ $animation_length: .5s;
}

a[href], a[href]:visited {
color: #353535!important;
color: #666666!important;
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions shared/css/static/menu-bar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@
background-color: rgba(0, 0, 0, 0.13);
}

&.hidden {
display: none;
}

.sub-menu {
z-index: 1000;
display: none;
Expand Down
11 changes: 10 additions & 1 deletion shared/css/static/modal-bookmarks.scss
Original file line number Diff line number Diff line change
Expand Up @@ -463,9 +463,18 @@
padding: .5em;
display: flex;
flex-direction: row;
justify-content: flex-end;
justify-content: flex-start;

.button-duplicate {
margin-right: auto;
}

button {
flex-shrink: 1;
flex-grow: 1;

min-width: 2em;

white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
Expand Down
39 changes: 0 additions & 39 deletions shared/css/static/modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -842,45 +842,6 @@ $tooltip_height: 1.8em;

.tooltip {
display: none;

/*
position: absolute;
top: -($tooltip_height + .6em);
left: -($tooltip_width - $thumb_width) / 2;
line-height: 1em;
height: $tooltip_height;
width: $tooltip_width;
background-color: #232222;
border-radius: $border_radius_middle;
text-align: center;
display: flex;
flex-direction: column;
justify-content: space-around;
opacity: 0;
@include transition(opacity .5s ease-in-out);
&:before {
content: '';
position: absolute;
left: ($tooltip_width - $thumb_width) / 2 - .25em;
right: 0;
bottom: -.4em;
width: 0;
height: 0;
border-style: solid;
border-width: .5em .5em 0 .5em;
border-color: #232222 transparent transparent transparent;
}
*/
}
}

Expand Down
6 changes: 0 additions & 6 deletions shared/generate_declarations.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,5 @@ function generate_declaration() {

#Generate the loader definitions first
app_declaration="../declarations/shared-app/"
loader_declaration_app="../declarations/loader/"
# loader_declaration_certaccept="declarations/exports_loader_certaccept.d.ts"

generate_declaration dtsconfig_app.json ${app_declaration}
generate_declaration dtsconfig_loader_app.json ${loader_declaration_app}
# generate_declaration dtsconfig_loader_certaccept.json ${loader_declaration_certaccept}

exit 0
1 change: 1 addition & 0 deletions shared/html/templates.html
Original file line number Diff line number Diff line change
Expand Up @@ -4601,6 +4601,7 @@
</div>
</div>
<div class="buttons">
<button class="btn btn-blue button-duplicate">{{tr "Duplicate" /}}</button>
<button class="btn btn-success button-connect-tab">{{tr "Connect in a new tab" /}}</button>
<button class="btn btn-success button-connect">{{tr "Connect" /}}</button>
</div>
Expand Down
21 changes: 21 additions & 0 deletions shared/img/icon_file_text.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions shared/img/icon_folder.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e950eed

Please sign in to comment.