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 2023/08/25 10:55:54 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2232] CSS issue is fixed
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 a6fb4e3bf [OPENMEETINGS-2232] CSS issue is fixed
a6fb4e3bf is described below
commit a6fb4e3bfd7464a843c7292eb823b4c05418f494
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Aug 25 17:55:45 2023 +0700
[OPENMEETINGS-2232] CSS issue is fixed
---
.../apache/openmeetings/util/CalendarHelper.java | 2 +-
openmeetings-web/src/main/front/src/chat/chat.js | 39 +++++++++++-----------
openmeetings-web/src/main/front/src/css/_room.scss | 2 +-
3 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java
index 3b2a39ffc..8a8f50035 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java
@@ -40,7 +40,7 @@ public class CalendarHelper {
}
public static Date getDate(LocalDateTime d, String tzId) {
- return new Date(d.atZone(getZoneId(tzId)).toInstant().toEpochMilli());
+ return Date.from(d.atZone(getZoneId(tzId)).toInstant());
}
public static ZonedDateTime getZoneDateTime(Date d, String tzId) {
diff --git a/openmeetings-web/src/main/front/src/chat/chat.js b/openmeetings-web/src/main/front/src/chat/chat.js
index fa1204583..ecebc287c 100644
--- a/openmeetings-web/src/main/front/src/chat/chat.js
+++ b/openmeetings-web/src/main/front/src/chat/chat.js
@@ -10,7 +10,7 @@ const msgIdPrefix = 'chat-msg-id-'
, SEND_ENTER = 'enter', SEND_CTRL = 'ctrl'
, audio = new Audio('./public/chat_message.mp3')
;
-let p, ctrlBlk, tabs, openedHeight = "345px", openedWidth = "300px", allPrefix = "All"
+let chatPanel, ctrlBlk, tabs, openedHeight = "345px", openedWidth = "300px", allPrefix = "All"
, roomPrefix = "Room ", typingTimer, roomMode = false
, editor = $('#chatMessage .wysiwyg-editor'), muted = false, sendOn, DEF_SEND
, userId, inited = false, newMsgNotification
@@ -115,7 +115,7 @@ function initToolbar() {
CSSEmoticon.animate();
}
function isClosed() {
- return p.hasClass('closed');
+ return chatPanel.hasClass('closed');
}
function activateTab(id) {
if (isClosed()) {
@@ -145,8 +145,8 @@ function _reinit(opts) {
roomPrefix = opts.room;
DEF_SEND = opts.sendOnEnter === true ? SEND_ENTER : SEND_CTRL;
sendOn = DEF_SEND;
- p = $('#chatPanel');
- clearTimeout(p.data('timeout'));
+ chatPanel = $('#chatPanel');
+ clearTimeout(chatPanel.data('timeout'));
ctrlBlk = $('#chatPopup .control.block');
newMsgNotification = ctrlBlk.data('new-msg');
editor = $('#chatMessage .wysiwyg-editor');
@@ -166,15 +166,14 @@ function _reinit(opts) {
_removeResize();
} else {
ctrlBlk.attr('title', '');
- p.removeClass('room opened').addClass('closed')
- .off('mouseenter mouseleave')
- .resizable({
+ chatPanel.removeClass('room opened').addClass('closed')
+ .off('mouseenter mouseleave').resizable({
handles: 'n, ' + (Settings.isRtl ? 'e' : 'w')
, disabled: isClosed()
, minHeight: 195
, minWidth: 260
, stop: function(_, ui) {
- p.css({'top': '', 'left': ''});
+ chatPanel.css({'top': '', 'left': ''});
openedHeight = ui.size.height + 'px';
__setCssHeight(openedHeight);
__setCssWidth(ui.size.width);
@@ -329,7 +328,7 @@ function _addMessage(m) {
}
if (notify) {
ctrlBlk.addClass('bg-warning');
- if (p.is(':visible') && !muted) {
+ if (chatPanel.is(':visible') && !muted) {
OmUtil.notify(newMsgNotification, 'new_chat_msg', () => {
// impossible to use Notification API from iFrame
audio.play()
@@ -346,19 +345,19 @@ function _addMessage(m) {
}
function _setOpened() {
__setCssWidth(openedWidth);
- p.resizable({
+ chatPanel.resizable({
handles: (Settings.isRtl ? 'e' : 'w')
, minWidth: 165
, stop: function(_, ui) {
- p.css({'left': '', 'width': '', 'height': ''});
+ chatPanel.css({'left': '', 'width': '', 'height': ''});
openedWidth = ui.size.width + 'px';
__setCssWidth(openedWidth);
}
});
}
function _removeResize() {
- if (p.resizable('instance') !== undefined) {
- p.resizable('destroy');
+ if (chatPanel.resizable('instance') !== undefined) {
+ chatPanel.resizable('destroy');
}
}
function _open(handler) {
@@ -369,12 +368,12 @@ function _open(handler) {
opts = {width: openedWidth};
} else {
opts = {height: openedHeight};
- p.resizable("option", "disabled", false);
+ chatPanel.resizable("option", "disabled", false);
}
- p.removeClass('closed').animate(opts, 1000, function() {
+ chatPanel.removeClass('closed').animate(opts, 1000, function() {
__hideActions();
- p.removeClass('closed');
- p.css({'height': '', 'width': ''});
+ chatPanel.removeClass('closed');
+ chatPanel.css({'height': '', 'width': ''});
if (typeof(handler) === 'function') {
handler();
}
@@ -398,10 +397,10 @@ function _close(handler) {
opts = {width: closedSizePx};
} else {
opts = {height: closedSizePx};
- p.resizable("option", "disabled", true);
+ chatPanel.resizable("option", "disabled", true);
}
- p.animate(opts, 1000, function() {
- p.addClass('closed').css({'height': '', 'width': ''});
+ chatPanel.animate(opts, 1000, function() {
+ chatPanel.addClass('closed').css({'height': '', 'width': ''});
if (roomMode) {
__setCssWidth(closedSizePx);
_removeResize();
diff --git a/openmeetings-web/src/main/front/src/css/_room.scss b/openmeetings-web/src/main/front/src/css/_room.scss
index f5354b65f..9531d94fa 100644
--- a/openmeetings-web/src/main/front/src/css/_room.scss
+++ b/openmeetings-web/src/main/front/src/css/_room.scss
@@ -389,7 +389,7 @@
}
}
}
- .right {
+ &.right {
i {
position: absolute;
bottom: 1px;