Author: ggrekhov
Date: Thu May 24 07:53:46 2012
New Revision: 1342166
URL: http://svn.apache.org/viewvc?rev=1342166&view=rev
Log:
OPENMEETINGS-89 is fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1342166&r1=1342165&r2=1342166&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
Thu May 24 07:53:46 2012
@@ -34,6 +34,7 @@
<attribute name="offsetLength" type="number" value="40"/>
<attribute name="videoWidth" type="number" value="132"/>
<attribute name="videoHeight" type="number" value="132"/>
+ <attribute name="SIDEPANEL_WIDTH" type="number" value="270" />
<handler name="oninit">
<![CDATA[
@@ -241,6 +242,9 @@
<method name="getVideoObjectFreePos"
args="offsetLength,videoWidth,videoHeight">
<![CDATA[
var newx = 20;
+ if (canvas.currentRoomObject.hideWhiteboard) {
+ newx += SIDEPANEL_WIDTH;
+ }
var newy = 0;
var posFound = false;
if (offsetLength == undefined) {
@@ -265,6 +269,9 @@
}
if ((newx + videoWidth) >= canvas.width) {
newx = 20;
+ if (canvas.currentRoomObject.hideWhiteboard) {
+ newx += SIDEPANEL_WIDTH;
+ }
newy += 10;
posFound = false;
}