You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2015/07/02 08:14:13 UTC
svn commit: r1688766 - in /openmeetings/branches/3.0.x/WebContent:
src/base/hibernate/ src/modules/conference/
src/modules/conference/tabcontent/chat/ swf10/ swf10/base/
swf10/screensharing/
Author: vdegtyarev
Date: Thu Jul 2 06:14:13 2015
New Revision: 1688766
URL: http://svn.apache.org/r1688766
Log:
OOPENMEETINGS-1064 is fixed. Now chat is available when screen sharing is shown.
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/screenSharingAdapter.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
openmeetings/branches/3.0.x/WebContent/swf10/base/mainAttributes.lzx
openmeetings/branches/3.0.x/WebContent/swf10/hibAdapter.lzx
openmeetings/branches/3.0.x/WebContent/swf10/screensharing/screenSharingDialog.lzx
Modified: openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1688766&r1=1688765&r2=1688766&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx Thu Jul 2 06:14:13 2015
@@ -1290,7 +1290,7 @@
if ($debug) Debug.write(" onResult newScreenSharing 4 : ",value.streamPublishName);
if ($debug) Debug.write(" onResult newcreenSharing 5 : ",canvas.publicSID);
- canvas.currentBaseConferenceRoom._screenSharingAdapter.newScreenSharing(value);
+ canvas.currentBaseConferenceRoom._screenSharingAdapter.newScreenSharing(value,canvas.currentBaseConferenceRoom._chatPanelStrict.height);
]]>
</handler>
</netRemoteCallHib>
@@ -1301,7 +1301,7 @@
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write(" onResult checkScreenSharing : ",value);
if (value != null) {
- canvas.currentBaseConferenceRoom._screenSharingAdapter.newScreenSharings(value);
+ canvas.currentBaseConferenceRoom._screenSharingAdapter.newScreenSharings(value,canvas.currentBaseConferenceRoom._chatPanelStrict.height);
} else {
if ($debug) Debug.warn("Self Screen Sharing");
}
@@ -1309,7 +1309,6 @@
</handler>
</netRemoteCallHib>
-
<!--
public synchronized Long applyForModeration(String publicSID)
-->
Modified: openmeetings/branches/3.0.x/WebContent/src/modules/conference/screenSharingAdapter.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/screenSharingAdapter.lzx?rev=1688766&r1=1688765&r2=1688766&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/conference/screenSharingAdapter.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/conference/screenSharingAdapter.lzx Thu Jul 2 06:14:13 2015
@@ -27,9 +27,9 @@
to show a new screen sharing video
@param rcl RoomClient Object
-->
- <method name="newScreenSharing" args="rcl">
+ <method name="newScreenSharing" args="rcl, h">
//Send via LocalConnection to SWF10 container
- canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "newScreenSharing", [rcl]);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "newScreenSharing", [rcl, h]);
</method>
<!---
@@ -37,9 +37,9 @@
to show multiple new screen sharing video
@param rcl RoomClient Object Map/list
-->
- <method name="newScreenSharings" args="rcls">
+ <method name="newScreenSharings" args="rcls, h">
//Send via LocalConnection to SWF10 container
- canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "newScreenSharings", [rcls]);
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "newScreenSharings", [rcls, h]);
</method>
<!---
Modified: openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx?rev=1688766&r1=1688765&r2=1688766&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx Thu Jul 2 06:14:13 2015
@@ -128,6 +128,8 @@
<handler name="onisopen" args="o">
if ($debug) Debug.write("onisopen",o);
+ canvas.chatHeight = o ? 200 : 222;
+ canvas.sendViaLocalConnection(canvas.rtmp_lc_name, "hideChatContent", [!o]);
if (o) {
if ('doInitByOpen' in canvas._chatcontent) {
canvas._chatcontent.doInitByOpen();
Modified: openmeetings/branches/3.0.x/WebContent/swf10/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/swf10/base/mainAttributes.lzx?rev=1688766&r1=1688765&r2=1688766&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/swf10/base/mainAttributes.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/swf10/base/mainAttributes.lzx Thu Jul 2 06:14:13 2015
@@ -115,6 +115,8 @@
<attribute name="wicketsid" type="string" />
<attribute name="wicketroomid" value="0" type="number" />
+ <!-- Attributes for show chat dialog when screen sharing open-->
+ <attribute name="chatHeight" value="0" type="number" />
<method name="registerToolTip" args="viewInstance">
if (this.currentToolTip != null) {
Modified: openmeetings/branches/3.0.x/WebContent/swf10/hibAdapter.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/swf10/hibAdapter.lzx?rev=1688766&r1=1688765&r2=1688766&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/swf10/hibAdapter.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/swf10/hibAdapter.lzx Thu Jul 2 06:14:13 2015
@@ -63,6 +63,7 @@
client.closeScreenSharing = this.closeScreenSharing;
client.closeAllScreenSharings = this.closeAllScreenSharings;
client.updateCursorScreenSharing = this.updateCursorScreenSharing;
+ client.hideChatContent = this.hideChatContent;
//Text RegExp
client.regExpTest = this.regExpTest;
@@ -275,8 +276,9 @@
<!---
Adds a new screen sharing playback video
-->
- <method name="newScreenSharing" args="value">
+ <method name="newScreenSharing" args="value, h">
<![CDATA[
+ canvas.chatHeight = h;
if (value.streamPublishName != canvas.publicSID) {
if (canvas.screenSharingDialogContainer == null) {
canvas.screenSharingDialogContainer = new lz.screenSharingDialogContainer(canvas);
@@ -294,10 +296,11 @@
Add a list of screen sharing playback videos
(initially when entering the room invoked)
-->
- <method name="newScreenSharings" args="value">
+ <method name="newScreenSharings" args="value, h">
<![CDATA[
+ canvas.chatHeight = h;
for (var eg in value) {
- this.newScreenSharing(value[eg]);
+ this.newScreenSharing(value[eg], h);
}
]]>
</method>
@@ -316,7 +319,7 @@
}
]]>
</method>
-
+
<!---
Closes all screen sharing playback videos, whiteboard videos, user videos
and closes the rtmp connection
@@ -336,6 +339,18 @@
</method>
<!---
+ change Screen Sharing farme height
+ -->
+ <method name="hideChatContent" args="hide">
+ <![CDATA[
+ if (canvas.screenSharingDialogContainer != null) {
+ if ($debug) Debug.write("hideChatContent::hide " + hide);
+ canvas.screenSharingDialogContainer.hideChatContent(hide);
+ }
+ ]]>
+ </method>
+
+ <!---
Update the position of the cursor from the sharing screen
-->
<method name="updateCursorScreenSharing" args="value">
Modified: openmeetings/branches/3.0.x/WebContent/swf10/screensharing/screenSharingDialog.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/swf10/screensharing/screenSharingDialog.lzx?rev=1688766&r1=1688765&r2=1688766&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/swf10/screensharing/screenSharingDialog.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/swf10/screensharing/screenSharingDialog.lzx Thu Jul 2 06:14:13 2015
@@ -57,6 +57,17 @@
]]>
</method>
+ <method name="hideChatContent" args="hide">
+ <![CDATA[
+ if ($debug) Debug.write("hideChatContent::isStarted ", this.subviews[0].isStarted);
+ if (this.subviews[0] != null && this.subviews[0].isStarted) {
+ canvas.chatHeight = hide ? 22 : 200;
+ if ($debug) Debug.write("hideChatContent::chatHeight ", canvas.chatHeight);
+ this.subviews[0].startViewerSession();
+ }
+ ]]>
+ </method>
+
</class>
<class name="screenSharingDialog" extends="labelExplorerBox" labelid="855"
@@ -96,7 +107,7 @@
this._initText.setAttribute("visibility","hidden");
this._showScreenSharing._y.setAttribute("to",0);
- this._showScreenSharing._height.setAttribute("to",canvas.height);
+ this._showScreenSharing._height.setAttribute("to",canvas.height - canvas.chatHeight);
this._showScreenSharing._width.setAttribute("to",canvas.width-260);
this._showScreenSharing._x.setAttribute("to",260);
@@ -151,7 +162,7 @@
}
this.currentCursorObject.setAttribute("x",x * (this._zoombar._zoom.initialNumber/100));
this.currentCursorObject.setAttribute("y",y * (this._zoombar._zoom.initialNumber/100));
- </method>
+ </method>
<view name="_initText">