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 f805118 [OPENMEETINGS-2106] recordings can be played on WB
f805118 is described below
commit f80511846c61beffe87d8c420d619a2b37f7dd4a
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Tue Sep 3 13:41:10 2019 +0700
[OPENMEETINGS-2106] recordings can be played on WB
---
.../openmeetings/web/common/tree/FolderPanel.java | 25 +++++++++++-----------
.../apache/openmeetings/web/room/wb/WbPanel.java | 2 +-
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
index 66dd8b7..b26f638 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
@@ -18,13 +18,11 @@
*/
package org.apache.openmeetings.web.common.tree;
-import com.github.openjson.JSONObject;
-import com.googlecode.wicket.jquery.core.IJQueryWidget.JQueryWidget;
-import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.jquery.ui.interaction.draggable.DraggableBehavior;
-import
com.googlecode.wicket.jquery.ui.interaction.draggable.IDraggableListener;
-import com.googlecode.wicket.jquery.ui.interaction.droppable.DroppableBehavior;
-import
com.googlecode.wicket.jquery.ui.interaction.droppable.IDroppableListener;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE;
+
+import java.util.Map.Entry;
+
import org.apache.openmeetings.db.dao.file.FileItemDao;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
@@ -48,10 +46,13 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.string.Strings;
-import java.util.Map.Entry;
-
-import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE;
+import com.github.openjson.JSONObject;
+import com.googlecode.wicket.jquery.core.IJQueryWidget.JQueryWidget;
+import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.ui.interaction.draggable.DraggableBehavior;
+import
com.googlecode.wicket.jquery.ui.interaction.draggable.IDraggableListener;
+import com.googlecode.wicket.jquery.ui.interaction.droppable.DroppableBehavior;
+import
com.googlecode.wicket.jquery.ui.interaction.droppable.IDroppableListener;
public class FolderPanel extends Panel implements IDraggableListener,
IDroppableListener {
private static final long serialVersionUID = 1L;
@@ -207,7 +208,7 @@ public class FolderPanel extends Panel implements
IDraggableListener, IDroppable
if (f instanceof Recording) {
Status st =
((Recording)f).getStatus();
if (Status.RECORDING == st ||
Status.CONVERTING == st) {
-
style.append("processing");
+
style.append("processing ");
}
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index 61154b3..ab644f8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -589,7 +589,7 @@ public class WbPanel extends AbstractWbPanel {
.put(ATTR_SLIDE,
wb.getSlide())
;
if (FileItem.Type.Video == fi.getType()
|| FileItem.Type.Recording == fi.getType()) {
- file.put(ATTR_TYPE, "video");
+ file.put(ATTR_OMTYPE, "Video");
file.put(PARAM_STATUS, new
JSONObject()
.put("paused",
true)
.put("pos", 0.0)
