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/10/20 14:50:00 UTC
openmeetings git commit: [OPENMEETINGS-1725] settings dialog seems to
be fixed
Repository: openmeetings
Updated Branches:
refs/heads/master d92185832 -> 8c85876c0
[OPENMEETINGS-1725] settings dialog seems to be fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/8c85876c
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/8c85876c
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/8c85876c
Branch: refs/heads/master
Commit: 8c85876c0f06732410d900bfc8f3ee29e5b3f148
Parents: d921858
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Oct 20 21:49:53 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Oct 20 21:49:53 2017 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/openmeetings/web/room/room.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8c85876c/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 426ef69..5901316 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
@@ -115,7 +115,9 @@ var Video = (function() {
function _getName() {
return c.user.firstName + ' ' + c.user.lastName;
}
- function _resizeDlg(_w, _h) {
+ function _resizeDlg(_ww, _hh) {
+ const interview = Room.getOptions().interview;
+ const _w = interview ? 320 : _ww, _h = interview ? 260 : _hh;
const h = _h + t.height() + 2 + (f.is(":visible") ? f.height() : 0);
v.dialog("option", "width", _w).dialog("option", "height", h);
_resize(_w, _h);
@@ -337,7 +339,7 @@ var Video = (function() {
function _refresh(_opts) {
if (swf[0].refresh !== undefined) {
const opts = _opts || {};
- if (!isNaN(opts.width)) {
+ if (!Room.getOptions().interview && !isNaN(opts.width)) {
_resizeDlg(opts.width, opts.height);
}
swf[0].refresh(opts);