You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/12/06 07:36:50 UTC

svn commit: r1718145 [2/4] - in /openmeetings: branches/3.1.x/openmeetings-flash/src/main/swf/ branches/3.1.x/openmeetings-flash/src/main/swf/base/ branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/ branches/3.1.x/openmeetings-flash/src/mai...

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=1718145&r1=1718144&r2=1718145&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 Sun Dec  6 06:36:49 2015
@@ -8,8 +8,8 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
   
-      http://www.apache.org/licenses/LICENSE-2.0
-    	  
+	  http://www.apache.org/licenses/LICENSE-2.0
+		  
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,18 +29,18 @@
 		</when>
 	</switch>
 
-    <attribute name="offsetLength" type="number" value="40"/>
-    <attribute name="videoWidth" type="number" value="132"/>
-    <attribute name="videoHeight" type="number" value="132"/>
-    <attribute name="SIDEPANEL_WIDTH" type="number" value="270" />
-    <attribute name="testingApplication" value="null" />
-    <attribute name="baseVideoStream" value="null" />
-    
+	<attribute name="offsetLength" type="number" value="40"/>
+	<attribute name="videoWidth" type="number" value="132"/>
+	<attribute name="videoHeight" type="number" value="132"/>
+	<attribute name="SIDEPANEL_WIDTH" type="number" value="270" />
+	<attribute name="testingApplication" value="null" />
+	<attribute name="baseVideoStream" value="null" />
+	
 	<method name="toggleVideo" args="value">
 		if($debug) Debug.info("toggleVideo ", canvas.currentClient, value);
 		canvas.currentClient.canVideo = value;
 	</method>
-    
+	
 	<method name="createEditRecordStream" args="syncUpdate,isInterview,interviewPodId">
 		if($debug) Debug.info("createEditRecordStream,", syncUpdate, isInterview, interviewPodId, canvas.currentClient);
 		if (canvas.inner.editRecordStream != null)
@@ -76,110 +76,110 @@
 		The method to "play" the stream is invoked later, when the user
 		really starts to stream and not only when he just enters the room.
 	 -->
-    <method name="createVideoObject" args="publicSID,isBroadcasting,interviewPodId,object">
-        if($debug) Debug.info("createVideoObject, publicSID: ",publicSID, "isBroadcasting: ", isBroadcasting, "object", object);
-        var vidContainer = getVideoObjectByPublicSID(publicSID);
-        if(vidContainer == null) {
-            vidContainer = isBroadcasting ? this.getNewVideoObject(publicSID) : this.getNewVideoObjectByPos(publicSID);
-            vidContainer.publicSID = publicSID;
-        }
-        if ($debug) Debug.write("Is interview ? ",canvas.isInterview);
-        if (canvas.isInterview) {
-        	if ($debug) Debug.write("Is interview ",interviewPodId,"x",canvas["interviewPod"+interviewPodId+"_x"]);
+	<method name="createVideoObject" args="publicSID,isBroadcasting,interviewPodId,object">
+		if($debug) Debug.info("createVideoObject, publicSID: ",publicSID, "isBroadcasting: ", isBroadcasting, "object", object);
+		var vidContainer = getVideoObjectByPublicSID(publicSID);
+		if(vidContainer == null) {
+			vidContainer = isBroadcasting ? this.getNewVideoObject(publicSID) : this.getNewVideoObjectByPos(publicSID);
+			vidContainer.publicSID = publicSID;
+		}
+		if ($debug) Debug.write("Is interview ? ",canvas.isInterview);
+		if (canvas.isInterview) {
+			if ($debug) Debug.write("Is interview ",interviewPodId,"x",canvas["interviewPod"+interviewPodId+"_x"]);
 			if (interviewPodId != null) {
 				vidContainer.setAttribute("interviewPodId", interviewPodId);
 				vidContainer.setAttribute("x",canvas["interviewPod"+interviewPodId+"_x"]);
 				vidContainer.setAttribute("y",canvas["interviewPod"+interviewPodId+"_y"]);
 			}
-            vidContainer.setAttribute("width",322);
-            vidContainer.setAttribute("height",281);
-        }
-        vidContainer.clientVars = object;
-        vidContainer.setAttribute('visibility','hidden');
-        return vidContainer;
-    </method>
+			vidContainer.setAttribute("width",322);
+			vidContainer.setAttribute("height",281);
+		}
+		vidContainer.clientVars = object;
+		vidContainer.setAttribute('visibility','hidden');
+		return vidContainer;
+	</method>
 
 	<!-- 
 		
 		Method that creates the video views when user(self) initially entering a room.
 		Creates the video-view AND starts to stream/play the video
 	 -->
