diff --git a/asm/libraries/tomcrypt b/asm/libraries/tomcrypt index bc6d70bd..420b947c 160000 --- a/asm/libraries/tomcrypt +++ b/asm/libraries/tomcrypt @@ -1 +1 @@ -Subproject commit bc6d70bd1f4a6778cf51379090d8391dcf53590d +Subproject commit 420b947c41df88c6fb32a29add3b12e8ed69b323 diff --git a/package.json b/package.json index 1024af39..159ebdb0 100644 --- a/package.json +++ b/package.json @@ -5,18 +5,21 @@ "main": "main.js", "directories": {}, "scripts": { + "compile-sass": "sass --update .:.", "build-web-app": "tsc -p tsconfig/tsconfig_web_app.json", "build-web-app-release": "tsc -p tsconfig/tsconfig_web_app_packaged.json", "build-web-preload": "tsc -p tsconfig/tsconfig_web_preload.json" }, - "author": "", + "author": "TeaSpeak (WolverinDEV)", "license": "ISC", "devDependencies": { "@types/emscripten": "0.0.31", "@types/jquery": "^3.3.0", "@types/node": "^9.4.6", "@types/websocket": "0.0.38", - "electron": "^3.0.2" + "electron": "^3.0.2", + "sass": "^1.14.1", + "typescript": "^3.1.1" }, "dependencies": {}, "repository": { diff --git a/scripts/git-release.sh b/scripts/git-release.sh deleted file mode 100644 index fcd8e11c..00000000 --- a/scripts/git-release.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -version=$1 -text=$2 -branch=$(git rev-parse --abbrev-ref HEAD) -repo_full_name=$(git config --get remote.origin.url | sed 's/.*:\/\/github.com\///;s/.git$//') -token=$(git config --global github.token) - -generate_post_data() -{ - cat < { - if(event.keyCode == $.Key.Enter && !event.shiftKey) { + if(event.keyCode == JQuery.Key.Enter && !event.shiftKey) { this.onSend(); return false; } diff --git a/shared/js/proto.ts b/shared/js/proto.ts index 8bd9a247..6102cbd4 100644 --- a/shared/js/proto.ts +++ b/shared/js/proto.ts @@ -103,7 +103,7 @@ if (!Array.prototype.last){ if(typeof ($) !== "undefined") { if(!$.spawn) { $.spawn = function(tagName: K): JQuery { - return $(document.createElement(tagName)); + return $(document.createElement(tagName) as any); } } if(!$.prototype.renderTag) { diff --git a/shared/js/voice/VoiceHandler.ts b/shared/js/voice/VoiceHandler.ts index 7ee538ef..405fc523 100644 --- a/shared/js/voice/VoiceHandler.ts +++ b/shared/js/voice/VoiceHandler.ts @@ -2,8 +2,6 @@ /// /// -import WarningListener = NodeJS.WarningListener; - class CodecPoolEntry { instance: BasicCodec; owner: number; @@ -138,7 +136,7 @@ class VoiceConnection { private vpacketId: number = 0; private chunkVPacketId: number = 0; - private send_task: number = 0; + private send_task: NodeJS.Timer; constructor(client) { this.client = client;