This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch java11-modules in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit ebcf4ab06a9f6ae0b48caaaf9698d38a9db06a70 Author: Maxim Solodovnik <[email protected]> AuthorDate: Wed Jun 29 14:48:04 2022 +0700 [OPENMEETINGS-2741] confirmation title is fixed --- openmeetings-web/src/main/front/wb/src/wb-area.js | 25 +++++++++++----------- openmeetings-web/src/main/front/wb/src/wb-tools.js | 14 ++++++------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/openmeetings-web/src/main/front/wb/src/wb-area.js b/openmeetings-web/src/main/front/wb/src/wb-area.js index 95937202c..5f7abef81 100644 --- a/openmeetings-web/src/main/front/wb/src/wb-area.js +++ b/openmeetings-web/src/main/front/wb/src/wb-area.js @@ -169,18 +169,19 @@ module.exports = class DrawWbArea extends WbAreaBase { .position({my: 'left top', collision: 'none', of: _getWbTab(wbId)}); }); link.append(OmUtil.tmpl('#wb-tab-close')); - li.find('button') - .confirmation({ - confirmationEvent: 'bla' - , onConfirm: function() { - const prevLi = li.prev() - , prevWbId = prevLi.length > 0 ? prevLi.find('a').data('wb-id') : -1; - OmUtil.wbAction({action: 'removeWb', data: { - wbId: wbId - , prevWbId: prevWbId - }}); - } - }); + const closeBtn = li.find('button'); + closeBtn.confirmation({ + title: closeBtn.attr('title') + , confirmationEvent: 'bla' + , onConfirm: function() { + const prevLi = li.prev() + , prevWbId = prevLi.length > 0 ? prevLi.find('a').data('wb-id') : -1; + OmUtil.wbAction({action: 'removeWb', data: { + wbId: wbId + , prevWbId: prevWbId + }}); + } + }); } function __initTab(elems) { const links = elems.find('a'); diff --git a/openmeetings-web/src/main/front/wb/src/wb-tools.js b/openmeetings-web/src/main/front/wb/src/wb-tools.js index 6b4e2238c..e299fa5e6 100644 --- a/openmeetings-web/src/main/front/wb/src/wb-tools.js +++ b/openmeetings-web/src/main/front/wb/src/wb-tools.js @@ -329,7 +329,8 @@ module.exports = class WbTools { switch (role) { case Role.PRESENTER: clearAll.confirmation({ - confirmationEvent: 'om-clear-all' + title: clearAll.attr('title') + , confirmationEvent: 'om-clear-all' , onConfirm: () => OmUtil.wbAction({action: 'clearAll', data: {wbId: wb.getId()}}) }).removeClass('disabled'); case Role.WHITEBOARD: @@ -348,11 +349,12 @@ module.exports = class WbTools { tools.find('.om-icon.math').click(function() { math.show(); }); - tools.find('.om-icon.clear-slide') - .confirmation({ - confirmationEvent: 'om-clear-slide' - , onConfirm: () => OmUtil.wbAction({action: 'clearSlide', data: {wbId: wb.getId(), slide: wb.slide}}) - }); + const clearSlide = tools.find('.om-icon.clear-slide'); + clearSlide.confirmation({ + title: clearSlide.attr('title') + , confirmationEvent: 'om-clear-slide' + , onConfirm: () => OmUtil.wbAction({action: 'clearSlide', data: {wbId: wb.getId(), slide: wb.slide}}) + }); tools.find('.om-icon.save').click(function() { OmUtil.wbAction({action: 'save', data: {wbId: wb.getId()}}); });