-    <method name="createVideo" args="publicSID,displayName,broadcastId,avsettings,interviewPodId,object">
-        <![CDATA[
-            if ($debug) Debug.info("createVideo, publicSID: ",publicSID,"broadcastId: ",broadcastId,"AVsettings: ",avsettings);
-            if ($debug) Debug.write(" createVideo ALL vars ",object);
-            var vidContainer = getVideoObjectByPublicSID(publicSID);
-            if(vidContainer == null) {
-                vidContainer = this.getNewVideoObjectByPos(publicSID);
-                vidContainer.clientVars = object;
-                vidContainer.setAttribute('chatpartnername',displayName);
-                if (avsettings=="n"){
-                    vidContainer.setVideouserProfilePic(object);
-                    vidContainer.setAttribute("visibility","hidden");
-                } else if (avsettings=="a"){
-                    vidContainer.setVideouserProfilePic(object);
-                    if ($debug) Debug.warn("start play");
-                    vidContainer._chatvideoinner._videostream.playStream(broadcastId,-1);
-                    vidContainer.setAttribute("visible", false);
-                } else if (avsettings=="v" || avsettings=="av") {
-                    //this means avsettings is either: "v" or "av"
-                	vidContainer.setDefaultVideoSize(object.VWidth,object.VHeight);
-                    vidContainer._chatvideoinner._videostream.playStream(broadcastId,-1);
-                    vidContainer.setAttribute("visibility","visible");
-                } else {
-                	//this means user did not select anything yet and streaming has not started
-                	vidContainer.setAttribute("visibility","hidden");
-                }
-                vidContainer.setAttribute("interviewPodId", interviewPodId);
-                vidContainer.updateAVSettingsSymbol(object);
-                if (object.micMuted) {
-            	    vidContainer.setMicMuted(object.micMuted);
-           	 	}
-            }
-            
-            
-            if ($debug) Debug.write("Is interview ? ",canvas.isInterview);
-            if (canvas.isInterview && interviewPodId != null && interviewPodId > 0) {
-                if ($debug) Debug.write("Is interview ",interviewPodId,"x",canvas["interviewPod"+interviewPodId+"_x"]);
-                vidContainer.setAttribute("interviewPodId", interviewPodId);
-                vidContainer.setAttribute("x",canvas["interviewPod"+interviewPodId+"_x"]);
-                vidContainer.setAttribute("y",canvas["interviewPod"+interviewPodId+"_y"]);
-                vidContainer.setAttribute("width",322);
-                vidContainer.setAttribute("height",281);
-            }
-			return;
-        ]]>
-    </method>
-    
-    <method name="getVideoObjectByPublicSID" args="publicSID">
-    	<![CDATA[
-    		//if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH: ",publicSID);
-        	for (var i=0;i<this.subviews.length;i++){
-        	    //if ($debug) Debug.write("this.subviews[i].publicSID ",this.subviews[i].publicSID);
-    			if (this.subviews[i].publicSID==publicSID){
-    				return this.subviews[i];
-    			}
-    		}
-    		if ($debug) Debug.warn(" - getVideoObjectByPublicSID - DID NOT FIND THE USER BY ",publicSID);
-            return null;
-    	]]>
-    </method>
-
-    <method name="getNewVideoObjectByPos" args="publicSID">
-        <![CDATA[
-            //Get a Free VideoView Slot
-            var freePos = this.getVideoObjectFreePos(this.offsetLength,this.videoWidth,this.videoHeight);
-
-            return new lz.videoObjectPlayBroadcast(this,{
-                    publicSID:publicSID,
-                    width:videoWidth,
-                    height:videoHeight,
-                    x:freePos[0],
-                    y:freePos[1],
-                    isInterview:canvas.isInterview
-                });
-        ]]>
-    </method>
+	<method name="createVideo" args="publicSID,displayName,broadcastId,avsettings,interviewPodId,object">
+		<![CDATA[
+			if ($debug) Debug.info("createVideo, publicSID: ",publicSID,"broadcastId: ",broadcastId,"AVsettings: ",avsettings);
+			if ($debug) Debug.write(" createVideo ALL vars ",object);
+			var vidContainer = getVideoObjectByPublicSID(publicSID);
+			if(vidContainer == null) {
+				vidContainer = this.getNewVideoObjectByPos(publicSID);
+				vidContainer.clientVars = object;
+				vidContainer.setAttribute('chatpartnername',displayName);
+				if (avsettings=="n"){
+					vidContainer.setVideouserProfilePic(object);
+					vidContainer.setAttribute("visibility","hidden");
+				} else if (avsettings=="a"){
+					vidContainer.setVideouserProfilePic(object);
+					if ($debug) Debug.warn("start play");
+					vidContainer._chatvideoinner._videostream.playStream(broadcastId,-1);
+					vidContainer.setAttribute("visible", false);
+				} else if (avsettings=="v" || avsettings=="av") {
+					//this means avsettings is either: "v" or "av"
+					vidContainer.setDefaultVideoSize(object.VWidth,object.VHeight);
+					vidContainer._chatvideoinner._videostream.playStream(broadcastId,-1);
+					vidContainer.setAttribute("visibility","visible");
+				} else {
+					//this means user did not select anything yet and streaming has not started
+					vidContainer.setAttribute("visibility","hidden");
+				}
+				vidContainer.setAttribute("interviewPodId", interviewPodId);
+				vidContainer.updateAVSettingsSymbol(object);
+				if (object.micMuted) {
+					vidContainer.setMicMuted(object.micMuted);
+		   	 	}
+			}
+			
+			
+			if ($debug) Debug.write("Is interview ? ",canvas.isInterview);
+			if (canvas.isInterview && interviewPodId != null && interviewPodId > 0) {
+				if ($debug) Debug.write("Is interview ",interviewPodId,"x",canvas["interviewPod"+interviewPodId+"_x"]);
+				vidContainer.setAttribute("interviewPodId", interviewPodId);
+				vidContainer.setAttribute("x",canvas["interviewPod"+interviewPodId+"_x"]);
+				vidContainer.setAttribute("y",canvas["interviewPod"+interviewPodId+"_y"]);
+				vidContainer.setAttribute("width",322);
+				vidContainer.setAttribute("height",281);
+			}
+			return;
+		]]>
+	</method>
+	
+	<method name="getVideoObjectByPublicSID" args="publicSID">
+		<![CDATA[
+			//if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH: ",publicSID);
+			for (var i=0;i<this.subviews.length;i++){
+				//if ($debug) Debug.write("this.subviews[i].publicSID ",this.subviews[i].publicSID);
+				if (this.subviews[i].publicSID==publicSID){
+					return this.subviews[i];
+				}
+			}
+			if ($debug) Debug.warn(" - getVideoObjectByPublicSID - DID NOT FIND THE USER BY ",publicSID);
+			return null;
+		]]>
+	</method>
+
+	<method name="getNewVideoObjectByPos" args="publicSID">
+		<![CDATA[
+			//Get a Free VideoView Slot
+			var freePos = this.getVideoObjectFreePos(this.offsetLength,this.videoWidth,this.videoHeight);
+
+			return new lz.videoObjectPlayBroadcast(this,{
+					publicSID:publicSID,
+					width:videoWidth,
+					height:videoHeight,
+					x:freePos[0],
+					y:freePos[1],
+					isInterview:canvas.isInterview
+				});
+		]]>
+	</method>
 
 	<method name="getNewVideoObject" args="publicSID">
 	<![CDATA[
@@ -191,17 +191,17 @@
 	]]>
 	</method>
 
