[OPENMEETINGS-1769] chat resize and typing indicator are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/9cd0c984 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/9cd0c984 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/9cd0c984 Branch: refs/heads/reflow-branch Commit: 9cd0c9847b1f93068293d02092d4d8643c8efc39 Parents: 3c2b8d9 Author: Maxim Solodovnik <[email protected]> Authored: Tue Dec 5 22:10:45 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Dec 5 22:10:45 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/web/room/sidebar/RoomClientPanel.html | 2 +- .../org/apache/openmeetings/web/user/chat/chat-base.js | 11 ++++++++--- openmeetings-web/src/main/webapp/css/chat.css | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9cd0c984/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html index 514ef3a..78e963c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html @@ -22,8 +22,8 @@ <wicket:panel> <span wicket:id="status" class="ui-icon"></span> <span wicket:id="refresh"></span> - <div wicket:id="name" class="user name"></div> <span class="ui-icon align-right typing-activity big"></span> + <div wicket:id="name" class="user name"></div> <span wicket:id="user-speaks"></span> <div wicket:id="actions" class="user actions"> <span wicket:id="icons"></span> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9cd0c984/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js index 9623f6c..df5b52f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js @@ -125,15 +125,17 @@ var Chat = function() { p.removeClass('room opened').addClass('closed') .off('mouseenter mouseleave') .resizable({ - handles: 'n, ' + (Settings.isRtl ? 'w' : 'e') + handles: 'n, ' + (Settings.isRtl ? 'e' : 'w') , disabled: isClosed() - , alsoResize: "#chatPopup, #chat .ui-tabs .ui-tabs-panel.messageArea" + , alsoResize: "#chatPopup,#chatPopup .control.block,#chat .ui-tabs .ui-tabs-panel.messageArea, #chatMessage .wysiwyg-editor" , minHeight: 195 , minWidth: 260 , stop: function(event, ui) { p.css({'top': '', 'left': ''}); + editor.width(p.width() - 30); openedHeight = ui.size.height + "px"; globalWidth = ui.size.width; + ctrl.width(globalWidth); } }); } @@ -236,11 +238,13 @@ var Chat = function() { } function _setOpened() { p.addClass('opened').off('mouseenter mouseleave'); + editor.width(p.width() - 30); p.resizable({ handles: (Settings.isRtl ? 'e' : 'w') - , alsoResize: '#chatPopup' + , alsoResize: '#chatPopup, #chatMessage .wysiwyg-editor' , stop: function(event, ui) { p.css({'left': ''}); + editor.width(p.width() - 30); openedWidth = ui.size.width + 'px'; } }); @@ -270,6 +274,7 @@ var Chat = function() { if (typeof(handler) === 'function') { handler(); } + editor.width(p.width() - 30); if (roomMode) { ctrl.off('click').click(function() { if (p.hasClass('opened')) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9cd0c984/openmeetings-web/src/main/webapp/css/chat.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/chat.css b/openmeetings-web/src/main/webapp/css/chat.css index 5299eab..b0799ba 100644 --- a/openmeetings-web/src/main/webapp/css/chat.css +++ b/openmeetings-web/src/main/webapp/css/chat.css @@ -91,7 +91,7 @@ margin-right: 22px; } #chatMessage .wysiwyg-editor { - height: 70px; + min-height: 70px; max-height: 70px; } .chat-tool-icon {
