Author: sebawagner
Date: Sat Jun 2 15:58:17 2012
New Revision: 1345527
URL: http://svn.apache.org/viewvc?rev=1345527&view=rev
Log:
OPENMEETINGS-282 Video window "Exclusive Audio" causes tool tips message boxes
to be left on the screen
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/labelTooltip.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/text/labelTooltip.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/labelTooltip.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/labelTooltip.lzx?rev=1345527&r1=1345526&r2=1345527&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/labelTooltip.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/labelTooltip.lzx
Sat Jun 2 15:58:17 2012
@@ -65,6 +65,7 @@
this.holder.setAttribute('x',xVal);
this.holder.setAttribute('y',yVal);
}
+ canvas.registerToolTip(this);
]]>
</handler>
<handler name="onmouseout" reference="this.parent">
@@ -80,6 +81,7 @@
if (this.holder!=null) {
this.holder.destroy();
this.holder = null;
+ canvas.clearToolTip();
}
</method>
<attribute name="labelid" type="number" setter="setLabelId(labelid)" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentView.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentView.lzx?rev=1345527&r1=1345526&r2=1345527&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentView.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentView.lzx
Sat Jun 2 15:58:17 2012
@@ -46,6 +46,8 @@
//Make sure any cursor status is reset
lz.Cursor.restoreCursor();
lz.Cursor.showHandCursor(true);
+ //Make sure any tooltip is cleared
+ canvas.clearToolTip();
this.ontabcontentleave.sendEvent();
if (!this.destroyByMethod) this.destroy();
return this.destroyByMethod;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1345527&r1=1345526&r2=1345527&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Sat Jun 2 15:58:17 2012
@@ -539,12 +539,15 @@
}
this.doCall();
} else {
+ if($debug) Debug.write("loading lang complete");
if (parent.initlanguageLoaded){
if (canvas.thishib.loaderVar != null) {
canvas.thishib.loaderVar.setProgress();
}
+ if($debug) Debug.write("getRoomTypes");
parent.getRoomTypes.doCall();
} else {
+ if($debug) Debug.write("getStates");
parent.initlanguageLoaded=true;
parent.getStates.doCall();
}
@@ -620,7 +623,7 @@
<netRemoteCallHib name="getStates" funcname="xmlcrm.getStates"
dataobject="countrySet">
<handler name="ondata" args="value">
//The onResult-Handler will be called be the rtmpconnection
- //Debug.write("getStates: ",value);
+ if ($debug) Debug.write("getStates: ",value);
canvas.statesInitValues = value;
canvas.thishib.loaderVar.setProgress();
parent.getTimeZones.doCall();
@@ -630,7 +633,7 @@
<netRemoteCallHib name="getTimeZones" funcname="xmlcrm.getTimeZones"
dataobject="timeZoneSet">
<handler name="ondata" args="value">
//The onResult-Handler will be called be the rtmpconnection
- //Debug.write("getStates: ",value);
+ if ($debug) Debug.write("getTimeZones: ",value);
canvas.thishib.loaderVar.setProgress();
parent.getGeneralOptions.doCall();
</handler>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1345527&r1=1345526&r2=1345527&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
Sat Jun 2 15:58:17 2012
@@ -457,4 +457,23 @@ and some more references to temp-objects
<attribute name="currentNC" value="null" />
+<!--
+ Holds a reference to the current tooltip, if there is one
+ -->
+<attribute name="currentToolTip" value="null" />
+
+<method name="registerToolTip" args="viewInstance">
+ if (this.currentToolTip != null) {
+ this.currentToolTip.cleanHolder();
+ }
+ this.currentToolTip = viewInstance;
+</method>
+
+<method name="clearToolTip">
+ if (this.currentToolTip != null) {
+ this.currentToolTip.cleanHolder();
+ this.currentToolTip = null;
+ }
+</method>
+
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/text/labelTooltip.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/text/labelTooltip.lzx?rev=1345527&r1=1345526&r2=1345527&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/text/labelTooltip.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/text/labelTooltip.lzx
Sat Jun 2 15:58:17 2012
@@ -37,7 +37,7 @@
]]>
</handler>
<handler name="onmouseout" reference="this.parent">
- this.doonmouseout();
+ this.cleanHolder();
</handler>
<method name="doonmouseover">
@@ -72,18 +72,25 @@
}
this.holder.setAttribute('x',xVal);
this.holder.setAttribute('y',yVal);
+ canvas.registerToolTip(this);
]]>
</method>
- <method name="doonmouseout">
- this.holder.destroy();
- </method>
<handler name="onmouseup" reference="this.parent">
- this.holder.destroy();
+ this.cleanHolder();
</handler>
<handler name="onclick" reference="this.parent">
- this.holder.destroy();
- </handler>
+ this.cleanHolder();
+ </handler>
+
+ <method name="cleanHolder">
+ if (this.holder!=null) {
+ this.holder.destroy();
+ this.holder = null;
+ canvas.clearToolTip();
+ }
+ </method>
+
<attribute name="labelid" type="number" setter="setLabelId(labelid)" />
<method name="setLabelId" args="_labelid" >
this.labelid = _labelid;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx?rev=1345527&r1=1345526&r2=1345527&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
Sat Jun 2 15:58:17 2012
@@ -86,5 +86,24 @@
<attribute name="interviewPod2_x" value="644" type="number" />
<attribute name="interviewPod2_y" value="28" type="number" />
+
+ <!--
+ Holds a reference to the current tooltip, if there is one
+ -->
+ <attribute name="currentToolTip" value="null" />
+
+ <method name="registerToolTip" args="viewInstance">
+ if (this.currentToolTip != null) {
+ this.currentToolTip.cleanHolder();
+ }
+ this.currentToolTip = viewInstance;
+ </method>
+
+ <method name="clearToolTip">
+ if (this.currentToolTip != null) {
+ this.currentToolTip.cleanHolder();
+ this.currentToolTip = null;
+ }
+ </method>
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx?rev=1345527&r1=1345526&r2=1345527&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
Sat Jun 2 15:58:17 2012
@@ -539,7 +539,7 @@
if (this.minimized) {
return;
}
-
this._giveExclusiveAudioView._micButton._toolTipTextExclusiveAudio.doonmouseout();
+
this._giveExclusiveAudioView._micButton._toolTipTextExclusiveAudio.cleanHolder();
this._giveExclusiveAudioView.setAttribute("visible", false);
]]>
</handler>
@@ -547,7 +547,7 @@
<handler name="onclick">
<