-    <method name="getVideoObjectByInterviewPodId" args="interviewPodId">
-        <![CDATA[
-            for (var i=0;i<this.subviews.length;i++){
-                if (this.subviews[i].interviewPodId==interviewPodId){
-                    return this.subviews[i];
-                }
-            }
-            if ($debug) Debug.warn(" - getVideoObjectByInterviewPodId - DID NOT FIND THE USER BY ",interviewPodId);
-            return null;
-        ]]>
-    </method>
+	<method name="getVideoObjectByInterviewPodId" args="interviewPodId">
+		<![CDATA[
+			for (var i=0;i<this.subviews.length;i++){
+				if (this.subviews[i].interviewPodId==interviewPodId){
+					return this.subviews[i];
+				}
+			}
+			if ($debug) Debug.warn(" - getVideoObjectByInterviewPodId - DID NOT FIND THE USER BY ",interviewPodId);
+			return null;
+		]]>
+	</method>
 
 	<method name="getVideoObjectCount">
 	<![CDATA[
@@ -215,53 +215,53 @@
 	]]>
 	</method>
 
-    <method name="getVideoObjectFreePos" args="offsetLength,videoWidth,videoHeight">
-        <![CDATA[
-            var newx = 20;
-            if (canvas.currentRoomObj.hideWhiteboard) {
-                newx += SIDEPANEL_WIDTH;
-            }
-            var newy = 0;
-            var posFound = false;
-            if (offsetLength == undefined) {
-                offsetLength=10;
-            }
-            while (!posFound) {
-                posFound = true;
-                for (var i=0;i<this.subviews.length;i++){
-                    var subview = this.subviews[i];
-                    var left = subview.x;
-                    var right = subview.x + subview.width;
-                    var top = subview.y;
-                    var bottom = subview.y + subview.height;
-
-                    if( !(newx > right
-                        || (newx + videoWidth) < left
-                        || newy > bottom
-                        || (newy + videoHeight) < top ))
-                    {
-                        newx = right + offsetLength;
-                        posFound = false;
-                    }
-                    if ((newx + videoWidth) >= canvas.width) {
-                        newx = 20;
-                        if (canvas.currentRoomObj.hideWhiteboard) {
-                            newx += SIDEPANEL_WIDTH;
-                        }
-                        newy += 10;
-                        posFound = false;
-                    }
-                }
-            }
-
-            if ((newy + videoHeight) >= canvas.height) {
-                newy = 0;
-            }
-
-            var result = [newx, newy];
-            return result;
-        ]]>
-    </method>
+	<method name="getVideoObjectFreePos" args="offsetLength,videoWidth,videoHeight">
+		<![CDATA[
+			var newx = 20;
+			if (canvas.currentRoomObj.hideWhiteboard) {
+				newx += SIDEPANEL_WIDTH;
+			}
+			var newy = 0;
+			var posFound = false;
+			if (offsetLength == undefined) {
+				offsetLength=10;
+			}
+			while (!posFound) {
+				posFound = true;
+				for (var i=0;i<this.subviews.length;i++){
+					var subview = this.subviews[i];
+					var left = subview.x;
+					var right = subview.x + subview.width;
+					var top = subview.y;
+					var bottom = subview.y + subview.height;
+
+					if( !(newx > right
+						|| (newx + videoWidth) < left
+						|| newy > bottom
+						|| (newy + videoHeight) < top ))
+					{
+						newx = right + offsetLength;
+						posFound = false;
+					}
+					if ((newx + videoWidth) >= canvas.width) {
+						newx = 20;
+						if (canvas.currentRoomObj.hideWhiteboard) {
+							newx += SIDEPANEL_WIDTH;
+						}
+						newy += 10;
+						posFound = false;
+					}
+				}
+			}
+
+			if ((newy + videoHeight) >= canvas.height) {
+				newy = 0;
+			}
+
+			var result = [newx, newy];
+			return result;
+		]]>
+	</method>
 
 	<method name="disconnectclient" args="publicSID">
 	<![CDATA[
@@ -275,22 +275,22 @@
 	]]>
 	</method>
 
