refactored

Author: Garret29

webclient/src/main/web/package-lock.json

@@ -21,6 +21,7 @@
     "@angular/platform-browser-dynamic": "~7.2.0",
     "@angular/router": "~7.2.0",
     "@types/dom-inputevent": "^1.0.4",
+    "bootstrap": "^4.3.1",
     "core-js": "^2.5.4",
     "net": "^1.0.2",
     "rxjs": "~6.3.3",

webclient/src/main/web/package.json

@@ -0,0 +1 @@
+

webclient/src/main/web/src/app/document/document.component.css

@@ -12,8 +12,8 @@
     <button (click)="addNewDocument(newDocument)">Add</button>
   </div>
   <hr>
-  <div>
-    <label *ngIf="currentDocument"> {{currentDocument.name}}:<br>
+  <div *ngIf="currentDocument">
+    <label> {{currentDocument.name}}:<br>
       <textarea appBlockPaste #textArea [(ngModel)]="currentDocument.content"
                 (input)="textChanged($event ,currentDocument)"
                 (mousedown)="updateSelection()"

webclient/src/main/web/src/app/document/document.component.html

@@ -1,5 +1,5 @@
 import {Component, ElementRef, OnInit, ViewChild} from '@angular/core';
-import {applyUpdate, Document} from "../model/document";
+import {Document} from "../model/document";
 import {createUpdate, Update} from "../model/update";
 import {DocumentService} from "../services/document.service";
 import {WebSocketSubject} from "../services/webSocketSubject";
@@ -47,6 +47,8 @@ export class DocumentComponent implements OnInit {
           this.currentDocument = docs[0];
           this.currentDocument.previousContent = this.currentDocument.content;
           this.documentSelected(this.currentDocument)
+        } else {
+          this.currentDocument = null;
         }
       }
     )
@@ -84,7 +86,7 @@ export class DocumentComponent implements OnInit {
     this.documentService.getWsConnection(document.name).subscribe((ws: WebSocketSubject<Update>) => {
       this.updateSubject = ws;
       this.updateSubject.subscribe((update: Update) => {
-        applyUpdate(document, update)
+        this.applyUpdate(document, update);
       })
     });
   }
@@ -105,8 +107,8 @@ export class DocumentComponent implements OnInit {
       }
     } else if (event.inputType === "deleteContentForward") {
       update = createUpdate("", this.selectionStart, this.selectionEnd + 1, false)
-    } else if (event.inputType==="insertLineBreak") {
-      update = createUpdate("\n",this.selectionStart,this.selectionEnd,false)
+    } else if (event.inputType === "insertLineBreak") {
+      update = createUpdate("\n", this.selectionStart, this.selectionEnd, false)
     } else {
       const appending: boolean = this.selectionStart === this.selectionEnd && document.content.length === this.selectionEnd + 1;
       update = createUpdate(document.content.substring(this.selectionStart, this.selectionEnd + 1), this.selectionStart, this.selectionEnd, appending)
@@ -119,4 +121,22 @@ export class DocumentComponent implements OnInit {
     this.selectionStart = this.textArea.nativeElement.selectionStart;
     this.selectionEnd = this.textArea.nativeElement.selectionEnd;
   }
+
+  applyUpdate(document: Document, update: Update) {
+    const start = this.textArea.nativeElement.selectionStart;
+    const end = this.textArea.nativeElement.selectionEnd;
+    const oldContent: String = document.content;
+
+    if (update.appending) {
+      document.previousContent = document.previousContent + update.content
+    } else {
+      const first = document.previousContent.substring(0, update.start);
+      const last = document.previousContent.substring(update.end);
+
+      document.previousContent = first + update.content + last
+    }
+    if (document.content !== document.previousContent) {
+      document.content = document.previousContent;
+    }
+  }
 }

webclient/src/main/web/src/app/document/document.component.ts

@@ -11,19 +11,3 @@ export class Document {
     this.previousContent = content;
   }
 }
-
-
-
-export function applyUpdate(document: Document ,update: Update){
-  if(update.appending){
-    document.previousContent = document.previousContent+update.content
-  } else {
-    const first = document.previousContent.substring(0, update.start);
-    const last = document.previousContent.substring(update.end);
-
-    document.previousContent = first+update.content+ last
-  }
-  if(document.content !== document.previousContent){
-    document.content = document.previousContent
-  }
-}