crabapples
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'novnc:master' into master

This commit is contained in:
掌控-物质 2026-05-23 13:40:55 +08:00 committed by GitHub
parent d4e13ec503 5c2025d5a6
commit ae2b55fb96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/ui.js
View File

@ -1288,13 +1288,13 @@ const UI = {
let inputFocus = "none"; let inputFocus = "none";
if (e.detail.types.indexOf("username") === -1) { if (e.detail.types.indexOf("username") === -1) {
document.getElementById("noVNC_username_block").classList.add("noVNC_hidden"); document.getElementById("noVNC_username_block").classList.add("noVNC_hidden");
} else { } else if (document.getElementById("noVNC_username_input").value === "") {
inputFocus = inputFocus === "none" ? "noVNC_username_input" : inputFocus; inputFocus = "noVNC_username_input";
} }
if (e.detail.types.indexOf("password") === -1) { if (e.detail.types.indexOf("password") === -1) {
document.getElementById("noVNC_password_block").classList.add("noVNC_hidden"); document.getElementById("noVNC_password_block").classList.add("noVNC_hidden");
} else { } else if (inputFocus === "none") {
inputFocus = inputFocus === "none" ? "noVNC_password_input" : inputFocus; inputFocus = "noVNC_password_input";
} }
document.getElementById('noVNC_credentials_dlg') document.getElementById('noVNC_credentials_dlg')
.classList.add('noVNC_open'); .classList.add('noVNC_open');

29
tests/test.rfb.js
View File

@ -3485,7 +3485,7 @@ describe('Remote Frame Buffer protocol client', function () {
expectedStr expectedStr
)).to.be.true; )).to.be.true;
expect(dispatchEventSpy.calledWith( expect(dispatchEventSpy.calledWith(
new CustomEvent("clipboard", {detail: {expectedStr: expectedStr}}) new CustomEvent("clipboard", {detail: {text: expectedStr}})
)).to.be.false; )).to.be.false;
}); });
@ -3506,9 +3506,8 @@ describe('Remote Frame Buffer protocol client', function () {
expect(client._asyncClipboard.writeClipboard.calledOnceWith( expect(client._asyncClipboard.writeClipboard.calledOnceWith(
expectedStr expectedStr
)).to.be.true; )).to.be.true;
expect(dispatchEventSpy.calledOnceWith( expect(dispatchEventSpy.args[0][0].type).to.equal("clipboard");
new CustomEvent("clipboard", {detail: {expectedStr: expectedStr}}) expect(dispatchEventSpy.args[0][0].detail.text).to.equal(expectedStr);
)).to.be.true;
}); });
}); });
@ -3587,7 +3586,7 @@ describe('Remote Frame Buffer protocol client', function () {
expectedData expectedData
)).to.be.true; )).to.be.true;
expect(dispatchEventSpy.calledOnceWith( expect(dispatchEventSpy.calledOnceWith(
new CustomEvent("clipboard", {detail: {expectedData: expectedData}}) new CustomEvent("clipboard", {detail: {text: expectedData}})
)).to.be.false; )).to.be.false;
}); });
it('should dispatch a clipboard event following unsuccessful async write clipboard', async function () { it('should dispatch a clipboard event following unsuccessful async write clipboard', async function () {
@ -3615,9 +3614,8 @@ describe('Remote Frame Buffer protocol client', function () {
expect(client._asyncClipboard.writeClipboard.calledOnceWith( expect(client._asyncClipboard.writeClipboard.calledOnceWith(
expectedData expectedData
)).to.be.true; )).to.be.true;
expect(dispatchEventSpy.calledOnceWith( expect(dispatchEventSpy.args[0][0].type).to.equal("clipboard");
new CustomEvent("clipboard", {detail: {expectedData: expectedData}}) expect(dispatchEventSpy.args[0][0].detail.text).to.equal(expectedData);
)).to.be.true;
}); });
describe('Handle Provide', function () { describe('Handle Provide', function () {
@ -3646,9 +3644,8 @@ describe('Remote Frame Buffer protocol client', function () {
expect(client._asyncClipboard.writeClipboard.calledOnceWith( expect(client._asyncClipboard.writeClipboard.calledOnceWith(
expectedData expectedData
)).to.be.true; )).to.be.true;
expect(dispatchEventSpy.calledOnceWith( expect(dispatchEventSpy.args[0][0].type).to.equal("clipboard");
new CustomEvent("clipboard", {detail: {expectedData: expectedData}}) expect(dispatchEventSpy.args[0][0].detail.text).to.equal(expectedData);
)).to.be.true;
}); });
it('should update clipboard with correct escape characters from a Provide message ', async function () { it('should update clipboard with correct escape characters from a Provide message ', async function () {
@ -3677,9 +3674,8 @@ describe('Remote Frame Buffer protocol client', function () {
expect(client._asyncClipboard.writeClipboard.calledOnceWith( expect(client._asyncClipboard.writeClipboard.calledOnceWith(
expectedData expectedData
)).to.be.true; )).to.be.true;
expect(dispatchEventSpy.calledOnceWith( expect(dispatchEventSpy.args[0][0].type).to.equal("clipboard");
new CustomEvent("clipboard", {detail: {expectedData: expectedData}}) expect(dispatchEventSpy.args[0][0].detail.text).to.equal(expectedData);
)).to.be.true;
}); });
it('should be able to handle large Provide messages', async function () { it('should be able to handle large Provide messages', async function () {
@ -3708,9 +3704,8 @@ describe('Remote Frame Buffer protocol client', function () {
expect(client._asyncClipboard.writeClipboard.calledOnceWith( expect(client._asyncClipboard.writeClipboard.calledOnceWith(
expectedData expectedData
)).to.be.true; )).to.be.true;
expect(dispatchEventSpy.calledOnceWith( expect(dispatchEventSpy.args[0][0].type).to.equal("clipboard");
new CustomEvent("clipboard", {detail: {expectedData: expectedData}}) expect(dispatchEventSpy.args[0][0].detail.text).to.equal(expectedData);
)).to.be.true;
}); });
}); });

8
utils/validate
View File

@ -50,14 +50,6 @@ for fn in "$@"; do
error=$(echo $line | cut -d ":" -f 4-) error=$(echo $line | cut -d ":" -f 4-)
case $error in case $error in
*"\"scrollbar-gutter\": Property \"scrollbar-gutter\" doesn't exist.")
# FIXME: https://github.com/validator/validator/issues/1788
echo "Ignoring below error on line ${line_start}," \
"the scrollbar-gutter property actually exist and is widely" \
"supported:"
echo $error
continue
;;
*"\"clip-path\": \"path("*) *"\"clip-path\": \"path("*)
# FIXME: https://github.com/validator/validator/issues/1786 # FIXME: https://github.com/validator/validator/issues/1786
echo "Ignoring below error on line ${line_start}," \ echo "Ignoring below error on line ${line_start}," \