Author: vdegtyarev
Date: Tue Nov 24 03:30:23 2015
New Revision: 1716014
URL: http://svn.apache.org/viewvc?rev=1716014&view=rev
Log:
OPENMEETINGS-1279: Exit conformation and exclusive audio and video tooltip are
fixed.
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx?rev=1716014&r1=1716013&r2=1716014&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx
Tue Nov 24 03:30:23 2015
@@ -30,9 +30,15 @@
<attribute name="holder" value="null" />
<event name="setContent" />
-
+
<handler name="onmouseover" reference="this.parent">
<![CDATA[
+ this.doonmouseover();
+ ]]>
+ </handler>
+
+ <method name="doonmouseover">
+ <![CDATA[
this.setContent.sendEvent();
if (this.ismenubuttonlabel){
this.parent.setLabel();
@@ -67,7 +73,7 @@
}
canvas.registerToolTip(this);
]]>
- </handler>
+ </method>
<handler name="onmouseout" reference="this.parent">
this.cleanHolder();
</handler>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1716014&r1=1716013&r2=1716014&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
Tue Nov 24 03:30:23 2015
@@ -389,13 +389,15 @@
</method>
<!---
- Clear all views, probably this is caleld whenever a user leaves
the room for example
+ Clear all views, probably this is called whenever a user leaves
the room for example
-->
<method name="clearAll">
<![CDATA[
if ($debug) Debug.write("clearAll", this.subviews);
while(this.subviews.length > 0) {
- this.subviews[0]._chatvideoinner._videostream._stop();
+ if (this.subviews[0]._chatvideoinner != null) {
+ this.subviews[0]._chatvideoinner._videostream._stop();
+ }
this.subviews[0].destroy();
}
if (canvas.inner.editRecordStream != null) {
@@ -445,7 +447,7 @@
-->
<method name="exitRoom">
if ($debug) Debug.write("exitRoom");
- new lz.confirmationSingleSWF10(canvas,{
+ new lz.confirmationSingle(canvas,{
refObj:this,
labelid:791,
labeliderror:790,
@@ -478,7 +480,7 @@
<method name="closeWhiteboard">
if ($debug) Debug.write("closeWhiteboard");
if (canvas.ismoderator || canvas.isAllowedToDraw) {
- canvas.closeWhiteboardDialog = new
lz.confirmationSingleSWF10(canvas,{
+ canvas.closeWhiteboardDialog = new lz.confirmationSingle(canvas,{
refObj:this,
labeliderror:1313,
refReturnMethod:'closeWhiteboardConfirmMethod',
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx?rev=1716014&r1=1716013&r2=1716014&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
Tue Nov 24 03:30:23 2015
@@ -551,7 +551,7 @@
if (dontShowExclusiveAudioConfirmation == true) {
exclusiveAudioListener.sendConfirmation(true,
true);
} else {
- new lz.confirmationSingleSWF10(canvas,{
+ new lz.confirmationSingle(canvas,{
labelid:1428,
labeliderror:1539,
refObj:exclusiveAudioListener,
