Mal/metasocket-cordova
Mal/metasocket-cordova
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1.4.3: Bugfixes for cites, login screen scrolling and logout

Browse Source
This commit is contained in:
Mal 2021-03-13 22:54:48 +01:00
parent f71ba7d569
commit 37c95476ac
6 changed files with 18877 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -14,4 +14,5 @@ deployment:
read VERSION read VERSION
cp platforms/android/app/build/outputs/apk/debug/app-debug.apk '/run/user/1000/gvfs/mtp:host=Fairphone_FP2_ff87fc9d/Interner gemeinsamer Speicher/bluetooth/metasocket-${VERSION}.apk' cp platforms/android/app/build/outputs/apk/debug/app-debug.apk '/run/user/1000/gvfs/mtp:host=Fairphone_FP2_ff87fc9d/Interner gemeinsamer Speicher/bluetooth/metasocket-${VERSION}.apk'
deploy-debug:
scp /home/mal/Code/Ionic/metasocket-cordova/platforms/android/app/build/outputs/apk/debug/app-debug.apk sabolli:/home/mal/webserver/wow/metasocket/download/android

2
config.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.starter" version="1.4.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="io.ionic.starter" version="1.4.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>METAsocket</name> <name>METAsocket</name>
<description>WowApp's awesome instant messenger for the whole Greifentanzgeschwader</description> <description>WowApp's awesome instant messenger for the whole Greifentanzgeschwader</description>
<author email="webmaster@sabolli.de" href="https://sabolli.de/metasocket/">sabolli</author> <author email="webmaster@sabolli.de" href="https://sabolli.de/metasocket/">sabolli</author>

18875
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

7
src/app/chat/chat.component.ts
View File

@ -162,6 +162,7 @@ export class ChatComponent implements OnInit, AfterViewInit, AfterViewChecked, W
onLogout() { onLogout() {
this.apiService.storeData('token', null); this.apiService.storeData('token', null);
this.websocketService.destroy();
AppComponent.token = null; AppComponent.token = null;
} }
@ -234,12 +235,12 @@ export class ChatComponent implements OnInit, AfterViewInit, AfterViewChecked, W
message.split('\n').forEach( message.split('\n').forEach(
(paragraph: string) => { (paragraph: string) => {
if (paragraph.substr(0, 1) !== '>') { if (paragraph.substr(0, 1) !== '>') {
originalMessage.push(paragraph); originalMessage.push('> @' + username + ': ' + paragraph);
} }
} }
); );
this.insertIntoTextareaCursorPosition('> @' + username + ': ' + originalMessage.join('\n') + '\n'); this.insertIntoTextareaCursorPosition(originalMessage.join('\n') + '\n');
} }
triggerNotification(message: ChatMessage): void triggerNotification(message: ChatMessage): void
@ -308,7 +309,7 @@ export class ChatComponent implements OnInit, AfterViewInit, AfterViewChecked, W
parsedText += '</div>'; parsedText += '</div>';
} }
const matches = parsedText.match(/(\s|^)@\w+/g); const matches = parsedText.match(/(?!(\b))@\w+/g);
if (matches === null) { if (matches === null) {
return parsedText; return parsedText;

5
src/app/websocket.service.ts
View File

@ -28,6 +28,11 @@ export class WebsocketService {
this.socket.addEventListener('error', () => {this.onError(); }); this.socket.addEventListener('error', () => {this.onError(); });
} }
destroy(): void
{
this.socket = null;
}
setListener(listener: WebsocketListener): void { setListener(listener: WebsocketListener): void {
this.listener = listener; this.listener = listener;
} }

9
src/global.scss
View File

@ -121,13 +121,13 @@ html, body {
} }
#login { #login {
display: flex;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
background-color: rgb(37, 26, 37); background-color: rgb(37, 26, 37);
display: flex;
align-items: center; align-items: center;
} }
@ -246,3 +246,10 @@ html, body {
.button-send-offline { .button-send-offline {
background-color: #550000; background-color: #550000;
} }
@media only screen and (max-height: 500px) {
#login {
position: static;
display: block;
}
}