This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit a543db56e25e8e8938cfab997310892b3dcb46c2 Merge: da495eb f6c1251 Author: Virtually Nick <[email protected]> AuthorDate: Sun Dec 19 18:35:32 2021 -0500 Merge 1.4.0 changes back to master. .../src/main/webapp/modules/ArrayBufferReader.js | 7 +- .../src/main/webapp/modules/ArrayBufferWriter.js | 19 +- .../src/main/webapp/modules/AudioPlayer.js | 43 +- .../src/main/webapp/modules/AudioRecorder.js | 57 +- .../src/main/webapp/modules/BlobReader.js | 23 +- .../src/main/webapp/modules/BlobWriter.js | 28 +- .../src/main/webapp/modules/Client.js | 217 +++--- .../src/main/webapp/modules/DataURIReader.js | 11 +- .../src/main/webapp/modules/Display.js | 759 ++++++++++++++------- .../src/main/webapp/modules/Event.js | 42 +- .../src/main/webapp/modules/InputSink.js | 7 +- .../src/main/webapp/modules/InputStream.js | 23 +- .../src/main/webapp/modules/IntegerPool.js | 11 +- .../src/main/webapp/modules/JSONReader.js | 12 +- .../src/main/webapp/modules/Keyboard.js | 163 +++-- .../src/main/webapp/modules/Layer.js | 434 ++++++++---- .../src/main/webapp/modules/Mouse.js | 140 ++-- .../src/main/webapp/modules/Object.js | 38 +- .../src/main/webapp/modules/OnScreenKeyboard.js | 122 ++-- .../src/main/webapp/modules/OutputStream.js | 17 +- .../src/main/webapp/modules/Parser.js | 11 +- .../src/main/webapp/modules/Position.js | 20 +- .../src/main/webapp/modules/RawAudioFormat.js | 10 +- .../src/main/webapp/modules/SessionRecording.js | 96 +-- .../src/main/webapp/modules/Status.js | 66 +- .../src/main/webapp/modules/StringReader.js | 23 +- .../src/main/webapp/modules/StringWriter.js | 35 +- .../src/main/webapp/modules/Touch.js | 34 +- .../src/main/webapp/modules/Tunnel.js | 127 ++-- .../src/main/webapp/modules/Version.js | 2 +- .../src/main/webapp/modules/VideoPlayer.js | 12 +- .../src/test/javascript/EventSpec.js | 4 +- 32 files changed, 1636 insertions(+), 977 deletions(-) diff --cc guacamole-common-js/src/main/webapp/modules/Layer.js index 3848bea,7040d1b..271a225 --- a/guacamole-common-js/src/main/webapp/modules/Layer.js +++ b/guacamole-common-js/src/main/webapp/modules/Layer.js @@@ -904,41 -1049,51 +1049,51 @@@ Guacamole.Layer.PLUS = 0xF /** * Channel mask for the composite operation "rin". - * Beware that WebKit-based browsers may leave the contents of the destionation + * Beware that WebKit-based browsers may leave the contents of the destination * layer where the source layer is transparent, despite the definition of this * operation. + * + * @type {!number} */ Guacamole.Layer.RIN = 0x1; /** * Channel mask for the composite operation "in". - * Beware that WebKit-based browsers may leave the contents of the destionation + * Beware that WebKit-based browsers may leave the contents of the destination * layer where the source layer is transparent, despite the definition of this * operation. + * + * @type {!number} */ Guacamole.Layer.IN = 0x4; /** * Channel mask for the composite operation "out". - * Beware that WebKit-based browsers may leave the contents of the destionation + * Beware that WebKit-based browsers may leave the contents of the destination * layer where the source layer is transparent, despite the definition of this * operation. + * + * @type {!number} */ Guacamole.Layer.OUT = 0x8; /** * Channel mask for the composite operation "ratop". - * Beware that WebKit-based browsers may leave the contents of the destionation + * Beware that WebKit-based browsers may leave the contents of the destination * layer where the source layer is transparent, despite the definition of this * operation. + * + * @type {!number} */ Guacamole.Layer.RATOP = 0x9; /** * Channel mask for the composite operation "src". - * Beware that WebKit-based browsers may leave the contents of the destionation + * Beware that WebKit-based browsers may leave the contents of the destination * layer where the source layer is transparent, despite the definition of this * operation. + * + * @type {!number} */ Guacamole.Layer.SRC = 0xC;
