This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 3676004 [OPENMEETINGS-2000] moving JS code to npm
3676004 is described below
commit 367600436bd875f4c1515757127235f24aa67df6
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Dec 24 12:17:32 2020 +0700
[OPENMEETINGS-2000] moving JS code to npm
---
.gitignore | 4 +
.../src/main/assembly/components/templates.xml | 2 +-
.../src/site/xdoc/BuildInstructions.xml | 2 +-
openmeetings-web/pom.xml | 46 +-
openmeetings-web/src/main/front/main/package.json | 18 +
openmeetings-web/src/main/front/main/src/index.js | 22 +
.../src/main/front/main/src/omutils.js | 83 +++
.../src/main/front/main/src/settings.js | 22 +
.../web/admin/configurations/admin-config.js | 2 +-
.../org/apache/openmeetings/web/common/main.js | 763 ---------------------
.../org/apache/openmeetings/web/room/raw-room.js | 2 +-
pom.xml | 12 +
12 files changed, 202 insertions(+), 776 deletions(-)
diff --git a/.gitignore b/.gitignore
index b1dd5bf..7611e31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,7 @@ openmeetings-server/web-server
# OSX files
.DS_Store
+
+node_modules
+package-lock.json
+
diff --git a/openmeetings-server/src/main/assembly/components/templates.xml
b/openmeetings-server/src/main/assembly/components/templates.xml
index 68adfa8..346d943 100644
--- a/openmeetings-server/src/main/assembly/components/templates.xml
+++ b/openmeetings-server/src/main/assembly/components/templates.xml
@@ -44,7 +44,7 @@
</excludes>
</fileSet>
<fileSet>
-
<directory>${project.parent.basedir}/openmeetings-web/target/generated-sources/main/java</directory>
+
<directory>${project.parent.basedir}/openmeetings-web/target/generated-sources/js</directory>
<outputDirectory>${om.webapp}/WEB-INF/classes</outputDirectory>
<includes>
<include>**/*.js</include>
diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions.xml
b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
index e13b213..4b032b8 100644
--- a/openmeetings-server/src/site/xdoc/BuildInstructions.xml
+++ b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
@@ -96,7 +96,7 @@ mvn install -P allModules,quick,mysql -pl
openmeetings-util,openmeetings-db,open
<p>You can further trim down the compile time
to just selected Javascript sections:</p>
<source>mvn minify:minify@room-js
minify:minify@interview-wb-js</source>
<p>And then copy them into the relevant folder,
for example if your run the Embedded Jetty:</p>
- <source>cp -R
target/generated-sources/main/java/org/apache/openmeetings/*
target/openmeetings-web-5.0.0-SNAPSHOT/WEB-INF/classes/org/apache/openmeetings/</source>
+ <source>cp -R
target/generated-sources/js/org/apache/openmeetings/*
target/openmeetings-web-6.0.0-SNAPSHOT/WEB-INF/classes/org/apache/openmeetings/</source>
</div>
</section>
<section name="Fix Proxy settings">
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index d75f93e..8974e3b 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -77,6 +77,34 @@
<build>
<plugins>
<plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-node</id>
+
<goals><goal>install-node-and-npm</goal></goals>
+ </execution>
+ <execution>
+ <id>main-install</id>
+ <goals><goal>npm</goal></goals>
+ <configuration>
+
<workingDirectory>src/main/front/main</workingDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>main</id>
+ <goals><goal>npm</goal></goals>
+ <configuration>
+ <arguments>run
build</arguments>
+
<workingDirectory>src/main/front/main</workingDirectory>
+ <environmentVariables>
+
<outDir>${project.build.directory}/generated-sources/js/org/apache/openmeetings/web/common/</outDir>
+ </environmentVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.samaxes.maven</groupId>
<artifactId>minify-maven-plugin</artifactId>
<version>${minify-maven-plugin.version}</version>
@@ -128,7 +156,7 @@
<jsSourceFile>raw-interview-area.js</jsSourceFile>
</jsSourceFiles>
<jsFinalFile>interviewwb.js</jsFinalFile>
-
<jsTargetDir>../generated-sources/main/java/org/apache/openmeetings/web/room/wb/</jsTargetDir>
+
<jsTargetDir>../generated-sources/js/org/apache/openmeetings/web/room/wb/</jsTargetDir>
<jsEngine>CLOSURE</jsEngine>
</configuration>
</execution>
@@ -167,7 +195,7 @@
<jsSourceFile>raw-wb-area.js</jsSourceFile>
</jsSourceFiles>
<jsFinalFile>wb.js</jsFinalFile>
-
<jsTargetDir>../generated-sources/main/java/org/apache/openmeetings/web/room/wb/</jsTargetDir>
+
<jsTargetDir>../generated-sources/js/org/apache/openmeetings/web/room/wb/</jsTargetDir>
<jsEngine>CLOSURE</jsEngine>
</configuration>
</execution>
@@ -183,14 +211,14 @@
<jsSourceFile>fileinput.js</jsSourceFile>
</jsSourceFiles>
<jsFinalFile>omfileinput.js</jsFinalFile>
-
<jsTargetDir>../generated-sources/main/java/org/apache/openmeetings/web/util/upload</jsTargetDir>
+
<jsTargetDir>../generated-sources/js/org/apache/openmeetings/web/util/upload</jsTargetDir>
<jsEngine>CLOSURE</jsEngine>
<cssSourceDir>../java/org/apache/openmeetings/web/util/upload</cssSourceDir>
<cssSourceFiles>
<cssSourceFile>fileinput.css</cssSourceFile>
</cssSourceFiles>
<cssFinalFile>omfileinput.css</cssFinalFile>
-
<cssTargetDir>../generated-sources/main/java/org/apache/openmeetings/web/util/upload</cssTargetDir>
+
<cssTargetDir>../generated-sources/js/org/apache/openmeetings/web/util/upload</cssTargetDir>
</configuration>
</execution>
<execution>
@@ -211,7 +239,7 @@
</jsSourceFiles>
<jsFinalFile>room.js</jsFinalFile>
<jsEngine>CLOSURE</jsEngine>
-
<jsTargetDir>../generated-sources/main/java/org/apache/openmeetings/web/room</jsTargetDir>
+
<jsTargetDir>../generated-sources/js/org/apache/openmeetings/web/room</jsTargetDir>
</configuration>
</execution>
<execution>
@@ -230,7 +258,7 @@
</jsSourceFiles>
<jsFinalFile>settings.js</jsFinalFile>
<jsEngine>CLOSURE</jsEngine>
-
<jsTargetDir>../generated-sources/main/java/org/apache/openmeetings/web/room</jsTargetDir>
+
<jsTargetDir>../generated-sources/js/org/apache/openmeetings/web/room</jsTargetDir>
</configuration>
</execution>
<execution>
@@ -246,7 +274,7 @@
</jsSourceFiles>
<jsFinalFile>nettest.js</jsFinalFile>
<jsEngine>CLOSURE</jsEngine>
-
<jsTargetDir>../generated-sources/main/java/org/apache/openmeetings/web/room</jsTargetDir>
+
<jsTargetDir>../generated-sources/js/org/apache/openmeetings/web/room</jsTargetDir>
</configuration>
</execution>
<execution>
@@ -263,7 +291,7 @@
</jsSourceFiles>
<jsFinalFile>chat.js</jsFinalFile>
<jsEngine>CLOSURE</jsEngine>
-
<jsTargetDir>../generated-sources/main/java/org/apache/openmeetings/web/user/chat</jsTargetDir>
+
<jsTargetDir>../generated-sources/js/org/apache/openmeetings/web/user/chat</jsTargetDir>
</configuration>
</execution>
</executions>
@@ -336,7 +364,7 @@
<filtering>true</filtering>
</webResource>
<webResource>
-
<directory>${project.build.directory}/generated-sources/main/java/</directory>
+
<directory>${project.build.directory}/generated-sources/js/</directory>
<targetPath>WEB-INF/classes</targetPath>
</webResource>
</webResources>
diff --git a/openmeetings-web/src/main/front/main/package.json
b/openmeetings-web/src/main/front/main/package.json
new file mode 100644
index 0000000..56c4177
--- /dev/null
+++ b/openmeetings-web/src/main/front/main/package.json
@@ -0,0 +1,18 @@
+{
+ "name": "main",
+ "version": "1.0.0",
+ "description": "Common Utility Modules",
+ "main": "src/index.js",
+ "scripts": {
+ "build-dev": "browserify src/index.js --transform-key=staging -o
${outDir}${npm_package_name}.js",
+ "build-prod": "browserify src/index.js --transform-key=production -p
tinyify -o ${outDir}${npm_package_name}.min.js",
+ "build": "npm run build-dev && npm run build-prod"
+ },
+ "author": "",
+ "license": "Apache-2.0",
+ "rat-license": "Licensed under the Apache License, Version 2.0 (the
\"License\") http://www.apache.org/licenses/LICENSE-2.0";,
+ "devDependencies": {
+ "browserify": "^17.0.0",
+ "tinyify": "^3.0.0"
+ }
+}
diff --git a/openmeetings-web/src/main/front/main/src/index.js
b/openmeetings-web/src/main/front/main/src/index.js
new file mode 100644
index 0000000..f1cceb3
--- /dev/null
+++ b/openmeetings-web/src/main/front/main/src/index.js
@@ -0,0 +1,22 @@
+/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
+Wicket.BrowserInfo.collectExtraInfo = function(info) {
+ const l = window.location;
+ info.codebase = l.origin + l.pathname;
+ info.settings = Settings.load();
+};
+
+Object.assign(window, {
+ Settings: require('./settings')
+ , OmUtil: require('./omutils')
+ //Fix to move the close icon on top of the .ui-dialog-titlebar cause
otherwise
+ // touch-events are broken and you won't be able to close the dialog
+ , fixJQueryUIDialogTouch: function(dialog) {
+
dialog.parent().find('.ui-dialog-titlebar-close').appendTo(dialog.parent());
+ }
+ , showBusyIndicator: function() {
+ $('#busy-indicator').show();
+ }
+ , hideBusyIndicator: function() {
+ $('#busy-indicator').hide();
+ }
+});
diff --git a/openmeetings-web/src/main/front/main/src/omutils.js
b/openmeetings-web/src/main/front/main/src/omutils.js
new file mode 100644
index 0000000..eebc3df
--- /dev/null
+++ b/openmeetings-web/src/main/front/main/src/omutils.js
@@ -0,0 +1,83 @@
+/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
+let options, alertId = 0;
+
+function _init(_options) {
+ options = _options;
+}
+function _tmpl(tmplId, newId) {
+ return $(tmplId).clone().attr('id', newId || '');
+}
+function __alert(level, msg, autohideAfter) {
+ const holder = $('#alert-holder');
+ const curId = 'om-alert' + alertId++;
+ holder.append($(`<div id="${curId}" class="alert alert-${level}
alert-dismissible fade show m-0" role="alert">${msg}
+ <button type="button" class="close"
data-dismiss="alert" aria-label="${holder.data('lbl-close')}">
+ <span aria-hidden="true">×</span>
+ </button>
+ </div>`));
+ if (autohideAfter > 0) {
+ setTimeout(() => { $(`#${curId}`).alert('close');},
autohideAfter);
+ }
+}
+function _error(msg, noAlert) {
+ if (typeof(msg) === 'object') {
+ msg = msg.name + ': ' + msg.message;
+ }
+ if (noAlert !== true) {
+ __alert('danger', msg, 20000);
+ }
+ return console.error(msg);
+}
+function _debugEnabled() {
+ return !!options && !!options.debug;
+}
+function _info() {
+ if (_debugEnabled()) {
+ console.info.apply(this, arguments);
+ }
+}
+function _log() {
+ if (_debugEnabled()) {
+ console.log.apply(this, arguments);
+ }
+}
+function _sendMessage(_m, _base) {
+ const base = _base || {}
+ , m = _m || {}
+ , msg = JSON.stringify($.extend({}, base, m));
+ Wicket.WebSocket.send(msg);
+}
+
+module.exports = {
+ init: _init
+ , tmpl: _tmpl
+ , debugEnabled: _debugEnabled
+ , enableDebug: function() {
+ if (!!options) {
+ options.debug = true;
+ }
+ }
+ , sendMessage: _sendMessage
+ , alert: __alert
+ , error: _error
+ , info: _info
+ , log: _log
+ , wbAction: function(_m) {
+ _sendMessage(_m, {area: 'room', type: 'wb'});
+ }
+ , roomAction: function(_m) {
+ _sendMessage(_m, {area: 'room', type: 'room'});
+ }
+ , setCssVar: function(key, val) {
+ ($('body')[0]).style.setProperty(key, val);
+ }
+ , ping: function() {
+ setTimeout(() => _sendMessage({type: 'ping'}), 30000);
+ }
+ , notify: function(msg, tag) {
+ const opts = {
+ tag: tag
+ };
+ new Notification(msg, opts);
+ }
+};
diff --git a/openmeetings-web/src/main/front/main/src/settings.js
b/openmeetings-web/src/main/front/main/src/settings.js
new file mode 100644
index 0000000..e075c98
--- /dev/null
+++ b/openmeetings-web/src/main/front/main/src/settings.js
@@ -0,0 +1,22 @@
+/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
+const key = 'openmeetings';
+function _load() {
+ let s = {};
+ try {
+ s = JSON.parse(localStorage.getItem(key)) || s;
+ } catch (e) {
+ // no-op
+ }
+ return s;
+}
+function _save(s) {
+ const _s = JSON.stringify(s);
+ localStorage.setItem(key, _s);
+ return _s;
+}
+
+module.exports = {
+ isRtl: 'rtl' === $('html').attr('dir')
+ , load: _load
+ , save: _save
+};
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/admin-config.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/admin-config.js
index edaf85f..2c25869 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/admin-config.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/admin-config.js
@@ -15,7 +15,7 @@ function addOmAdminConfigHandlers() {
if (evt.shiftKey) {
val += 'Shift+';
}
- const code = OmUtil.getKeyCode(evt);
+ const code = evt.code;
if (typeof(code) === 'undefined') {
return;
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
deleted file mode 100644
index 15cef54..0000000
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
+++ /dev/null
@@ -1,763 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
-var Settings = (function() {
- const key = 'openmeetings';
- function _load() {
- let s = {};
- try {
- s = JSON.parse(localStorage.getItem(key)) || s;
- } catch (e) {
- // no-op
- }
- return s;
- }
- function _save(s) {
- const _s = JSON.stringify(s);
- localStorage.setItem(key, _s);
- return _s;
- }
-
- return {
- isRtl: 'rtl' === $('html').attr('dir')
- , load: _load
- , save: _save
- };
-})();
-var OmUtil = (function() {
- let options, alertId = 0;
- const self = {};
-
- function _init(_options) {
- options = _options;
- }
- function _tmpl(tmplId, newId) {
- return $(tmplId).clone().attr('id', newId || '');
- }
- function __alert(level, msg, autohideAfter) {
- const holder = $('#alert-holder');
- const curId = 'om-alert' + alertId++;
- holder.append($(`<div id="${curId}" class="alert alert-${level}
alert-dismissible fade show m-0" role="alert">${msg}
- <button type="button" class="close"
data-dismiss="alert" aria-label="${holder.data('lbl-close')}">
- <span aria-hidden="true">×</span>
- </button>
- </div>`));
- if (autohideAfter > 0) {
- setTimeout(() => { $(`#${curId}`).alert('close');},
autohideAfter);
- }
- }
- function _error(msg, noAlert) {
- if (typeof(msg) === 'object') {
- msg = msg.name + ': ' + msg.message;
- }
- if (noAlert !== true) {
- __alert('danger', msg, 20000);
- }
- return console.error(msg);
- }
- function _debugEnabled() {
- return !!options && !!options.debug;
- }
- function _info() {
- if (_debugEnabled()) {
- console.info.apply(this, arguments);
- }
- }
- function _log() {
- if (_debugEnabled()) {
- console.log.apply(this, arguments);
- }
- }
-
- self.init = _init;
- self.tmpl = _tmpl;
- self.debugEnabled = _debugEnabled;
- self.enableDebug = function() {
- if (!!options) {
- options.debug = true;
- }
- };
- self.sendMessage = function(_m, _base) {
- const base = _base || {}
- , m = _m || {}
- , msg = JSON.stringify($.extend({}, base, m));
- Wicket.WebSocket.send(msg);
- };
- self.alert = __alert;
- self.error = _error;
- self.info = _info;
- self.log = _log;
- self.wbAction = function(_m) {
- self.sendMessage(_m, {area: 'room', type: 'wb'});
- };
- self.roomAction = function(_m) {
- self.sendMessage(_m, {area: 'room', type: 'room'});
- };
- self.getKeyCode = function(evt) {
- let code = evt.code;
- if (typeof (code) === 'undefined') {
- const codeInfo = window.keyCodeToInfoTable[evt.keyCode];
- if (typeof(codeInfo) === 'object') {
- code = codeInfo.code;
- }
- }
- return code;
- };
- self.setCssVar = function(key, val) {
- ($('body')[0]).style.setProperty(key, val);
- };
- self.ping = function() {
- setTimeout(() => OmUtil.sendMessage({type: 'ping'}), 30000);
- };
- self.notify = function(msg, tag) {
- const opts = {
- tag: tag
- };
- new Notification(msg, opts);
- }
- return self;
-})();
-Wicket.BrowserInfo.collectExtraInfo = function(info) {
- const l = window.location;
- info.codebase = l.origin + l.pathname;
- info.settings = Settings.load();
-};
-//Fix to move the close icon on top of the .ui-dialog-titlebar cause otherwise
-// touch-events are broken and you won't be able to close the dialog
-function fixJQueryUIDialogTouch (dialog) {
-
dialog.parent().find('.ui-dialog-titlebar-close').appendTo(dialog.parent());
-}
-function showBusyIndicator() {
- $('#busy-indicator').show();
-}
-function hideBusyIndicator() {
- $('#busy-indicator').hide();
-}
-(function() {
- // https://github.com/inexorabletash/polyfill/blob/master/LICENSE.md
- // Licensed MIT
- // the below helper table is taken from here
https://inexorabletash.github.io/polyfill/demos/keyboard.html
- var STANDARD = KeyboardEvent.DOM_KEY_LOCATION_STANDARD, LEFT =
KeyboardEvent.DOM_KEY_LOCATION_LEFT, RIGHT =
KeyboardEvent.DOM_KEY_LOCATION_RIGHT, NUMPAD =
KeyboardEvent.DOM_KEY_LOCATION_NUMPAD;
-
- window.keyCodeToInfoTable = {
- // 0x01 - VK_LBUTTON
- // 0x02 - VK_RBUTTON
- 0x03: {
- code: 'Cancel'
- }, // [USB: 0x9b] char \x0018 ??? (Not in D3E)
- // 0x04 - VK_MBUTTON
- // 0x05 - VK_XBUTTON1
- // 0x06 - VK_XBUTTON2
- 0x06: {
- code: 'Help'
- }, // [USB: 0x75] ???
- // 0x07 - undefined
- 0x08: {
- code: 'Backspace'
- }, // [USB: 0x2a] Labelled Delete on Macintosh keyboards.
- 0x09: {
- code: 'Tab'
- }, // [USB: 0x2b]
- // 0x0A-0x0B - reserved
- 0X0C: {
- code: 'Clear'
- }, // [USB: 0x9c] NumPad Center (Not in D3E)
- 0X0D: {
- code: 'Enter'
- }, // [USB: 0x28]
- // 0x0E-0x0F - undefined
-
- 0x10: {
- code: 'Shift'
- },
- 0x11: {
- code: 'Control'
- },
- 0x12: {
- code: 'Alt'
- },
- 0x13: {
- code: 'Pause'
- }, // [USB: 0x48]
- 0x14: {
- code: 'CapsLock'
- }, // [USB: 0x39]
- 0x15: {
- code: 'KanaMode'
- }, // [USB: 0x88]
- 0x16: {
- code: 'Lang1'
- }, // [USB: 0x90]
- // 0x17: VK_JUNJA
- // 0x18: VK_FINAL
- 0x19: {
- code: 'Lang2'
- }, // [USB: 0x91]
- // 0x1A - undefined
- 0x1B: {
- code: 'Escape'
- }, // [USB: 0x29]
- 0x1C: {
- code: 'Convert'
- }, // [USB: 0x8a]
- 0x1D: {
- code: 'NonConvert'
- }, // [USB: 0x8b]
- 0x1E: {
- code: 'Accept'
- }, // [USB: ????]
- 0x1F: {
- code: 'ModeChange'
- }, // [USB: ????]
-
- 0x20: {
- code: 'Space'
- }, // [USB: 0x2c]
- 0x21: {
- code: 'PageUp'
- }, // [USB: 0x4b]
- 0x22: {
- code: 'PageDown'
- }, // [USB: 0x4e]
- 0x23: {
- code: 'End'
- }, // [USB: 0x4d]
- 0x24: {
- code: 'Home'
- }, // [USB: 0x4a]
- 0x25: {
- code: 'ArrowLeft'
- }, // [USB: 0x50]
- 0x26: {
- code: 'ArrowUp'
- }, // [USB: 0x52]
- 0x27: {
- code: 'ArrowRight'
- }, // [USB: 0x4f]
- 0x28: {
- code: 'ArrowDown'
- }, // [USB: 0x51]
- 0x29: {
- code: 'Select'
- }, // (Not in D3E)
- 0x2A: {
- code: 'Print'
- }, // (Not in D3E)
- 0x2B: {
- code: 'Execute'
- }, // [USB: 0x74] (Not in D3E)
- 0x2C: {
- code: 'PrintScreen'
- }, // [USB: 0x46]
- 0x2D: {
- code: 'Insert'
- }, // [USB: 0x49]
- 0x2E: {
- code: 'Delete'
- }, // [USB: 0x4c]
- 0x2F: {
- code: 'Help'
- }, // [USB: 0x75] ???
-
- 0x30: {
- code: 'Digit0',
- keyCap: '0'
- }, // [USB: 0x27] 0)
- 0x31: {
- code: 'Digit1',
- keyCap: '1'
- }, // [USB: 0x1e] 1!
- 0x32: {
- code: 'Digit2',
- keyCap: '2'
- }, // [USB: 0x1f] 2@
- 0x33: {
- code: 'Digit3',
- keyCap: '3'
- }, // [USB: 0x20] 3#
- 0x34: {
- code: 'Digit4',
- keyCap: '4'
- }, // [USB: 0x21] 4$
- 0x35: {
- code: 'Digit5',
- keyCap: '5'
- }, // [USB: 0x22] 5%
- 0x36: {
- code: 'Digit6',
- keyCap: '6'
- }, // [USB: 0x23] 6^
- 0x37: {
- code: 'Digit7',
- keyCap: '7'
- }, // [USB: 0x24] 7&
- 0x38: {
- code: 'Digit8',
- keyCap: '8'
- }, // [USB: 0x25] 8*
- 0x39: {
- code: 'Digit9',
- keyCap: '9'
- }, // [USB: 0x26] 9(
- // 0x3A-0x40 - undefined
-
- 0x41: {
- code: 'KeyA',
- keyCap: 'a'
- }, // [USB: 0x04]
- 0x42: {
- code: 'KeyB',
- keyCap: 'b'
- }, // [USB: 0x05]
- 0x43: {
- code: 'KeyC',
- keyCap: 'c'
- }, // [USB: 0x06]
- 0x44: {
- code: 'KeyD',
- keyCap: 'd'
- }, // [USB: 0x07]
- 0x45: {
- code: 'KeyE',
- keyCap: 'e'
- }, // [USB: 0x08]
- 0x46: {
- code: 'KeyF',
- keyCap: 'f'
- }, // [USB: 0x09]
- 0x47: {
- code: 'KeyG',
- keyCap: 'g'
- }, // [USB: 0x0a]
- 0x48: {
- code: 'KeyH',
- keyCap: 'h'
- }, // [USB: 0x0b]
- 0x49: {
- code: 'KeyI',
- keyCap: 'i'
- }, // [USB: 0x0c]
- 0x4A: {
- code: 'KeyJ',
- keyCap: 'j'
- }, // [USB: 0x0d]
- 0x4B: {
- code: 'KeyK',
- keyCap: 'k'
- }, // [USB: 0x0e]
- 0x4C: {
- code: 'KeyL',
- keyCap: 'l'
- }, // [USB: 0x0f]
- 0x4D: {
- code: 'KeyM',
- keyCap: 'm'
- }, // [USB: 0x10]
- 0x4E: {
- code: 'KeyN',
- keyCap: 'n'
- }, // [USB: 0x11]
- 0x4F: {
- code: 'KeyO',
- keyCap: 'o'
- }, // [USB: 0x12]
-
- 0x50: {
- code: 'KeyP',
- keyCap: 'p'
- }, // [USB: 0x13]
- 0x51: {
- code: 'KeyQ',
- keyCap: 'q'
- }, // [USB: 0x14]
- 0x52: {
- code: 'KeyR',
- keyCap: 'r'
- }, // [USB: 0x15]
- 0x53: {
- code: 'KeyS',
- keyCap: 's'
- }, // [USB: 0x16]
- 0x54: {
- code: 'KeyT',
- keyCap: 't'
- }, // [USB: 0x17]
- 0x55: {
- code: 'KeyU',
- keyCap: 'u'
- }, // [USB: 0x18]
- 0x56: {
- code: 'KeyV',
- keyCap: 'v'
- }, // [USB: 0x19]
- 0x57: {
- code: 'KeyW',
- keyCap: 'w'
- }, // [USB: 0x1a]
- 0x58: {
- code: 'KeyX',
- keyCap: 'x'
- }, // [USB: 0x1b]
- 0x59: {
- code: 'KeyY',
- keyCap: 'y'
- }, // [USB: 0x1c]
- 0x5A: {
- code: 'KeyZ',
- keyCap: 'z'
- }, // [USB: 0x1d]
- 0x5B: {
- code: 'MetaLeft',
- location: LEFT
- }, // [USB: 0xe3]
- 0x5C: {
- code: 'MetaRight',
- location: RIGHT
- }, // [USB: 0xe7]
- 0x5D: {
- code: 'ContextMenu'
- }, // [USB: 0x65] Context Menu
- // 0x5E - reserved
- 0x5F: {
- code: 'Standby'
- }, // [USB: 0x82] Sleep
-
- 0x60: {
- code: 'Numpad0',
- keyCap: '0',
- location: NUMPAD
- }, // [USB: 0x62]
- 0x61: {
- code: 'Numpad1',
- keyCap: '1',
- location: NUMPAD
- }, // [USB: 0x59]
- 0x62: {
- code: 'Numpad2',
- keyCap: '2',
- location: NUMPAD
- }, // [USB: 0x5a]
- 0x63: {
- code: 'Numpad3',
- keyCap: '3',
- location: NUMPAD
- }, // [USB: 0x5b]
- 0x64: {
- code: 'Numpad4',
- keyCap: '4',
- location: NUMPAD
- }, // [USB: 0x5c]
- 0x65: {
- code: 'Numpad5',
- keyCap: '5',
- location: NUMPAD
- }, // [USB: 0x5d]
- 0x66: {
- code: 'Numpad6',
- keyCap: '6',
- location: NUMPAD
- }, // [USB: 0x5e]
- 0x67: {
- code: 'Numpad7',
- keyCap: '7',
- location: NUMPAD
- }, // [USB: 0x5f]
- 0x68: {
- code: 'Numpad8',
- keyCap: '8',
- location: NUMPAD
- }, // [USB: 0x60]
- 0x69: {
- code: 'Numpad9',
- keyCap: '9',
- location: NUMPAD
- }, // [USB: 0x61]
- 0x6A: {
- code: 'NumpadMultiply',
- keyCap: '*',
- location: NUMPAD
- }, // [USB: 0x55]
- 0x6B: {
- code: 'NumpadAdd',
- keyCap: '+',
- location: NUMPAD
- }, // [USB: 0x57]
- 0x6C: {
- code: 'NumpadComma',
- keyCap: ',',
- location: NUMPAD
- }, // [USB: 0x85]
- 0x6D: {
- code: 'NumpadSubtract',
- keyCap: '-',
- location: NUMPAD
- }, // [USB: 0x56]
- 0x6E: {
- code: 'NumpadDecimal',
- keyCap: '.',
- location: NUMPAD
- }, // [USB: 0x63]
- 0x6F: {
- code: 'NumpadDivide',
- keyCap: '/',
- location: NUMPAD
- }, // [USB: 0x54]
-
- 0x70: {
- code: 'F1'
- }, // [USB: 0x3a]
- 0x71: {
- code: 'F2'
- }, // [USB: 0x3b]
- 0x72: {
- code: 'F3'
- }, // [USB: 0x3c]
- 0x73: {
- code: 'F4'
- }, // [USB: 0x3d]
- 0x74: {
- code: 'F5'
- }, // [USB: 0x3e]
- 0x75: {
- code: 'F6'
- }, // [USB: 0x3f]
- 0x76: {
- code: 'F7'
- }, // [USB: 0x40]
- 0x77: {
- code: 'F8'
- }, // [USB: 0x41]
- 0x78: {
- code: 'F9'
- }, // [USB: 0x42]
- 0x79: {
- code: 'F10'
- }, // [USB: 0x43]
- 0x7A: {
- code: 'F11'
- }, // [USB: 0x44]
- 0x7B: {
- code: 'F12'
- }, // [USB: 0x45]
- 0x7C: {
- code: 'F13'
- }, // [USB: 0x68]
- 0x7D: {
- code: 'F14'
- }, // [USB: 0x69]
- 0x7E: {
- code: 'F15'
- }, // [USB: 0x6a]
- 0x7F: {
- code: 'F16'
- }, // [USB: 0x6b]
-
- 0x80: {
- code: 'F17'
- }, // [USB: 0x6c]
- 0x81: {
- code: 'F18'
- }, // [USB: 0x6d]
- 0x82: {
- code: 'F19'
- }, // [USB: 0x6e]
- 0x83: {
- code: 'F20'
- }, // [USB: 0x6f]
- 0x84: {
- code: 'F21'
- }, // [USB: 0x70]
- 0x85: {
- code: 'F22'
- }, // [USB: 0x71]
- 0x86: {
- code: 'F23'
- }, // [USB: 0x72]
- 0x87: {
- code: 'F24'
- }, // [USB: 0x73]
- // 0x88-0x8F - unassigned
-
- 0x90: {
- code: 'NumLock',
- location: NUMPAD
- }, // [USB: 0x53]
- 0x91: {
- code: 'ScrollLock'
- }, // [USB: 0x47]
- // 0x92-0x96 - OEM specific
- // 0x97-0x9F - unassigned
-
- // NOTE: 0xA0-0xA5 usually mapped to 0x10-0x12 in browsers
- 0xA0: {
- code: 'ShiftLeft',
- location: LEFT
- }, // [USB: 0xe1]
- 0xA1: {
- code: 'ShiftRight',
- location: RIGHT
- }, // [USB: 0xe5]
- 0xA2: {
- code: 'ControlLeft',
- location: LEFT
- }, // [USB: 0xe0]
- 0xA3: {
- code: 'ControlRight',
- location: RIGHT
- }, // [USB: 0xe4]
- 0xA4: {
- code: 'AltLeft',
- location: LEFT
- }, // [USB: 0xe2]
- 0xA5: {
- code: 'AltRight',
- location: RIGHT
- }, // [USB: 0xe6]
-
- 0xA6: {
- code: 'BrowserBack'
- }, // [USB: 0x0c/0x0224]
- 0xA7: {
- code: 'BrowserForward'
- }, // [USB: 0x0c/0x0225]
- 0xA8: {
- code: 'BrowserRefresh'
- }, // [USB: 0x0c/0x0227]
- 0xA9: {
- code: 'BrowserStop'
- }, // [USB: 0x0c/0x0226]
- 0xAA: {
- code: 'BrowserSearch'
- }, // [USB: 0x0c/0x0221]
- 0xAB: {
- code: 'BrowserFavorites'
- }, // [USB: 0x0c/0x0228]
- 0xAC: {
- code: 'BrowserHome'
- }, // [USB: 0x0c/0x0222]
- 0xAD: {
- code: 'AudioVolumeMute'
- }, // [USB: 0x7f]
- 0xAE: {
- code: 'AudioVolumeDown'
- }, // [USB: 0x81]
- 0xAF: {
- code: 'AudioVolumeUp'
- }, // [USB: 0x80]
-
- 0xB0: {
- code: 'MediaTrackNext'
- }, // [USB: 0x0c/0x00b5]
- 0xB1: {
- code: 'MediaTrackPrevious'
- }, // [USB: 0x0c/0x00b6]
- 0xB2: {
- code: 'MediaStop'
- }, // [USB: 0x0c/0x00b7]
- 0xB3: {
- code: 'MediaPlayPause'
- }, // [USB: 0x0c/0x00cd]
- 0xB4: {
- code: 'LaunchMail'
- }, // [USB: 0x0c/0x018a]
- 0xB5: {
- code: 'MediaSelect'
- },
- 0xB6: {
- code: 'LaunchApp1'
- },
- 0xB7: {
- code: 'LaunchApp2'
- },
- // 0xB8-0xB9 - reserved
- 0xBA: {
- code: 'Semicolon',
- keyCap: ';'
- }, // [USB: 0x33] ;: (US Standard 101)
- 0xBB: {
- code: 'Equal',
- keyCap: '='
- }, // [USB: 0x2e] =+
- 0xBC: {
- code: 'Comma',
- keyCap: ','
- }, // [USB: 0x36] ,<
- 0xBD: {
- code: 'Minus',
- keyCap: '-'
- }, // [USB: 0x2d] -_
- 0xBE: {
- code: 'Period',
- keyCap: '.'
- }, // [USB: 0x37] .>
- 0xBF: {
- code: 'Slash',
- keyCap: '/'
- }, // [USB: 0x38] /? (US Standard 101)
-
- 0xC0: {
- code: 'Backquote',
- keyCap: '`'
- }, // [USB: 0x35] `~ (US Standard 101)
- // 0xC1-0xCF - reserved
-
- // 0xD0-0xD7 - reserved
- // 0xD8-0xDA - unassigned
- 0xDB: {
- code: 'BracketLeft',
- keyCap: '['
- }, // [USB: 0x2f] [{ (US Standard 101)
- 0xDC: {
- code: 'Backslash',
- keyCap: '\\'
- }, // [USB: 0x31] \| (US Standard 101)
- 0xDD: {
- code: 'BracketRight',
- keyCap: ']'
- }, // [USB: 0x30] ]} (US Standard 101)
- 0xDE: {
- code: 'Quote',
- keyCap: '\''
- }, // [USB: 0x34] '" (US Standard 101)
- // 0xDF - miscellaneous/varies
-
- // 0xE0 - reserved
- // 0xE1 - OEM specific
- 0xE2: {
- code: 'IntlBackslash',
- keyCap: '\\'
- }, // [USB: 0x64] \| (UK Standard 102)
- // 0xE3-0xE4 - OEM specific
- 0xE5: {
- code: 'Process'
- }, // (Not in D3E)
- // 0xE6 - OEM specific
- // 0xE7 - VK_PACKET
- // 0xE8 - unassigned
- // 0xE9-0xEF - OEM specific
-
- // 0xF0-0xF5 - OEM specific
- 0xF6: {
- code: 'Attn'
- }, // [USB: 0x9a] (Not in D3E)
- 0xF7: {
- code: 'CrSel'
- }, // [USB: 0xa3] (Not in D3E)
- 0xF8: {
- code: 'ExSel'
- }, // [USB: 0xa4] (Not in D3E)
- 0xF9: {
- code: 'EraseEof'
- }, // (Not in D3E)
- 0xFA: {
- code: 'Play'
- }, // (Not in D3E)
- 0xFB: {
- code: 'ZoomToggle'
- }, // (Not in D3E)
- // 0xFC - VK_NONAME - reserved
- // 0xFD - VK_PA1
- 0xFE: {
- code: 'Clear'
- }
- // [USB: 0x9c] (Not in D3E)
- };
-})();
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
index 0d349c2..bcd27c3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
@@ -78,7 +78,7 @@ var Room = (function() {
}
}
function __keyPressed(hotkey, e) {
- const code = OmUtil.getKeyCode(e);
+ const code = e.code;
return hotkey.alt === e.altKey
&& hotkey.ctrl === e.ctrlKey
&& hotkey.shift === e.shiftKey
diff --git a/pom.xml b/pom.xml
index a94b28b..732fb07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@
<jacoco-maven-plugin.versoin>0.8.6</jacoco-maven-plugin.versoin>
<forbiddenapis.version>3.1</forbiddenapis.version>
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
+
<frontend-maven-plugin.version>1.11.0</frontend-maven-plugin.version>
<!-- dependency versions -->
<junit.version>5.7.0</junit.version>
<wicket.version>9.2.0</wicket.version>
@@ -1035,6 +1036,8 @@
<excludes>
<exclude>**/*.mp3</exclude>
<exclude>**/localhost.jks</exclude>
+
<exclude>**/node_modules/**</exclude>
+
<exclude>**/package-lock.json</exclude>
</excludes>
</configuration>
</plugin>
@@ -1103,6 +1106,15 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+
<artifactId>frontend-maven-plugin</artifactId>
+
<version>${frontend-maven-plugin.version}</version>
+ <configuration>
+
<nodeVersion>v14.15.3</nodeVersion>
+
<installDirectory>${project.build.directory}</installDirectory>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
