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/11/24 03:31:03 UTC
openmeetings git commit: [OPENMEETINGS-1769] hover is improved
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 7008a6930 -> 1d513853b
[OPENMEETINGS-1769] hover is improved
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/1d513853
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/1d513853
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/1d513853
Branch: refs/heads/4.0.x
Commit: 1d513853b10d1d97b8de0a3885da8751cf443b65
Parents: 7008a69
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Nov 24 10:30:54 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Nov 24 10:30:54 2017 +0700
----------------------------------------------------------------------
.../apache/openmeetings/web/user/chat/chat.js | 29 ++++++++++++--------
1 file changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1d513853/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
index fadff49..192ddaf 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
@@ -113,17 +113,6 @@ var Chat = function() {
icon.addClass(isClosed ? iconOpenRoom : iconCloseRoom);
p.addClass('room').hover(_open, _close);
pp.width(closedSize);
- ctrl.off('click').click(function() {
- if (p.hasClass('opened')) {
- ctrl.attr('title', ctrl.data('ttl-dock'));
- _close(Room.setSize);
- p.removeClass('opened').hover(_open, _close);
- _removeResize();
- } else {
- ctrl.attr('title', ctrl.data('ttl-undock'));
- _setOpened();
- }
- }).attr('title', ctrl.data('ttl-dock'));
_removeResize();
} else {
ctrl.attr('title', '');
@@ -277,6 +266,19 @@ var Chat = function() {
if (typeof(handler) === 'function') {
handler();
}
+ if (roomMode) {
+ ctrl.off('click').click(function() {
+ if (p.hasClass('opened')) {
+ ctrl.attr('title', ctrl.data('ttl-dock'));
+ _close(Room.setSize);
+ p.removeClass('opened').hover(_open, _close);
+ _removeResize();
+ } else {
+ ctrl.attr('title', ctrl.data('ttl-undock'));
+ _setOpened();
+ }
+ }).attr('title', ctrl.data('ttl-dock'));
+ }
});
}
}
@@ -286,13 +288,16 @@ var Chat = function() {
let opts;
if (roomMode) {
opts = {width: closedSizePx};
- ctrl.height(p.height());
+ ctrl.off('click');
} else {
opts = {height: closedSizePx};
p.resizable("option", "disabled", true);
}
pp.animate(opts, 1000, function() {
p.addClass('closed');
+ if (roomMode) {
+ ctrl.height(p.height());
+ }
if (typeof(handler) === 'function') {
handler();
}