-    <method name="muteSound" args="publicSID, bool">
-        <![CDATA[
-            var obj = this.getVideoObjectByPublicSID(publicSID);
-            if (obj != null) {
-                obj.silenceMicrophone(bool);
-            }
-            return;
-        ]]>
-    </method>
-
-    <method name="resetAllValues">
-        for (var eg in this.subviews){
-            this.subviews[eg].resetValues();
-        }
-        return;
-    </method>
+	<method name="muteSound" args="publicSID, bool">
+		<![CDATA[
+			var obj = this.getVideoObjectByPublicSID(publicSID);
+			if (obj != null) {
+				obj.silenceMicrophone(bool);
+			}
+			return;
+		]]>
+	</method>
+
+	<method name="resetAllValues">
+		for (var eg in this.subviews){
+			this.subviews[eg].resetValues();
+		}
+		return;
+	</method>
 
 	<method name="closeStreamclient" args="publicSID">
 	<![CDATA[
@@ -309,13 +309,13 @@
 	]]>
 	</method>
 
-    <method name="removeVideoByUser" args="publicSID"><![CDATA[
-        var obj = this.closeStreamclient(publicSID);
-        if(obj != null) {
-            obj.destroy();
-        }
-        return;
-    ]]></method>
+	<method name="removeVideoByUser" args="publicSID"><![CDATA[
+		var obj = this.closeStreamclient(publicSID);
+		if(obj != null) {
+			obj.destroy();
+		}
+		return;
+	]]></method>
 
 	<method name="updateMuteStatusVideoView" args="roomClient">
 	<![CDATA[
@@ -362,85 +362,85 @@
 	]]>
 	</method>
 
