Author: solomax
Date: Fri Oct 17 18:37:20 2014
New Revision: 1632649
URL: http://svn.apache.org/r1632649
Log:
[OPENMEETINGS-1103] multiple video player on WB should be fixed
Added:
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/library.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/resources/
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/resources/progress_pointer.swf
(with props)
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/resources/webstart_play_small.png
(with props)
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/resources/webstart_stop_small.png
(with props)
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/library.lzx
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx?rev=1632649&r1=1632648&r2=1632649&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
Fri Oct 17 18:37:20 2014
@@ -251,10 +251,8 @@
</method>
<method name="toggleStream">
- if (canvas.ismoderator) {
- if (this.isPaused) {
- this.startStreamPlay();
- }
+ if (canvas.ismoderator && this.isPaused) {
+ this.startStreamPlay();
}
</method>
@@ -288,7 +286,7 @@
this.setAttribute("bgcolor",canvas.getThemeColor('baseMouseOvercolorizer'));
</handler>
<handler name="onclick">
- if (canvas.ismoderator) {
+ if (canvas.ismoderator &&
parent.parent.isPaused) {
parent.parent.startStreamPlay();
}
</handler>
Modified: openmeetings/branches/3.0.x/WebContent/src/modules/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/library.lzx?rev=1632649&r1=1632648&r2=1632649&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/library.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/library.lzx Fri Oct 17
18:37:20 2014
@@ -26,5 +26,5 @@
<include href="invitation/" />
<include href="dashboard/" />
<include href="sipintegration/" />
-
+ <include href="lzrecordcontent" />
</library>
Added:
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/library.lzx?rev=1632649&view=auto
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/library.lzx
(added)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/library.lzx
Fri Oct 17 18:37:20 2014
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+ <!-- APL author sebawagner -->
+ <resource name="flv_recorder_play_small_rsc"
src="resources/webstart_play_small.png" />
+ <resource name="flv_progress_pointer_rsc"
src="resources/progress_pointer.swf" />
+ <resource name="flv_recorder_stop_small_rsc"
src="resources/webstart_stop_small.png" />
+</library>
Added:
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/resources/progress_pointer.swf
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/resources/progress_pointer.swf?rev=1632649&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/resources/progress_pointer.swf
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/resources/webstart_play_small.png
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/resources/webstart_play_small.png?rev=1632649&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/resources/webstart_play_small.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/resources/webstart_stop_small.png
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/resources/webstart_stop_small.png?rev=1632649&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openmeetings/branches/3.0.x/WebContent/src/modules/lzrecordcontent/resources/webstart_stop_small.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
