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 2018/04/25 10:24:27 UTC

[openmeetings] branch master updated: [OPENMEETINGS-1877] JS infinite loop 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 44b417d  [OPENMEETINGS-1877] JS infinite loop is fixed
44b417d is described below

commit 44b417d6d9529a76f868bb53b6ac2b4a0cf64cdb
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Apr 25 17:23:56 2018 +0700

    [OPENMEETINGS-1877] JS infinite loop is fixed
---
 .../src/main/java/org/apache/openmeetings/web/room/video-util.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-util.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-util.js
index ea750b4..b36d94f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-util.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-util.js
@@ -82,7 +82,7 @@ var VideoUtil = (function() {
 				}
 				if (rectNew.right >= area.right) {
 					rectNew.left = area.left;
-					rectNew.top = minY + offsetY;
+					rectNew.top = Math.max(minY, rectNew.top) + offsetY;
 					posFound = false;
 				}
 				if (rectNew.bottom >= area.bottom) {

-- 
To stop receiving notification emails like this one, please contact
solomax@apache.org.