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 70ae09d [OPENMEETINGS-1649] drag'n'drop in interview room is fixed
70ae09d is described below
commit 70ae09d31c4e235edf6cbbf0f580ac8cea5c842b
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Oct 11 19:47:05 2018 +0700
[OPENMEETINGS-1649] drag'n'drop in interview room is fixed
---
.../main/java/org/apache/openmeetings/web/room/raw-settings.js | 1 -
.../src/main/java/org/apache/openmeetings/web/room/raw-video.js | 8 ++++++--
.../org/apache/openmeetings/web/room/wb/raw-interview-area.js | 8 ++++++++
.../src/test/java/org/apache/openmeetings/AbstractSpringTest.java | 4 ++--
4 files changed, 16 insertions(+), 5 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
index ead26ca..10e3824 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
@@ -431,7 +431,6 @@ var VideoSettings = (function() {
_updateRec();
_setEnabled(false);
}
- //FIXME TODO, try to unify this
function _onWsMessage(jqEvent, msg) {
try {
if (msg instanceof Blob) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index b05b680..2aceaee 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -394,6 +394,11 @@ var Video = (function() {
VideoUtil.cleanPeer(rtcPeer);
vc.find('audio,video').remove();
}
+ function _reattachStream() {
+ if (!!rtcPeer && !!video && video.length > 0) {
+ video[0].srcObject = c.self ? rtcPeer.getLocalStream()
: rtcPeer.getRemoteStream();
+ }
+ }
self.update = _update;
self.refresh = _refresh;
@@ -402,8 +407,6 @@ var Video = (function() {
self.init = _init;
self.client = function() { return c; };
self.setRights = _setRights;
- self.video = function() { return video[0]; };
- self.setPeer = function(p) { rtcPeer = p; };
self.getPeer = function() { return rtcPeer; };
self.onIceCandidate = function(candidate, wp) {
OmUtil.log("Local candidate" + JSON.stringify(candidate));
@@ -414,5 +417,6 @@ var Video = (function() {
});
};
self.resizePod = _resizePod;
+ self.reattachStream = _reattachStream;
return self;
});
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
index f281e46..4db9f22 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
@@ -30,8 +30,10 @@ var InterviewWbArea = function() {
ui.draggable.remove();
} else {
cvid.dialog('option', 'appendTo',
ui.draggable);
+ cvid.data().reattachStream();
vid.dialog('option', 'appendTo', big);
}
+ vid.data().reattachStream();
pArea.find('.ui-sortable-placeholder.pod').hide();
_updateAreaClass();
}
@@ -39,6 +41,12 @@ var InterviewWbArea = function() {
pArea.sortable({
items: '.pod'
, handle: '.ui-dialog-titlebar'
+ , stop: function(event, ui) {
+ const vid = ui.item.find('.ui-dialog-content');
+ if (vid.length === 1) {
+ vid.data().reattachStream();
+ }
+ }
});
_updateAreaClass();
_inited = true;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractSpringTest.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractSpringTest.java
index 4985bc2..e6da66f 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractSpringTest.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractSpringTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.fail;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.tomcat.util.scan.Constants;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
@@ -33,11 +34,10 @@ import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@TestExecutionListeners({})
@ContextConfiguration(locations={"classpath:applicationContext.xml"},
inheritLocations = true)
public abstract class AbstractSpringTest extends
AbstractJUnit4SpringContextTests {
-
@BeforeClass
public static void init() {
setOmHome();
- //FIXME TODO System.setProperty(Constants.SKIP_JARS_PROPERTY,
"*");
+ System.setProperty(Constants.SKIP_JARS_PROPERTY, "*");
LabelDao.initLanguageMap();
if (LabelDao.getLanguages().isEmpty()) {
fail("Failed to set languages");
