1.4.3: Bugfixes for cites, login screen scrolling and logout

Makefile

@@ -14,4 +14,5 @@ deployment:
 	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'
 
-
+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

config.xml

@@ -1,5 +1,5 @@
 <?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>
     <description>WowApp's awesome instant messenger for the whole Greifentanzgeschwader</description>
     <author email="webmaster@sabolli.de" href="https://sabolli.de/metasocket/">sabolli</author>

src/app/chat/chat.component.ts

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

src/app/websocket.service.ts

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

src/global.scss

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