openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From solo...@apache.org
Subject svn commit: r1455803 - in /openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard: base/baseDraw.lzx fixedFileExplorerWhiteBoard.lzx fixedFileExplorerWhiteboardPanel.lzx whiteboardBarMenu.lzx
Date Wed, 13 Mar 2013 05:21:47 GMT
Author: solomax
Date: Wed Mar 13 05:21:46 2013
New Revision: 1455803

URL: http://svn.apache.org/r1455803
Log:
[OPENMEETINGS-561] video on whiteboard is fixed

Modified:
    openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardBarMenu.lzx

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx?rev=1455803&r1=1455802&r2=1455803&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
Wed Mar 13 05:21:46 2013
@@ -144,29 +144,6 @@
 		this.baseactionobjectList = new Array();
 		this.baseredoactionobjectList = new Array();
 	</handler>
-	
-	<!--
-	<handler name="onkeydown" reference="lz.Keys" args="k">
-		if ($debug) Debug.write("onkeydown ",k,this,lz.Keys);
-	</handler>
-	<handler name="onkeyup" reference="lz.Keys" args="k">
-		if ($debug) Debug.debug("key %w %s", k, "up");
-    </handler>
-     -->
-	<!--
-        if (this.boundingref!=null) this.boundingref.removeIt();
-        while (this.subviews.length > 0) {
-            this.subviews[0].destroy();
-        }
-        while (this.basdrawredoView.subviews.length > 0) {
-            this.basdrawredoView.subviews[0].destroy();
-        }           
-        this.layers = new Array();
-        this.redolayers = new Array();
-        this.baseactionobjectList = new Array();
-        this.baseredoactionobjectList = new Array();    
-        this.checkStepLayers(); 
-     -->
       
     <method name="clearSlideOnly">
     	<![CDATA[

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1455803&r1=1455802&r2=1455803&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Wed Mar 13 05:21:46 2013
@@ -59,6 +59,11 @@
         if ($debug) Debug.info("Init Whiteboard ",this.restricted);
     </handler>
 
+    <handler name="ondestroy">
+		//if ($debug) Debug.write("############## fixedFileExplorerWhiteBoard::ondestroy : ", this);
+		this._drawareaMask._drawarea.clearRemote();
+    </handler>
+
     <method name="sendConfirmation" args="yesno,askagain" >
         
         ////Debug.write("clear yesno,askagain: ",yesno,askagain);
@@ -262,22 +267,6 @@
                 parent.parent.onsharedMessage.sendEvent(tempSendArray);
             </method>
             
-            <!--
-            <handler name="onopenWhiteBoard" >
-                var obj = new Array();
-                obj[0] = 'whiteboard';
-                obj[1] = 'initgetVars';
-                obj[2] = canvas.streamid;
-                
-                //Debug.write("Setting Message onopenWhiteBoard: ",canvas.moderatorStreamID,obj);
-                
-                this.parent.parent.sendObjectToClientID = canvas.moderatorStreamID;
-                this.parent.parent.sendObject = obj;
-                     
-                this.parent.parent.sendMessageWithClientById.doCall();
-            </handler>
-             -->
-             
             <handler name="onopenWhiteBoard" >
                 //parent.parent.getRoomItems.doCall();
             </handler>
@@ -336,11 +325,7 @@
             </method>
             
             <view name="_grid" x="-2" y="-2" height="${parent.height}" width="${parent.height}"

-                  visibility="${ (parent.showGrid) ? 'visible' : 'hidden'}">
-            	<!-- resource="_grid" -->
-            
-            </view>
-            
+                  visibility="${ (parent.showGrid) ? 'visible' : 'hidden'}"/>
         </remoteWhiteboard>   
     	
     </view>
@@ -430,19 +415,6 @@
             </handler>   
         </netRemoteCallHib>     
     
-    <!-- 
-        <netRemoteCallHib name="getRoomItems" funcname="whiteboardservice.getRoomItems"
-            remotecontext="$once{ canvas.thishib }" >
-            <handler name="ondata" args="value">
-                <![CDATA[
-                    //The onResult-Handler will be called be the rtmpconnection
-                    if ($debug) Debug.write("############## getRoomItems : ",value);
-                    canvas._drawarea.loadObjectList(value);
-                ]]>
-            </handler>   
-        </netRemoteCallHib>  
-     -->  
-        
     <view name="panelArea" width="${ parent.parent.width }" 
           height="${ parent.parent.height-42-parent._propertyPanel.height }">
         
@@ -524,31 +496,12 @@
         <method name="getDocumentsToolbar">
             return parent._propertyPanel._content._documentsPanel;
         </method>
-        <!--
-        <method name="getDocumentsToolbar">
-            <![CDATA[
-                for (var i=0;i<this.subviews.length;i++) {
-                    if (this.subviews[i] instanceof lz.documentIconTopPanel
-                        || this.subviews[i] instanceof lz.documentIconLeftPanel) {
-                        //this.subviews[i].setAttribute('visibility','visible');
-                        return this.subviews[i]._inner;
-                    }
-                }
-            ]]>
-        </method>
-         -->
         
         <mainToolsTopPanel x="100" y="0" name="_mainToolsPanel" 
              visible="${ ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true
: false )) }"/>
         
         <mainToolsLeftPanelPointer y="20" name="_mainToolsLeftPanelPointer" 
              visible="${ (parent.parent.restricted) ? false : (((canvas.ismoderator) ? false
