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 2013/05/31 09:48:36 UTC
svn commit: r1488122 - in /openmeetings:
branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/
branches/2.1/WebContent/swf10/
trunk/singlewebapp/WebContent/src/base/hibernate/
trunk/singlewebapp/WebContent/src/modules/confe...
Author: solomax
Date: Fri May 31 07:48:36 2013
New Revision: 1488122
URL: http://svn.apache.org/r1488122
Log:
[OPENMEETINGS-654] Interview room is fixed
Modified:
openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
openmeetings/branches/2.1/WebContent/swf10/commonVideoViewContentSWF10.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
Modified: openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx?rev=1488122&r1=1488121&r2=1488122&view=diff
==============================================================================
--- openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx (original)
+++ openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx Fri May 31 07:48:36 2013
@@ -43,20 +43,6 @@
]]>
</method>
- <method name="toggleStatus">
- if (this.isOpen) {
- this._doClose.setAttribute('started', true);
- this.isOpen = false;
- this._minimizeSidebar._icon.setAttribute("frame",2);
- this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",857);
- } else {
- this._doOpen.setAttribute('started', true);
- this.isOpen = true;
- this._minimizeSidebar._icon.setAttribute("frame",1);
- this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",856);
- }
- </method>
-
<view name="borderBarTop" y="0"
width="${ parent.width }" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }" height="1" />
<view name="_tabbarBg" width="${ parent.width }" height="32" y="1" bgcolor="0xFAFAFA" />
@@ -85,30 +71,13 @@
<activityList name="_activityList" />
<view name="_minimizeSidebar" x="${ parent.width - 10 }" width="10" y="1"
- bgcolor="0xE0E1EB" height="${ parent.height-1 }">
- <handler name="onclick">
- parent.toggleStatus();
- </handler>
+ bgcolor="0xE0E1EB" height="${ parent.height-1 }">
<view width="${ parent.width }" height="$once{ parent.height }"
bgcolor="0xE0E1EB" >
</view>
- <view name="_icon" resource="sidebar_tab_btn" y="0">
- <handler name="onclick">
- parent.parent.toggleStatus();
- </handler>
- <labelTooltip name="_labelTooltip" labelid="856" />
- </view>
-
</view>
-
- <animator name="_doOpen" attribute="width" to="$once{ parent.width }"
- duration="750" started="false" />
-
- <animator name="_doClose" attribute="width" to="10"
- duration="750" started="false" />
-
</class>
</library>
Modified: openmeetings/branches/2.1/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1488122&r1=1488121&r2=1488122&view=diff
==============================================================================
--- openmeetings/branches/2.1/WebContent/swf10/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/branches/2.1/WebContent/swf10/commonVideoViewContentSWF10.lzx Fri May 31 07:48:36 2013
@@ -107,9 +107,11 @@
if ($debug) Debug.write("Is interview ? ",canvas.isInterview);
if (canvas.isInterview) {
if ($debug) Debug.write("Is interview ",interviewPodId,"x",canvas["interviewPod"+interviewPodId+"_x"]);
- vidContainer.setAttribute("interviewPodId", interviewPodId);
- vidContainer.setAttribute("x",canvas["interviewPod"+interviewPodId+"_x"]);
- vidContainer.setAttribute("y",canvas["interviewPod"+interviewPodId+"_y"]);
+ if (interviewPodId != null) {
+ vidContainer.setAttribute("interviewPodId", interviewPodId);
+ vidContainer.setAttribute("x",canvas["interviewPod"+interviewPodId+"_x"]);
+ vidContainer.setAttribute("y",canvas["interviewPod"+interviewPodId+"_y"]);
+ }
vidContainer.setAttribute("width",322);
vidContainer.setAttribute("height",281);
}
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1488122&r1=1488121&r2=1488122&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Fri May 31 07:48:36 2013
@@ -803,7 +803,7 @@
}
hib.userobject = value;
var found = false;
- for (var i=0;i<value.organisation_users.length;i++) {
+ for (var i = 0; i < value.organisation_users.length; ++i) {
if (value.organisation_users[i].organisation.organisation_id == value.sessionData.organization_id) {
found = true;
hib.currentdomain = value.organisation_users[i].organisation.name;
@@ -811,6 +811,10 @@
break;
}
}
+ if (!found && value.organisation_users.length > 0) {
+ hib.currentdomain = value.organisation_users[0].organisation.name;
+ hib.currentdomainObj = value.organisation_users[0].organisation;
+ }
parent.getCurrentRoomClient.doCall();
}
]]>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx?rev=1488122&r1=1488121&r2=1488122&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx Fri May 31 07:48:36 2013
@@ -43,20 +43,6 @@
]]>
</method>
- <method name="toggleStatus">
- if (this.isOpen) {
- this._doClose.setAttribute('started', true);
- this.isOpen = false;
- this._minimizeSidebar._icon.setAttribute("frame",2);
- this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",857);
- } else {
- this._doOpen.setAttribute('started', true);
- this.isOpen = true;
- this._minimizeSidebar._icon.setAttribute("frame",1);
- this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",856);
- }
- </method>
-
<view name="borderBarTop" y="0"
width="${ parent.width }" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }" height="1" />
<view name="_tabbarBg" width="${ parent.width }" height="32" y="1" bgcolor="0xFAFAFA" />
@@ -85,30 +71,12 @@
<activityList name="_activityList" />
<view name="_minimizeSidebar" x="${ parent.width - 10 }" width="10" y="1"
- bgcolor="0xE0E1EB" height="${ parent.height-1 }">
- <handler name="onclick">
- parent.toggleStatus();
- </handler>
+ bgcolor="0xE0E1EB" height="${ parent.height-1 }">
<view width="${ parent.width }" height="$once{ parent.height }"
bgcolor="0xE0E1EB" >
</view>
-
- <view name="_icon" resource="sidebar_tab_btn" y="0">
- <handler name="onclick">
- parent.parent.toggleStatus();
- </handler>
- <labelTooltip name="_labelTooltip" labelid="856" />
- </view>
-
</view>
-
- <animator name="_doOpen" attribute="width" to="$once{ parent.width }"
- duration="750" started="false" />
-
- <animator name="_doClose" attribute="width" to="10"
- duration="750" started="false" />
-
</class>
</library>
Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1488122&r1=1488121&r2=1488122&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx Fri May 31 07:48:36 2013
@@ -108,9 +108,11 @@
if ($debug) Debug.write("Is interview ? ",canvas.isInterview);
if (canvas.isInterview) {
if ($debug) Debug.write("Is interview ",interviewPodId,"x",canvas["interviewPod"+interviewPodId+"_x"]);
- vidContainer.setAttribute("interviewPodId", interviewPodId);
- vidContainer.setAttribute("x",canvas["interviewPod"+interviewPodId+"_x"]);
- vidContainer.setAttribute("y",canvas["interviewPod"+interviewPodId+"_y"]);
+ if (interviewPodId != null) {
+ vidContainer.setAttribute("interviewPodId", interviewPodId);
+ vidContainer.setAttribute("x",canvas["interviewPod"+interviewPodId+"_x"]);
+ vidContainer.setAttribute("y",canvas["interviewPod"+interviewPodId+"_y"]);
+ }
vidContainer.setAttribute("width",322);
vidContainer.setAttribute("height",281);
}