Refactored enable/disable tools in Draw authoring. #2889

Author: hirokiterashima

src/main/webapp/wise5/components/draw/draw-authoring/draw-authoring.component.html

@@ -46,7 +46,7 @@
 <button mat-raised-button
     color="primary"
     class="enable-all-tools-button"
-    (click)="enableAllToolsButtonClicked()"
+    (click)="enableAllTools(true)"
     matTooltip="Enable All Tools"
     matTooltipPosition="above"
     i18n-matTooltip
@@ -57,7 +57,7 @@
 <button mat-raised-button
     color="primary"
     class="disable-all-tools-button"
-    (click)="disableAllToolsButtonClicked()"
+    (click)="enableAllTools(false)"
     matTooltip="Disable All Tools"
     matTooltipPosition="above"
     i18n-matTooltip
@@ -289,4 +289,4 @@
       i18n-aria-label>
     <mat-icon>delete_sweep</mat-icon>
   </button>
-</div>
+</div>

src/main/webapp/wise5/components/draw/draw-authoring/draw-authoring.component.ts

@@ -7,7 +7,6 @@ import { ConfigService } from '../../../services/configService';
 import { NodeService } from '../../../services/nodeService';
 import { ProjectAssetService } from '../../../../site/src/app/services/projectAssetService';
 import { TeacherProjectService } from '../../../services/teacherProjectService';
-import { UtilService } from '../../../services/utilService';
 import { Subject, Subscription } from 'rxjs';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 
@@ -17,6 +16,23 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
   styleUrls: ['draw-authoring.component.scss']
 })
 export class DrawAuthoring extends ComponentAuthoring {
+  allToolNames: string[] = [
+    'select',
+    'line',
+    'shape',
+    'freeHand',
+    'text',
+    'stamp',
+    'strokeColor',
+    'fillColor',
+    'clone',
+    'strokeWidth',
+    'sendBack',
+    'sendForward',
+    'undo',
+    'redo',
+    'delete'
+  ];
   width: number;
   height: number;
   defaultWidth: number = 800;
@@ -39,8 +55,7 @@ export class DrawAuthoring extends ComponentAuthoring {
     protected ConfigService: ConfigService,
     protected NodeService: NodeService,
     protected ProjectAssetService: ProjectAssetService,
-    protected ProjectService: TeacherProjectService,
-    protected UtilService: UtilService
+    protected ProjectService: TeacherProjectService
   ) {
     super(ConfigService, NodeService, ProjectAssetService, ProjectService);
     this.inputChangeSubscription = this.inputChange
@@ -85,47 +100,13 @@ export class DrawAuthoring extends ComponentAuthoring {
     this.stampImageChangeSubscription.unsubscribe();
   }
 
-  enableAllToolsButtonClicked(): void {
+  enableAllTools(doEnable: boolean) {
     if (this.authoringComponentContent.tools == null) {
       this.authoringComponentContent.tools = {};
     }
-    this.authoringComponentContent.tools.select = true;
-    this.authoringComponentContent.tools.line = true;
-    this.authoringComponentContent.tools.shape = true;
-    this.authoringComponentContent.tools.freeHand = true;
-    this.authoringComponentContent.tools.text = true;
-    this.authoringComponentContent.tools.stamp = true;
-    this.authoringComponentContent.tools.strokeColor = true;
-    this.authoringComponentContent.tools.fillColor = true;
-    this.authoringComponentContent.tools.clone = true;
-    this.authoringComponentContent.tools.strokeWidth = true;
-    this.authoringComponentContent.tools.sendBack = true;
-    this.authoringComponentContent.tools.sendForward = true;
-    this.authoringComponentContent.tools.undo = true;
-    this.authoringComponentContent.tools.redo = true;
-    this.authoringComponentContent.tools.delete = true;
-    this.componentChanged();
-  }
-
-  disableAllToolsButtonClicked(): void {
-    if (this.authoringComponentContent.tools == null) {
-      this.authoringComponentContent.tools = {};
-    }
-    this.authoringComponentContent.tools.select = false;
-    this.authoringComponentContent.tools.line = false;
-    this.authoringComponentContent.tools.shape = false;
-    this.authoringComponentContent.tools.freeHand = false;
-    this.authoringComponentContent.tools.text = false;
-    this.authoringComponentContent.tools.stamp = false;
-    this.authoringComponentContent.tools.strokeColor = false;
-    this.authoringComponentContent.tools.fillColor = false;
-    this.authoringComponentContent.tools.clone = false;
-    this.authoringComponentContent.tools.strokeWidth = false;
-    this.authoringComponentContent.tools.sendBack = false;
-    this.authoringComponentContent.tools.sendForward = false;
-    this.authoringComponentContent.tools.undo = false;
-    this.authoringComponentContent.tools.redo = false;
-    this.authoringComponentContent.tools.delete = false;
+    this.allToolNames.map((toolName) => {
+      this.authoringComponentContent.tools[toolName] = doEnable;
+    });
     this.componentChanged();
   }