: ((canvas.isAllowedToDraw) ? false : true ))) }"/>
-        
-        <!--
-        <documentIconTopPanel x="100" valign="bottom" name="_documentPanel"
-             visible="${ ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true
: false )) }" />
-         -->
-         
     </view> 
     
     <view name="zoombox" y="0" x="${ parent.parent.width-this.width-14 }" layout="axis:x;spacing:2"
@@ -621,20 +574,6 @@
             parent.panelArea.sendNewPropertyHeight(this);
         </handler>
     </propertyPanel>
-    
-    <!--
-    <view name="resetSize" x="${parent.width - 20}" width="10" height="10" >
-        <handler name="onclick">
-            this.parent.parent.setAttribute("width",this.parent.parent.initW); 
-            this.parent.parent.setAttribute("height",this.parent.parent.initH);
-            
-            this.parent.parent.onheight.sendEvent();
-            this.parent.parent.onwidth.sendEvent();
-            
-            this.setAttribute("x",this.parent.parent.initW - 20);
-        </handler>
-    </view>
-     -->
 </class>
 
 </library>

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1455803&r1=1455802&r2=1455803&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
Wed Mar 13 05:21:46 2013
@@ -188,7 +188,7 @@
         <handler name="ondata" args="value">
             <![CDATA[
                 //The onResult-Handler will be called be the rtmpconnection
-                if ($debug) Debug.write("############## deleteWhiteboard : ",value);
+                if ($debug) Debug.write("############## deleteWhiteboard : ", value);
             ]]>
         </handler>   
     </netRemoteCallHib>       
@@ -292,7 +292,6 @@
       
     
     <whiteboardBarMenu name="_bar" height="20" y="21">
-    	
     	<attribute name="whiteboardId" value="-1" type="number" />
     	
     	<handler name="onsubview" args="newSub">
@@ -301,23 +300,6 @@
     	<handler name="onwidth" args="newSub">
             parent.addNewItemButton.updatePosition();
         </handler>
-        
-        <!-- 
-        <handler name="oninit">
-        	this.currentBtn = this._button1;
-        </handler>
-         -->
-    	
-    	<!--
-    	<whiteboardMiniButton name="_button1" isactive="true">
-    		<handler name="oninit">
-    			this.setAttribute("btnName",canvas.getLabelName(615)+" 1");
-    			this.objRef = parent.parent._whiteboard1;
-    			this.onmouseout.sendEvent(this);
-    		</handler>
-    	</whiteboardMiniButton>
-    	 -->
-    	
     </whiteboardBarMenu>
     
     <view name="addNewItemButton" y="24" 
@@ -359,11 +341,6 @@
     	  bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }">
     	<attribute name="whiteboardId" value="-1" type="number" />
     </view>
-    
-    <!--
-    <multiWhiteboardPanel name="_whiteboard1" whiteboardId="1" /> 
-     -->
-    
 </class>
 
 </library>

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardBarMenu.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardBarMenu.lzx?rev=1455803&r1=1455802&r2=1455803&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardBarMenu.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardBarMenu.lzx
Wed Mar 13 05:21:46 2013
@@ -62,18 +62,18 @@
     </method>
     
     <method name="removeObjectSynced" args="btn">
+    <![CDATA[
     	var removeCurrent = false;
     	if (this.currentBtn == btn){
     		removeCurrent = true;
     	}
     	btn.objRef.destroy();
         btn.destroy();
-        if (this.subviews.length != 0) {
-	        if (removeCurrent) {
-	        	this.sendActiveWindowSynced(this.subviews[this.subviews.length-1]);
-	        }
+        if (this.subviews.length != 0 && removeCurrent) {
+        	this.sendActiveWindowSynced(this.subviews[this.subviews.length-1]);
         }
         parent.addNewItemButton.updatePosition();
+    ]]>
     </method>
 
     



Mime
View raw message