minor clean up

chinonso098 · Oct 21, 2023 · 24df770 · 24df770
1 parent bcb7a4a
commit 24df770
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 25 deletions.
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1,6 +1,5 @@
 <cos-desktop>
     <cos-filemanager> </cos-filemanager>
-    <!-- <cos-jsdos> </cos-jsdos>  -->
     <ng-container #processContainerRef> </ng-container>
 
     <cos-taskbar> 

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -124,9 +124,8 @@ export class AppComponent implements OnDestroy, AfterViewInit {
 
     const componentToDelete = this._componentReferenceService.getComponentReference(eventData.getProcessId);
     this._componentRefView = componentToDelete.hostView;
-
-    // eslint-disable-next-line prefer-const
-    let iVCntr  = this.itemViewContainer.indexOf(this._componentRefView);
+
+    const iVCntr  = this.itemViewContainer.indexOf(this._componentRefView);
     this.itemViewContainer.remove(iVCntr);
 
     this._runningProcessService.removeProcess(eventData)

diff --git a/src/app/system-apps/taskbarentries/taskbarentries.component.html b/src/app/system-apps/taskbarentries/taskbarentries.component.html
@@ -2,5 +2,4 @@
      <li taskBarEntryHighlight *ngFor="let rProcess of runningProcess">
           <cos-taskbarentry [taskBarPid]="rProcess.getProcessId" [taskBarIconImgUrl]="rProcess.getIcon"  [taskBarIconName]="rProcess.getProcessName" (restoreOrMinizeWindowEvent)="restoreOrMinizeWindow($event)"> </cos-taskbarentry> 
      </li>
-     <!-- <cos-taskbarentry [taskBarIconImgUrl]="" [taskBarIconTitle]="" > </cos-taskbarentry>  -->
 </ol>
diff --git a/src/app/user-apps/jsdos/jsdos.component.html b/src/app/user-apps/jsdos/jsdos.component.html
@@ -1,17 +1,4 @@
-<!-- 
-<cos-window [runningProcessID]="100">
-
-    <div #doswindow></div> 
-
-</cos-window> -->
-
-<!-- <div #doswindow class="canvas" style="height:640px; width:480px;  left:50%; position: absolute;"></div>  -->
-
-
-<!-- <div #doswindow class="canvas" style="height:640px; width:480px;  left:50%; position: relative; top:15px; left:0px"></div>  try this-->  
-
-
-<cos-window [runningProcessID]="this.processId">
+<cos-window [runningProcessID]="this.processId" [processAppIcon]="this.icon" [processAppName]="this.name">
 
     <div #doswindow class="canvas" style="height:800px; width:600px; position: relative;" ></div> 
 

diff --git a/src/app/user-apps/jsdos/jsdos.component.ts b/src/app/user-apps/jsdos/jsdos.component.ts
@@ -30,7 +30,7 @@ export class JsdosComponent implements BaseComponent, OnInit, OnDestroy, AfterVi
 
   name= 'jsdos';
   hasWindow = true;
-  icon = '';
+  icon = '/osdrive/icons/js-dos-logo.png';
   processId = 0;
   type = ComponentType.userComponent;
   displayName = 'JS-Dos';
@@ -54,6 +54,8 @@ export class JsdosComponent implements BaseComponent, OnInit, OnDestroy, AfterVi
 
   ngOnInit(): void {
     this._fileInfo = this._triggerProcessService.getLastProcessTrigger();
+    //this.icon = this._fileInfo.getIcon;
+    this.name = this._fileInfo.getFileName;
   }
 
   async ngAfterViewInit() {
@@ -70,17 +72,16 @@ export class JsdosComponent implements BaseComponent, OnInit, OnDestroy, AfterVi
       URL.revokeObjectURL(this._fileInfo.getDataPath);
 
     }, 1500);
-
   }
 
 
-  async ngOnDestroy(): Promise<void> {
+  ngOnDestroy(): void {
 
-      console.log('clean up:')
+    if(this.dosOptions){
 
       if(this._ci != undefined)
-        await this._ci.exit();
-
+          this._ci.exit();
+    }
   }