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 298e86a [OPENMEETINGS-2002] confirmation is added to quick poll close
298e86a is described below
commit 298e86ab7c3c5d48c8fd3695e7af4ae534d11772
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Feb 15 18:22:43 2019 +0700
[OPENMEETINGS-2002] confirmation is added to quick poll close
---
.../apache/openmeetings/web/room/RoomPanel.html | 7 ++++--
.../org/apache/openmeetings/web/room/raw-room.js | 27 +++++++++++++++++++++-
2 files changed, 31 insertions(+), 3 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
index e09e5da..a0f3dda 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
@@ -67,7 +67,7 @@
</li>
</ul>
</div>
- <div id="exclusive-confirm"
wicket:message="title:1428,data-btn-ok:54,data-btn-cancel:lbl.cancel">
+ <div id="exclusive-confirm" wicket:message="title:1428,
data-btn-ok:54, data-btn-cancel:lbl.cancel">
<div style="padding: 4px;" class="ui-state-highlight
ui-corner-all">
<span class="ui-icon ui-icon-alert"
style="float:left; margin:12px 12px 20px 0;"></span><wicket:message key="1539"/>
</div>
@@ -78,7 +78,7 @@
<p><span class="ui-icon ui-icon-alert"
style="float:left; margin:12px 12px 20px 0;"></span><span
class="text"></span></p>
</div>
<div id="quick-vote-template">
- <div class="close clickable"><wicket:message key="85"
/></div>
+ <div class="close clickable"><wicket:message
key="85"/></div>
<div class="control pro">
<span class="badge">0</span>
</div>
@@ -86,6 +86,9 @@
<span class="badge">0</span>
</div>
</div>
+ <div id="quick-confirmation" wicket:message="title:832,
data-btn-ok:54, data-btn-cancel:lbl.cancel">
+ <wicket:message key="1419"/>
+ </div>
<div id="sharer" wicket:message="title:730">
<div>
<span class="label"><wicket:message
key="734"/></span>
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 733cc93..43a8dc5 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
@@ -186,6 +186,10 @@ var Room = (function() {
if (typeof(VideoManager) === 'object') {
VideoManager.destroy();
}
+ const _qconf = $('#quick-confirmation');
+ if (_qconf.dialog('instance')) {
+ _qconf.dialog('destroy');
+ }
$('.ui-dialog.user-video').remove();
$(window).off('keyup', _keyHandler);
$(document).off('click', _mouseHandler);
@@ -216,7 +220,28 @@ var Room = (function() {
close.off();
if (options.rights.includes('superModerator') ||
options.rights.includes('moderator') || options.rights.includes('presenter')) {
close.show().click(function() {
- quickPollAction('close');
+ const _qconf = $('#quick-confirmation');
+ _qconf.dialog({
+ resizable: false
+ , height: "auto"
+ , width: 400
+ , modal: true
+ , buttons: [
+ {
+ text:
_qconf.data('btn-ok')
+ , click:
function() {
+
quickPollAction('close');
+
$(this).dialog('close');
+ }
+ }
+ , {
+ text:
_qconf.data('btn-cancel')
+ , click:
function() {
+
$(this).dialog('close');
+ }
+ }
+ ]
+ });
});
} else {
close.hide();
