refactor(web): rename Activator.activate → Activator.canActivate

web/src/engine/src/osk/views/activator.ts

@@ -23,10 +23,10 @@ export abstract class Activator<ExtraEvents = void> extends EventEmitter<EventMa
   /**
    * When `true`, indicates that the listener should activate / become visible.
    */
-  abstract get activate(): boolean;
+  abstract get canActivate(): boolean;
 
   /**
-   * When `true` and `activate` is `false`, indicates that changing the value of `enabled`
+   * When `true` and `canActivate` is `false`, indicates that changing the value of `enabled`
    * will result in activation.
    */
   abstract get conditionsMet(): boolean;
@@ -41,7 +41,7 @@ export class StaticActivator extends Activator {
     // does nothing; it's static.
   }
 
-  get activate(): boolean {
+  get canActivate(): boolean {
     return true;
   }
 

web/src/engine/src/osk/views/floatingOskView.ts

@@ -508,7 +508,7 @@ export class FloatingOSKView extends OSKView {
 
     Ls.position='absolute';
     // Keep it hidden if not currently displayed.
-    if(this.activationModel.activate) {
+    if(this.activationModel.canActivate) {
       Ls.display='block'; //Ls.visibility='visible';
     }
     Ls.left='0px';

web/src/engine/src/osk/views/oskView.ts

@@ -450,7 +450,7 @@ export abstract class OSKView
    * they rely on this function to manage presentation (showing / hiding) of the OSK.
    */
   private commonCheckAndDisplay() {
-    if(this.activationModel.activate && this.activeKeyboard) {
+    if(this.activationModel.canActivate && this.activeKeyboard) {
       this.present();
     } else {
       this.startHide(false);

web/src/engine/src/osk/views/simpleActivator.ts

@@ -12,14 +12,14 @@ export class SimpleActivator extends Activator {
 
   set enabled(value: boolean) {
     // Enabled + activated are the same thing for this class.
-    this.activate = value;
+    this.canActivate = value;
   }
 
-  get activate(): boolean {
+  get canActivate(): boolean {
     return this.flag;
   }
 
-  set activate(value: boolean) {
+  set canActivate(value: boolean) {
     if(this.flag != value) {
       this.flag = value;
       this.emit('activate', value);

web/src/engine/src/osk/views/twoStateActivator.ts

@@ -11,13 +11,13 @@ export class TwoStateActivator<Type> extends Activator<TriggerEventMap<Type>> {
   private _enabled: boolean = true;
   private actValue: Type = null;
 
-  get activate(): boolean {
+  get canActivate(): boolean {
     return this._enabled && !!this.actValue;
   }
 
   private checkState(oldValue: boolean) {
-    if(this.activate != oldValue) {
-      this.emit('activate', this.activate);
+    if(this.canActivate != oldValue) {
+      this.emit('activate', this.canActivate);
     }
   }
 
@@ -26,7 +26,7 @@ export class TwoStateActivator<Type> extends Activator<TriggerEventMap<Type>> {
   }
 
   set enabled(flag: boolean) {
-    const oldState = this.activate;
+    const oldState = this.canActivate;
     this._enabled = flag; // may change this.value!
 
     this.checkState(oldState);
@@ -37,7 +37,7 @@ export class TwoStateActivator<Type> extends Activator<TriggerEventMap<Type>> {
   }
 
   set activationTrigger(value: Type) {
-    const oldState = this.activate;
+    const oldState = this.canActivate;
     const oldValue = this.actValue;
     this.actValue = value; // may change this.value!
 

web/src/test/auto/headless/engine/osk/activation.tests.ts

@@ -12,7 +12,7 @@ describe("Activators", () => {
 
       assert.isTrue(activator.enabled);
       assert.isTrue(activator.conditionsMet);
-      assert.isTrue(activator.activate);
+      assert.isTrue(activator.canActivate);
     });
 
     it("set to 'off'", () => {
@@ -21,19 +21,19 @@ describe("Activators", () => {
 
       assert.isFalse(activator.enabled);
       assert.isTrue(activator.conditionsMet);
-      assert.isFalse(activator.activate);
+      assert.isFalse(activator.canActivate);
     });
 
     it('activate and enabled act as aliases', () => {
       const activator = new SimpleActivator();
 
       assert.isTrue(activator.enabled);
-      assert.isTrue(activator.activate);
+      assert.isTrue(activator.canActivate);
 
       activator.enabled = false;
-      assert.isFalse(activator.activate);
+      assert.isFalse(activator.canActivate);
 
-      activator.activate = true;
+      activator.canActivate = true;
       assert.isTrue(activator.enabled);
     });
 
@@ -86,7 +86,7 @@ describe("Activators", () => {
 
       assert.isTrue(activator.enabled);
       assert.isFalse(activator.conditionsMet);
-      assert.isFalse(activator.activate);
+      assert.isFalse(activator.canActivate);
       assert.isNotOk(activator.activationTrigger);
     });
 
@@ -101,7 +101,7 @@ describe("Activators", () => {
 
       assert.isTrue(activator.enabled);
       assert.isTrue(activator.conditionsMet);
-      assert.isTrue(activator.activate);
+      assert.isTrue(activator.canActivate);
       assert.isOk(activator.activationTrigger);
 
       assert.isTrue(activateStub.called);
@@ -230,4 +230,4 @@ describe("Activators", () => {
       assert.deepStrictEqual(stub.firstCall.args[0], object);
     });
   });
-});
+});