You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/07/26 06:18:00 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1908] only send
event if activation was initiated by user
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 00d9b15 [OPENMEETINGS-1908] only send event if activation was initiated by user
00d9b15 is described below
commit 00d9b154b1957e61637048bd562ef0fbceaf5a57
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jul 26 13:17:29 2018 +0700
[OPENMEETINGS-1908] only send event if activation was initiated by user
---
.../src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
index f26c25f..06e0461 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
@@ -166,7 +166,10 @@ var DrawWbArea = function() {
return res;
}
, activate: function(e, ui) {
- wbAction('activateWb', JSON.stringify({wbId: ui.newTab.data('wb-id')}));
+ //only send `activateWb` event if activation was initiated by user
+ if (e.originalEvent && e.originalEvent.type === 'click') {
+ wbAction('activateWb', JSON.stringify({wbId: ui.newTab.data('wb-id')}));
+ }
}
});
scroll = tabs.find('.scroll-container');