Remove ledstatus event, and update test to check internal state instead

novnc · Aug 30, 2023 · df8df55 · df8df55
1 parent 934f78e
commit df8df55
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/core/rfb.js b/core/rfb.js
@@ -2756,16 +2756,12 @@ export default class RFB extends EventTargetMixin {
         }
 
         let data = this._sock.rQshift8();
-        let scrollLock = data & 1 ? true : false;
+        // ScrollLock state can be retrieved with data & 1. This is currently not needed.
         let numLock = data & 2 ? true : false;
         let capsLock = data & 4 ? true : false;
         this._remoteCapsLock = capsLock;
         this._remoteNumLock = numLock;
 
-        this.dispatchEvent(new CustomEvent(
-            "ledstatus",
-            { detail: { scrollLock: scrollLock, numLock: numLock, capsLock: capsLock } }));
-
         return true;
     }
 

diff --git a/tests/test.rfb.js b/tests/test.rfb.js
@@ -3125,28 +3125,24 @@ describe('Remote Frame Buffer Protocol Client', function () {
 
                     sendFbuMsg([{ x: 0, y: 0, width: 0, height: 0, encoding: -261 }], [data], client);
 
+                    expect(client._remoteCapsLock).to.equal(true);
+                    expect(client._remoteNumLock).to.equal(true);
+
                     data = [];
                     push8(data, 0b011);
 
                     sendFbuMsg([{ x: 0, y: 0, width: 0, height: 0, encoding: -261 }], [data], client);
 
+                    expect(client._remoteCapsLock).to.equal(false);
+                    expect(client._remoteNumLock).to.equal(true);
+
                     data = [];
                     push8(data, 0b000);
 
                     sendFbuMsg([{ x: 0, y: 0, width: 0, height: 0, encoding: -261 }], [data], client);
 
-                    expect(spy).to.have.been.calledThrice;
-                    expect(spy.args[0][0].detail.capsLock).to.equal(true);
-                    expect(spy.args[0][0].detail.numLock).to.equal(true);
-                    expect(spy.args[0][0].detail.scrollLock).to.equal(false);
-
-                    expect(spy.args[1][0].detail.capsLock).to.equal(false);
-                    expect(spy.args[1][0].detail.numLock).to.equal(true);
-                    expect(spy.args[1][0].detail.scrollLock).to.equal(true);
-
-                    expect(spy.args[2][0].detail.capsLock).to.equal(false);
-                    expect(spy.args[2][0].detail.numLock).to.equal(false);
-                    expect(spy.args[2][0].detail.scrollLock).to.equal(false);
+                    expect(client._remoteCapsLock).to.equal(false);
+                    expect(client._remoteNumLock).to.equal(false);
                 });
             });
         });