svn commit: r1337492 - in /incubator/openmeetings/trunk/singlewebapp/WebContent/swf10: base/mainAttributes.lzx commonVideoViewContentSWF10.lzx video/baseVideoObject.lzx

[sebawagner]

Author: sebawagner
Date: Sat May 12 09:53:10 2012
New Revision: 1337492

URL: http://svn.apache.org/viewvc?rev=1337492&view=rev
Log:
Fix issues in syncing and click area for "Exclusive Audio"

Modified:
    
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
    
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
    
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx

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=1337492&r1=1337491&r2=1337492&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
 Sat May 12 09:53:10 2012
@@ -72,6 +72,8 @@
        
        <attribute name="isAllowedToRemoteControl" value="false" type="boolean" 
/>
        
+       <attribute name="isAllowedToGiveExclusiveAudio" value="false" 
type="boolean" />
+       
        <attribute name="ismoderator" value="false" type="boolean" />
        
        <attribute name="isInterview" value="false" type="boolean" />

Modified: 
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1337492&r1=1337491&r2=1337492&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
 Sat May 12 09:53:10 2012
@@ -62,6 +62,7 @@
             client.updateModerationFlag = this.updateModerationFlag;
             client.changeDevice = this.changeDevice;
             client.setDrawAllowStatus = this.setDrawAllowStatus;
+            client.setExclusiveAudioAllowStatus = 
this.setExclusiveAudioAllowStatus;
             client.exitRoom = this.exitRoom;
             client.closeWhiteboard = this.closeWhiteboard;
 
@@ -455,6 +456,14 @@
             return;
        ]]>
     </method>
+    
+    <method name="setExclusiveAudioAllowStatus" args="canGiveAudio">
+       <![CDATA[
+               if ($debug) Debug.write("setExclusiveAudioAllowStatus :: 
",canGiveAudio);
+               
canvas.setAttribute("isAllowedToGiveExclusiveAudio",canGiveAudio);
+            return;
+       ]]>
+    </method>
 
     <!---
         Shows the window with device settings

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=1337492&r1=1337491&r2=1337492&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
 Sat May 12 09:53:10 2012
@@ -502,14 +502,16 @@
     </view>
 
     <view name="_giveExclusiveAudioView" valign="middle" align="center" 
visible="false">
-        <miniIcons name="_micButton" width="40" height="40" resource="mic_rsc" 
showhandcursor="true">
-            <handler name="onclick">
-                <![CDATA[
-                    parent.parent.giveExclusiveAudio();
-                ]]>
-            </handler>
+        <view name="_micButton" width="40" height="40" resource="mic_rsc" 
showhandcursor="true">
+               <handler name="onclick">
+                             <![CDATA[
+                               if (canvas.ismoderator || 
canvas.isAllowedToGiveExclusiveAudio) {
+                                       parent.parent.giveExclusiveAudio();
+                                 }
+                             ]]>
+                       </handler> 
             <labelTooltip labelid="1386" />
-        </miniIcons>
+        </view>
     </view>
 
     <handler name="onmouseover">
@@ -520,8 +522,7 @@
         if (this.minimized) {
             return;
         }
-        var canGiveAudioHimself = !this.isremote && 
canvas.isAllowedToGiveExclusiveAudio;
-        if (canvas.ismoderator || canGiveAudioHimself) {
+        if (canvas.ismoderator || canvas.isAllowedToGiveExclusiveAudio) {
             this._giveExclusiveAudioView.setAttribute("visible", true);
         }
         ]]>
@@ -537,7 +538,15 @@
         }
         this._giveExclusiveAudioView.setAttribute("visible", false);
         ]]>
-    </handler>  
+    </handler> 
+    
+    <handler name="onclick">
+               <![CDATA[
+               if (canvas.ismoderator || canvas.isAllowedToGiveExclusiveAudio) 
{
+                       this.giveExclusiveAudio();
+               }
+               ]]>
+       </handler> 
     
     <dragstate name="dragger" />
     <resizestate name="rs"/>