-    <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId,width,height">
-        <![CDATA[
-            if ($debug) Debug.write("startStream: ", publicSID,broadcastId,firstname,lastname,interviewPodId,width,height);
-            var obj = this.getVideoObjectByPublicSID(publicSID);
-            //if ($debug) Debug.write("startStream obj: ",obj);
-            if (obj != null ){
-                obj._chatvideoinner._videostream.playStream(broadcastId,-1);
-                obj.setDefaultVideoSize(width,height);
-                obj.setAttribute('chatpartnername',firstname+' '+lastname);
-            }
-            //we have to do this again when the stream starts, the initial video 
-            //component does not know the interviewPodId as the user has not selected 
-            //which interview video pod he is going to use
-            if (canvas.isInterview && interviewPodId != null && interviewPodId > 0) {
-                if ($debug) Debug.write("Is interview ",interviewPodId,"x",canvas["interviewPod"+interviewPodId+"_x"]);
-                obj.setAttribute("interviewPodId", interviewPodId);
-                obj.setAttribute("x",canvas["interviewPod"+interviewPodId+"_x"]);
-                obj.setAttribute("y",canvas["interviewPod"+interviewPodId+"_y"]);
-                obj.setAttribute("width",322);
-                obj.setAttribute("height",281);
-            }
-            return;
-        ]]>
-    </method>
+	<method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId,width,height">
+		<![CDATA[
+			if ($debug) Debug.write("startStream: ", publicSID,broadcastId,firstname,lastname,interviewPodId,width,height);
+			var obj = this.getVideoObjectByPublicSID(publicSID);
+			//if ($debug) Debug.write("startStream obj: ",obj);
+			if (obj != null ){
+				obj._chatvideoinner._videostream.playStream(broadcastId,-1);
+				obj.setDefaultVideoSize(width,height);
+				obj.setAttribute('chatpartnername',firstname+' '+lastname);
+			}
+			//we have to do this again when the stream starts, the initial video 
+			//component does not know the interviewPodId as the user has not selected 
+			//which interview video pod he is going to use
+			if (canvas.isInterview && interviewPodId != null && interviewPodId > 0) {
+				if ($debug) Debug.write("Is interview ",interviewPodId,"x",canvas["interviewPod"+interviewPodId+"_x"]);
+				obj.setAttribute("interviewPodId", interviewPodId);
+				obj.setAttribute("x",canvas["interviewPod"+interviewPodId+"_x"]);
+				obj.setAttribute("y",canvas["interviewPod"+interviewPodId+"_y"]);
+				obj.setAttribute("width",322);
+				obj.setAttribute("height",281);
+			}
+			return;
+		]]>
+	</method>
 
 	<!---
 		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) {
-        	if (this.subviews[0]._chatvideoinner != null) {
-            	this.subviews[0]._chatvideoinner._videostream._stop();
-            }
-            this.subviews[0].destroy();
-        }
-        if (canvas.inner.editRecordStream != null) {
-            canvas.inner.editRecordStream.destroy();
-        }
-        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
-    -->
-    <method name="changeDevice">
-        <![CDATA[
-            if ($debug) Debug.write("changeDevice");
-            new lz.changeDevice(canvas.inner, {
-					                name:"changeDeviceDialog"
-					            });
-            return;
-        ]]>
-    </method>
-
-    <!---
-        Shows the exit dialog
-    -->
-    <method name="exitRoom">
-        if ($debug) Debug.write("exitRoom");
-        new lz.confirmationSingle(canvas,{
-                refObj:this,
-                labelid:791,
-                labeliderror:790,
-                refReturnMethod:'immediateExitRoom',
-                showCheckBox:false
-            });
-        return;
-    </method>
+	<method name="clearAll">
+	<![CDATA[
+		if ($debug) Debug.write("clearAll", this.subviews);
+		while(this.subviews.length > 0) {
+			if (this.subviews[0]._chatvideoinner != null) {
+				this.subviews[0]._chatvideoinner._videostream._stop();
+			}
+			this.subviews[0].destroy();
+		}
+		if (canvas.inner.editRecordStream != null) {
+			canvas.inner.editRecordStream.destroy();
+		}
+		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
+	-->
+	<method name="changeDevice">
+		<![CDATA[
+			if ($debug) Debug.write("changeDevice");
+			new lz.changeDevice(canvas.inner, {
+									name:"changeDeviceDialog"
+								});
+			return;
+		]]>
+	</method>
+
+	<!---
+		Shows the exit dialog
+	-->
+	<method name="exitRoom">
+		if ($debug) Debug.write("exitRoom");
+		new lz.confirmationSingle(canvas,{
+				refObj:this,
+				labelid:791,
+				labeliderror:790,
+				refReturnMethod:'immediateExitRoom',
+				showCheckBox:false
+			});
+		return;
+	</method>
 
 	<method name="immediateExitRoom" args="bool,ctx">
 	<![CDATA[
@@ -473,10 +473,10 @@
 		var windowsList = this.subviews;
 
 		if (0 == windowsList.length) {
-            return;
+			return;
 		}
 
-        windowsList.sort(this.sortFunction);
+		windowsList.sort(this.sortFunction);
 
 		var offsetInPx = 40;
 		var initX = 20;
@@ -489,15 +489,15 @@
 		for (var winIdx = 0; winIdx < windowsList.length; winIdx++) {
 			var window = windowsList[winIdx];
 			if (canvas.width < xPos + window.width) {
-                yPos += rowHeight + offsetInPx;
-                xPos = initX;
-                rowHeight = window.height;
+				yPos += rowHeight + offsetInPx;
+				xPos = initX;
+				rowHeight = window.height;
 			}
 			if (canvas.height < yPos) {
-			    initX += 10;
-			    initY += 10;
-			    xPos = initX;
-			    yPos = initY;
+				initX += 10;
+				initY += 10;
+				xPos = initX;
+				yPos = initY;
 			}
 			window.setAttribute("x", xPos);
 			window.setAttribute("y", yPos);
@@ -508,222 +508,219 @@
 	]]>
 	</method>
 
-    <!-- @keyword private -->
-    <method name="sortFunction" args="el1, el2">
-        <![CDATA[
-            if (el1.height > el2.height) {
-                return -1;
-            } else if (el1.height < el2.height) {
-                return 1;
-            }
-            return 0;
-        ]]>
-    </method>
-
-    <!---
-        Starts the 5 second audio/video testing application and connect to RTMP
-     -->
-    <method name="doInitTestingApplication" args="x,y,connection_url">
-        if($debug) Debug.write("doInitTestingApplication ",x,y);
-        canvas.thishib.setAttribute('src',connection_url);
-        canvas.thishib.connect();
-        this.testingApplication = new lz.testingApplication(canvas,{name:'currentSharing',x:x+1,y:y+24});
-    </method>
-    
-    <!---
-        Stops and destroys the view with the audio/video testing application
-        and send confirmation back via LocalConnection
-     -->
-    <method name="closeInitTestingApplication">
-        if($debug) Debug.write("closeInitTestingApplication ");
-        if (this.testingApplication != null) {
-            this.testingApplication.storeSettings();
-            this.testingApplication.destroy();
-            this.testingApplication = null;
-        }
-    </method>
-    
-    <!---
-        Initializes video playback component
-        and connect to RTMP
-     -->
-    <method name="connectRecordingPlayer" args="connection_url,x,y,width,height">
-    	if($debug) Debug.write("connectRecordingPlayer ", connection_url,x,y,width,height);
-    	canvas.thishib.setAttribute('src',connection_url);
-        canvas.thishib.connect();
-        this.baseVideoStream = new lz.playBackVideoStream(canvas,{
-            x:x,
-            y:y,
-            width:width,
-            height:height
-        });
-    </method> 
-    
-    <!---
-        plays a recorded stream
-     -->
-    <method name="playRecordingStream" args="streamName,delay,x,y,width,height">
-    	if($debug) Debug.write("playRecordingStream ",streamName,x,y,width,height);
-    	if (this.baseVideoStream == null) {
-    		if ($debug) Debug.warn("baseVideoStream is NULL");
-    		return;
-    	}
-    	this.baseVideoStream.setAttribute("x",x);
-    	this.baseVideoStream.setAttribute("y",y);
-    	this.baseVideoStream.setAttribute("width",width);
-    	this.baseVideoStream.setAttribute("height",height);
-    	this.baseVideoStream.setAttribute("visibility","visible");
-    	this.baseVideoStream.playRecordingStream(streamName,delay);
-    </method>
-    
-    <!---
-        Updates the width/height property of the recording playback video 
-     -->    
-    <method name="updateRecordingVideoPosition" args="width,height">
-    	if (this.baseVideoStream == null) {
-    		if ($debug) Debug.warn("baseVideoStream is NULL");
-            return;
-        }
-        this.baseVideoStream.setAttribute("width",width);
-        this.baseVideoStream.setAttribute("height",height);
-    </method>
-    
-    <!---
-        stops and hides the recording playback video
-     -->
-    <method name="stopRecordingStream">
-    	if($debug) Debug.write("stopRecordingStream ");
-        if (this.baseVideoStream == null) {
-        	if ($debug) Debug.warn("baseVideoStream is NULL");
-            return;
-        }
-        if($debug) Debug.write(" stopRecording ");
-        this.baseVideoStream.stopRecording();
-        this.baseVideoStream.setAttribute("visibility","hidden");
-    </method>
-    
-    <!--- 
-        pauses the current video or continue at the same position
-     -->
-    <method name="pauseRecordingPlayback" args="pauseBool">
-    	if($debug) Debug.write("pauseRecordingPlayback ");
-        if (this.baseVideoStream == null) {
-        	if ($debug) Debug.warn("baseVideoStream is NULL");
-            return;
-        }
-        this.baseVideoStream.pause(pauseBool);
-    </method>
-    
-    <method name="seekRecordingPlayback" args="flvTime">
-    	if($debug) Debug.write("seekRecordingPlayback ",flvTime);
-        if (this.baseVideoStream == null) {
-        	if ($debug) Debug.warn("baseVideoStream is NULL");
-            return;
-        }
-        this.baseVideoStream.seekStream(flvTime);
-    </method>
-    
-    <method name="stopAndCloseRecordingConnection">
-    	if($debug) Debug.write("stopAndCloseRecordingConnection ");
-        if (this.baseVideoStream == null) {
-        	if ($debug) Debug.warn("baseVideoStream is NULL");
-            return;
-        }
-        this.baseVideoStream.stopRecording();
-        this.baseVideoStream.destroy();
-        this.baseVideoStream = null;
-    </method>
-    
-    <!---
-       #################################
-       Methods to handle screen sharing video playback and cursor
-     -->
-     
-    <!---
-        Adds a new screen sharing playback video
-     -->
-    <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);
-                }
-                new lz.screenSharingDialog(canvas.screenSharingDialogContainer,{
-                            initObject:value 
-                        }); 
-            } else {
-                if ($debug) Debug.warn("Self Screen Sharing");
-            }
-    	]]>
-    </method> 
-    
-    <!---
-        Add a list of screen sharing playback videos 
-        (initially when entering the room invoked)
-     -->
-    <method name="newScreenSharings" args="value, h">
-     	<![CDATA[
-     		canvas.chatHeight = h;
-     	    for (var eg in value) {
-                this.newScreenSharing(value[eg], h);
-            }
-     	]]>
-    </method>
-   
-    <!---
-        Close a single screen sharing playback video
-     --> 
-	<method name="closeScreenSharing" args="value">
+	<!-- @keyword private -->
+	<method name="sortFunction" args="el1, el2">
 		<![CDATA[
-			if (canvas.screenSharingDialogContainer != null) {
-				var obj = canvas.screenSharingDialogContainer
-						.searchForSession(value.streamPublishName);
-				if (obj) {
-					obj.doClose();
-				}
+			if (el1.height > el2.height) {
+				return -1;
+			} else if (el1.height < el2.height) {
+				return 1;
 			}
+			return 0;
 		]]>
 	</method>
-	    
+
+	<!---
+		Starts the 5 second audio/video testing application and connect to RTMP
+	 -->
+	<method name="doInitTestingApplication" args="x,y,connection_url">
+		if($debug) Debug.write("doInitTestingApplication ",x,y);
+		canvas.thishib.setAttribute('src',connection_url);
+		canvas.thishib.connect();
+		this.testingApplication = new lz.testingApplication(canvas,{name:'currentSharing',x:x+1,y:y+24});
+	</method>
+	
+	<!---
+		Stops and destroys the view with the audio/video testing application
+		and send confirmation back via LocalConnection
+	 -->
+	<method name="closeInitTestingApplication">
+		if($debug) Debug.write("closeInitTestingApplication ");
+		if (this.testingApplication != null) {
+			this.testingApplication.storeSettings();
+			this.testingApplication.destroy();
+			this.testingApplication = null;
+		}
+	</method>
+	
+	<!---
+		Initializes video playback component
+		and connect to RTMP
+	 -->
+	<method name="connectRecordingPlayer" args="connection_url,x,y,width,height">
+		if($debug) Debug.write("connectRecordingPlayer ", connection_url,x,y,width,height);
+		canvas.thishib.setAttribute('src',connection_url);
+		canvas.thishib.connect();
+		this.baseVideoStream = new lz.playBackVideoStream(canvas,{
+			x:x,
+			y:y,
+			width:width,
+			height:height
+		});
+	</method> 
+	
+	<!---
+		plays a recorded stream
+	 -->
+	<method name="playRecordingStream" args="streamName,delay,x,y,width,height">
+		if($debug) Debug.write("playRecordingStream ",streamName,x,y,width,height);
+		if (this.baseVideoStream == null) {
+			if ($debug) Debug.warn("baseVideoStream is NULL");
+			return;
+		}
+		this.baseVideoStream.setAttribute("x",x);
+		this.baseVideoStream.setAttribute("y",y);
+		this.baseVideoStream.setAttribute("width",width);
+		this.baseVideoStream.setAttribute("height",height);
+		this.baseVideoStream.setAttribute("visibility","visible");
+		this.baseVideoStream.playRecordingStream(streamName,delay);
+	</method>
+	
+	<!---
+		Updates the width/height property of the recording playback video 
+	 -->	
+	<method name="updateRecordingVideoPosition" args="width,height">
+		if (this.baseVideoStream == null) {
+			if ($debug) Debug.warn("baseVideoStream is NULL");
+			return;
+		}
+		this.baseVideoStream.setAttribute("width",width);
+		this.baseVideoStream.setAttribute("height",height);
+	</method>
+	
+	<!---
+		stops and hides the recording playback video
+	 -->
+	<method name="stopRecordingStream">
+		if($debug) Debug.write("stopRecordingStream ");
+		if (this.baseVideoStream == null) {
+			if ($debug) Debug.warn("baseVideoStream is NULL");
+			return;
+		}
+		if($debug) Debug.write(" stopRecording ");
+		this.baseVideoStream.stopRecording();
+		this.baseVideoStream.setAttribute("visibility","hidden");
+	</method>
+	
+	<!--- 
+		pauses the current video or continue at the same position
+	 -->
+	<method name="pauseRecordingPlayback" args="pauseBool">
+		if($debug) Debug.write("pauseRecordingPlayback ");
+		if (this.baseVideoStream == null) {
+			if ($debug) Debug.warn("baseVideoStream is NULL");
+			return;
+		}
+		this.baseVideoStream.pause(pauseBool);
+	</method>
+	
+	<method name="seekRecordingPlayback" args="flvTime">
+		if($debug) Debug.write("seekRecordingPlayback ",flvTime);
+		if (this.baseVideoStream == null) {
+			if ($debug) Debug.warn("baseVideoStream is NULL");
+			return;
+		}
+		this.baseVideoStream.seekStream(flvTime);
+	</method>
+	
+	<method name="stopAndCloseRecordingConnection">
+		if($debug) Debug.write("stopAndCloseRecordingConnection ");
+		if (this.baseVideoStream == null) {
+			if ($debug) Debug.warn("baseVideoStream is NULL");
+			return;
+		}
+		this.baseVideoStream.stopRecording();
+		this.baseVideoStream.destroy();
+		this.baseVideoStream = null;
+	</method>
+	
+	<!---
+	   #################################
+	   Methods to handle screen sharing video playback and cursor
+	 -->
+	 
+	<!---
+		Adds a new screen sharing playback video
+	 -->
+	<method name="newScreenSharing" args="value">
+	<![CDATA[
+		if (value.streamPublishName != canvas.publicSID) {
+			if (canvas.screenSharingDialogContainer == null) {
+				canvas.screenSharingDialogContainer = new lz.screenSharingDialogContainer(canvas);
+			}
+			new lz.screenSharingDialog(canvas.screenSharingDialogContainer, {initObject: value}); 
+		} else {
+			if ($debug) Debug.warn("Self Screen Sharing");
+		}
+	]]>
+	</method> 
+	
+	<!---
+		Add a list of screen sharing playback videos 
+		(initially when entering the room invoked)
+	 -->
+	<method name="newScreenSharings" args="value">
+	<![CDATA[
+		for (var eg in value) {
+			this.newScreenSharing(value[eg]);
+		}
+	]]>
+	</method>
+   
+	<!---
+		Close a single screen sharing playback video
+	 --> 
+	<method name="closeScreenSharing" args="value">
+	<![CDATA[
+		if (canvas.screenSharingDialogContainer != null) {
+			var obj = canvas.screenSharingDialogContainer.searchForSession(value.streamPublishName);
+			if (obj) {
+				obj.doClose();
+			}
+		}
+	]]>
+	</method>
+		
 	<!---
 	   Closes all screen sharing playback videos, whiteboard videos, user videos 
 	   and closes the rtmp connection
 	 -->
 	<method name="closeAllScreenSharings">
-        <![CDATA[
-            if ($debug) Debug.write("RECEIVE closeAllScreenSharings ");
-            if (canvas.screenSharingDialogContainer != null) {
-                canvas.screenSharingDialogContainer.closeAll();
-                canvas.screenSharingDialogContainer.destroy();
-                canvas.screenSharingDialogContainer = null;
-            }
-            parent._videoComponent.clearAll();
-        ]]>
-    </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
-     -->
+	<![CDATA[
+		if ($debug) Debug.write("RECEIVE closeAllScreenSharings ");
+		if (canvas.screenSharingDialogContainer != null) {
+			canvas.screenSharingDialogContainer.closeAll();
+			canvas.screenSharingDialogContainer.destroy();
+			canvas.screenSharingDialogContainer = null;
+		}
+		parent._videoComponent.clearAll();
+	]]>
+	</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">
-		<![CDATA[
-			if (canvas.screenSharingDialogContainer != null) {
-				var obj = canvas.screenSharingDialogContainer.searchForSession(value.streamPublishName);
+	<![CDATA[
+		if (canvas.screenSharingDialogContainer != null) {
+			var obj = canvas.screenSharingDialogContainer.searchForSession(value.streamPublishName);
+			if (obj) {
 				obj.updateCursor(value.cursor_x, value.cursor_y);
 			}
-		]]>
+		}
+	]]>
 	</method>
 	
 	<!---
@@ -738,9 +735,9 @@
 	]]>
 	</method>
 	
-    <!--
-        Container to hold all whiteboard videos
-     -->	
+	<!--
+		Container to hold all whiteboard videos
+	-->	
 </class>
 
 </library>

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx?rev=1718145&r1=1718144&r2=1718145&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx Sun Dec  6 06:36:49 2015
@@ -114,12 +114,12 @@
     
     <view name="_cbtext" width="${ parent.width }" layout="axis:y;spacing:0" >
     	<method name="clearChatOutput">
-    		<![CDATA[
-    			while (this.subviews.length>0){
-    				this.subviews[0].destroy();
-    			}
-    		]]>
-    	</method>
+		<![CDATA[
+			while (this.subviews.length > 0){
+				this.subviews[0].destroy();
+			}
+		]]>
+		</method>
     </view>
     
     <om_vscrollbar name="myscrollbar" />