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 2017/08/25 02:06:34 UTC
openmeetings git commit: [OPENMEETINGS-1644] basic mute
Repository: openmeetings
Updated Branches:
refs/heads/master 8914bf4c2 -> 53ce7cf03
[OPENMEETINGS-1644] basic mute
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/53ce7cf0
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/53ce7cf0
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/53ce7cf0
Branch: refs/heads/master
Commit: 53ce7cf03921b20fd579b9768cf5034899c82330
Parents: 8914bf4
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Aug 25 09:06:27 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Aug 25 09:06:27 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/web/room/room.js | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/53ce7cf0/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
index 75f4dfb..26a7c03 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
@@ -206,23 +206,32 @@ var Video = (function() {
if (!VideoUtil.isSharing(c)) {
v.parent().find('.ui-dialog-titlebar-buttonpane').append($('#video-volume-btn').children().clone());
var volume = v.parent().find('.dropdown-menu.video.volume');
+ let slider = v.parent().find('.slider');
+ let prevVolume = 0;
vol = v.parent().find('.ui-dialog-titlebar-volume')
.on('mouseenter', function(e) {
e.stopImmediatePropagation();
volume.toggle();
})
.click(function(e) {
- //MUTE
e.stopImmediatePropagation();
- //volume.toggle();
+ if (prevVolume == 0) {
+ prevVolume = slider.slider("option", "value");
+ slider.slider("option", "value", 0);
+ _handleVolume(handle, 0);
+ } else {
+ slider.slider("option", "value", prevVolume);
+ _handleVolume(handle, prevVolume);
+ prevVolume = 0;
+ }
}).dblclick(function(e) {
e.stopImmediatePropagation();
});
- volume.on('mouseout', function() {
+ volume.on('mouseleave', function() {
$(this).hide();
});
var handle = v.parent().find('.slider .handle');
- v.parent().find('.slider').slider({
+ slider.slider({
orientation: 'vertical'
, range: 'min'
, min: 0