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 2020/04/05 11:54:42 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2165] wb
delete/resize is fixed
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 8500f67 [OPENMEETINGS-2165] wb delete/resize is fixed
8500f67 is described below
commit 8500f673fed09340b85371a6820abcd4596e74b7
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sun Apr 5 18:54:19 2020 +0700
[OPENMEETINGS-2165] wb delete/resize is fixed
---
.../src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 4 ++--
.../main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js | 6 +++---
.../main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
index 6af9ad5..ecb6310 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
@@ -75,7 +75,7 @@
<div wicket:id="clipart" class="clickable om-icon big clipart" data-image="./public/cliparts/"></div>
</div>
</div>
- <div id="wb-area" class="tab-pane" role="tabpanel">
+ <div id="wb-area" class="wb-tab tab-pane" role="tabpanel">
<div class="wb-with-zoom">
<div class="wb-zoom-block pr-3 pl-3"></div>
<div class="scroll-container">
@@ -233,7 +233,7 @@
</div>
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-outline-primary">
+ <button type="button" class="btn btn-outline-primary btn-ok">
<wicket:message key="54"/>
</button>
<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
index 5b0a096..31af989 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
@@ -61,7 +61,7 @@ var DrawWbArea = function() {
}
function getActive() {
- const tab = tabs.find('.wb-tab-content .active');
+ const tab = tabs.find('.wb-tab-content .wb-tab.active');
if (tab.length === 1) {
return tab;
}
@@ -106,7 +106,7 @@ var DrawWbArea = function() {
if (role !== PRESENTER) {
$('.wb-tabbar ul.nav-tabs a.nav-link').removeClass('active');
link.addClass('active');
- $('.wb-tab-content.tab-content .tab-pane').removeClass('active');
+ $('.wb-tab-content .wb-tab').removeClass('active');
$('#' + link.attr('aria-controls')).addClass('active');
}
link[0].scrollIntoView();
@@ -223,7 +223,7 @@ var DrawWbArea = function() {
self.removeDeleteHandler();
}
__initTab(tabsNav.find('li'));
- tabs.find('.wb-tab-content .tab-pane').each(function() {
+ tabs.find('.wb-tab-content .wb-tab').each(function() {
$(this).data().setRole(role);
});
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
index 3329722..2ac954e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
@@ -277,7 +277,7 @@ var Wb = function() {
return !isNaN(parseInt(n)) && isFinite(n);
}
wbs.modal('show');
- wbs.find('.btn-primary').off().click(function() {
+ wbs.find('.btn-ok').off().click(function() {
const __w = wbsw.val(), __h = wbsh.val();
if (isNumeric(__w) && isNumeric(__h)) {
width = parseInt(__w);