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 2017/01/30 08:14:39 UTC

svn commit: r1780875 - in /openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf: commonVideoViewContentSWF10.lzx screensharing/screenSharingDialog.lzx screensharing/videoObjectPlayScreenShare.lzx

Author: solomax
Date: Mon Jan 30 08:14:38 2017
New Revision: 1780875

URL: http://svn.apache.org/viewvc?rev=1780875&view=rev
Log:
[OPENMEETINGS-1545] screen-sharing is displayed as expected

Modified:
    openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
    openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/screensharing/screenSharingDialog.lzx
    openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/screensharing/videoObjectPlayScreenShare.lzx

Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1780875&r1=1780874&r2=1780875&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx Mon Jan 30 08:14:38 2017
@@ -600,18 +600,6 @@
 	</method>
 
 	<!---
-		change Screen Sharing frame 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">

Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/screensharing/screenSharingDialog.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/screensharing/screenSharingDialog.lzx?rev=1780875&r1=1780874&r2=1780875&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/screensharing/screenSharingDialog.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/screensharing/screenSharingDialog.lzx Mon Jan 30 08:14:38 2017
@@ -7,19 +7,19 @@
   to you under the Apache License, Version 2.0 (the
   "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
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
-  
+
 -->
 <library>
-	
+
 <class name="screenSharingDialogContainer" extends="view" width="${ parent.width }" height="${ parent.height }">
 	<method name="closeAll">
 	<![CDATA[
@@ -31,7 +31,7 @@
 		this.clearAllSessions();
 	]]>
 	</method>
-	
+
 	<method name="clearAllSessions">
 	<![CDATA[
 		if ($debug) Debug.write("screenSharingDialogContainer clearAllSessions");
@@ -40,7 +40,7 @@
 		}
 	]]>
 	</method>
-	
+
 	<method name="searchForSession" args="streamPublishName">
 	<![CDATA[
 		for (var i = 0; i < this.subviews.length; ++i) {
@@ -52,99 +52,85 @@
 		return null;
 	]]>
 	</method>
-	
-	<method name="hideChatContent" args="hide">
-	<![CDATA[
-		if ($debug) Debug.write("hideChatContent::isStarted ", this.subviews[0].isStarted);
-		if (this.subviews[0] != null &&  this.subviews[0].isStarted) {
-			canvas.chatHeight = hide ? 22 : 200;
-			if ($debug) Debug.write("hideChatContent::chatHeight ", canvas.chatHeight);
-			this.subviews[0].startViewerSession();
-		}
-	]]>
-	</method>
-</class>	
+</class>
 
 <class name="screenSharingDialog" extends="labelExplorerBox" labelid="855"
-	docking="true" resizeable="true" closable="true" 
+	docking="true" resizeable="true" closable="true"
 	width="270" x="$once{ canvas.width - this.width - 20 }" height="100">
-	
+
 	<attribute name="isStarted" value="false" type="boolean" />
-	
+
 	<attribute name="currentCursorObject" value="null" />
-	
+
 	<attribute name="initObject" value="null"/>
-	
+
 	<handler name="oninit">
 		var fName = " " + this.initObject.firstname + " " + this.initObject.lastname;
 		var tString = canvas.getLabelName(849) + " " + fName + " " + canvas.getLabelName(850);
-		
+
 		this.setAttribute('title', canvas.getLabelName(855) + " " + fName);
 		if (parent.subviews.length > 1) {
 			this.setAttribute("y",((parent.subviews.length-1)*100)+40);
 		} else {
 			this.setAttribute("y",40);
 		}
-		
+
 		this._initText._infoText.setAttribute("text",tString);
 	</handler>
-	
+
 	<method name="startViewerSession">
 	<![CDATA[
 		this.isStarted = true;
-		
+
 		this._subcontent.setAttribute("visibility","visible");
-		
+
 		this._initText.setAttribute("visibility","hidden");
-	
+
 		this._showScreenSharing._y.setAttribute("to",0);
-		this._showScreenSharing._height.setAttribute("to",canvas.height - canvas.chatHeight);
-		this._showScreenSharing._width.setAttribute("to",canvas.width-260);
+		this._showScreenSharing._height.setAttribute("to", canvas.height);
+		this._showScreenSharing._width.setAttribute("to", canvas.width-260);
 		this._showScreenSharing._x.setAttribute("to",260);
-	
+
 		this._showScreenSharing.setAttribute('started', true);
-		
+
 		if ($debug) Debug.write("this.initObject ",this.initObject);
-		
+
 		this._subcontent._content._video.setAttribute("width",this.initObject.VWidth);
 		this._subcontent._content._video.setAttribute("height",this.initObject.VHeight);
-		
+
 		this._subcontent._content._video._videostream.playStream(this.initObject.streamPublishName,-1);
-		
 	]]>
 	</method>
-	
+
 	<method name="doMinimize">
-		<![CDATA[
-			
-			this.isStarted = false;
-			
-			this._subcontent._content._video._videostream.stop();
-			
-			this._showScreenSharing._y.setAttribute("to",((parent.subviews.length-1)*100)+40);
-			this._showScreenSharing._x.setAttribute("to",canvas.width - 270 - 20);
-			this._showScreenSharing._height.setAttribute("to",100);
-			this._showScreenSharing._width.setAttribute("to",270);
-			
-			this._showScreenSharing.setAttribute('started', true);
-			
-			this._infoBox.setAttribute("visibility","hidden");
-			this._zoombar.setAttribute("visibility","hidden");
-			this._pause.setAttribute("visibility","hidden");
-			this._close.setAttribute("visibility","hidden");
-			
-			this._subcontent.setAttribute("visibility","hidden");
-			
-		]]>
+	<![CDATA[
+		this.isStarted = false;
+
+		this._subcontent._content._video._videostream.stop();
+
+		this._showScreenSharing._y.setAttribute("to",((parent.subviews.length-1)*100)+40);
+		this._showScreenSharing._x.setAttribute("to",canvas.width - 270 - 20);
+		this._showScreenSharing._height.setAttribute("to",100);
+		this._showScreenSharing._width.setAttribute("to",270);
+
+		this._showScreenSharing.setAttribute('started', true);
+
+		this._infoBox.setAttribute("visibility","hidden");
+		this._zoombar.setAttribute("visibility","hidden");
+		this._pause.setAttribute("visibility","hidden");
+		this._close.setAttribute("visibility","hidden");
+
+		this._subcontent.setAttribute("visibility","hidden");
+	]]>
 	</method>
-	
+
 	<method name="doClose">
 		if (this.isStarted) {
 			this._subcontent._content._video._videostream.stop();
 		}
 		this.close();
 	</method>
-	
+
 	<method name="updateCursor" args="x,y">
 		if (this.currentCursorObject == null) {
 			this.currentCursorObject = new lz.screenShareCursorObject(this._subcontent._content,{
@@ -153,8 +139,8 @@
 		}
 		this.currentCursorObject.setAttribute("x",x * (this._zoombar._zoom.initialNumber/100));
 		this.currentCursorObject.setAttribute("y",y * (this._zoombar._zoom.initialNumber/100));
-	</method>		
-	
+	</method>
+
 	<view name="_initText">
 		<labelText name="_infoText" labelid="724" width="230" x="10" y="26" multiline="true" />
 
@@ -170,7 +156,7 @@
 			</handler>
 		</simpleLabelButton>
 	</view>
-	
+
 	<view name="_subcontent" width="${ parent.width }" visibility="hidden" y="20" height="${ parent.height - 48 }" clip="true">
 		<view name="_content">
 			<videoObjectPlayScreenShare name="_video">
@@ -184,30 +170,30 @@
 				<contextmenu>
 					<contextmenuitem caption="$once{ canvas.getLabelName(1087) }" onselect="parent.parent.parent.pasteContent()" />
 				</contextmenu>
-						
+
 				<attribute name="doSendEvents" type="boolean" value="true" />
 				<attribute name="idleDelegate" value="null" type="expression" />
 				<attribute name="isMouseOverActive" value="false" type="boolean"/>
 				<attribute name="lastMouseX" value="-1" type="number"/>
 				<attribute name="lastMouseY" value="-1" type="number"/>
-				
+
 				<attribute name="isMac" value="false" type="boolean"/>
 				<attribute name="isWindows" value="false" type="boolean"/>
 				<attribute name="isLinux" value="false" type="boolean"/>
-				
+
 				<handler name="oninit">
 					canvas.sprite.stage.addEventListener(KeyboardEvent.KEY_DOWN, keyhandler);
 					this.idleDelegate = new LzDelegate( this, "sendMousePosition" );
 				</handler>
-				
+
 				<handler name="ondestroy">
 					canvas.sprite.stage.removeEventListener(KeyboardEvent.KEY_DOWN, keyhandler);
 				</handler>
-				
+
 				<method name="pasteContent">
 					if ($debug) Debug.write("pasteContent :: ");
 				</method>
-				
+
 				<method name="keyhandler" args="evt">
 				<![CDATA[
 					if (this.isMouseOverActive && (canvas.isAllowedToRemoteControl || canvas.ismoderator)) {
@@ -225,95 +211,95 @@
 					}
 				]]>
 				</method>
-				
+
 				<handler name="onmouseover">
 					//if ($debug) Debug.write("onmouseout ");
 					this.isMouseOverActive = true;
 					lz.Timer.addTimer( this.idleDelegate, 500 );
 				</handler>
-				
+
 				<handler name="onmouseout">
 					//if ($debug) Debug.write("onmouseout ");
 					this.isMouseOverActive = false;
 					lz.Timer.removeTimer( this.idleDelegate);
 				</handler>
-				
+
 				<method name="sendMousePosition" args="refObj">
-					<![CDATA[
-						var x = this.getMouse("x");
-						var y = this.getMouse("y");
-						x /= (parent.parent.parent._zoombar._zoom.initialNumber/100);
-						y /= (parent.parent.parent._zoombar._zoom.initialNumber/100);
-						
-						var tObject = new Object();
-						tObject["action"] = "mousePos";
-						
-						tObject["x"] = Math.round(x);
-						tObject["y"] = Math.round(y);
-						
-						this.sendRemoteCursorEvent.tObject = tObject;
-						if (canvas.isAllowedToRemoteControl || canvas.ismoderator) {
-							
-							//if ($debug) Debug.write("sendMousePosition ",x,y);
-							
-							if (tObject["x"] != this.lastMouseX && tObject["y"] != this.lastMouseY) {
-								
-								this.lastMouseX = tObject["x"];
-								this.lastMouseY = tObject["y"];
-							
-								this.sendRemoteCursorEvent.doCall();
-							}
-							
-						}
-						
-						if (this.isMouseOverActive) {
-							lz.Timer.addTimer( this.idleDelegate, 500 );
+				<![CDATA[
+					var x = this.getMouse("x");
+					var y = this.getMouse("y");
+					x /= (parent.parent.parent._zoombar._zoom.initialNumber/100);
+					y /= (parent.parent.parent._zoombar._zoom.initialNumber/100);
+
+					var tObject = new Object();
+					tObject["action"] = "mousePos";
+
+					tObject["x"] = Math.round(x);
+					tObject["y"] = Math.round(y);
+
+					this.sendRemoteCursorEvent.tObject = tObject;
+					if (canvas.isAllowedToRemoteControl || canvas.ismoderator) {
+
+						//if ($debug) Debug.write("sendMousePosition ",x,y);
+
+						if (tObject["x"] != this.lastMouseX && tObject["y"] != this.lastMouseY) {
+
+							this.lastMouseX = tObject["x"];
+							this.lastMouseY = tObject["y"];
+
+							this.sendRemoteCursorEvent.doCall();
 						}
-					]]>
+
+					}
+
+					if (this.isMouseOverActive) {
+						lz.Timer.addTimer( this.idleDelegate, 500 );
+					}
+				]]>
 				</method>
-				
+
 				<handler name="onmousedown" args="refObj">
-					<![CDATA[
-						var x = this.getMouse("x");
-						var y = this.getMouse("y");
-						if ($debug) Debug.write("1 x,y :: ",x,y);
-						x /= (parent.parent.parent._zoombar._zoom.initialNumber/100);
-						y /= (parent.parent.parent._zoombar._zoom.initialNumber/100);
-						if ($debug) Debug.write("2 x,y :: ",x,y);
-						
-						var tObject = new Object();
-						tObject["action"] = "onmousedown";
-						tObject["x"] = Math.round(x);
-						tObject["y"] = Math.round(y);
-						
-						this.sendRemoteCursorEvent.tObject = tObject;
-						if (canvas.isAllowedToRemoteControl || canvas.ismoderator) {
-							this.sendRemoteCursorEvent.doCall();
-						}
-					]]>
+				<![CDATA[
+					var x = this.getMouse("x");
+					var y = this.getMouse("y");
+					if ($debug) Debug.write("1 x,y :: ",x,y);
+					x /= (parent.parent.parent._zoombar._zoom.initialNumber/100);
+					y /= (parent.parent.parent._zoombar._zoom.initialNumber/100);
+					if ($debug) Debug.write("2 x,y :: ",x,y);
+
+					var tObject = new Object();
+					tObject["action"] = "onmousedown";
+					tObject["x"] = Math.round(x);
+					tObject["y"] = Math.round(y);
+
+					this.sendRemoteCursorEvent.tObject = tObject;
+					if (canvas.isAllowedToRemoteControl || canvas.ismoderator) {
+						this.sendRemoteCursorEvent.doCall();
+					}
+				]]>
 				</handler>
-				
+
 				<handler name="onmouseup" args="refObj">
-					<![CDATA[
-						var x = this.getMouse("x");
-						var y = this.getMouse("y");
-						if ($debug) Debug.write("1 x,y :: ",x,y);
-						x /= (parent.parent.parent._zoombar._zoom.initialNumber/100);
-						y /= (parent.parent.parent._zoombar._zoom.initialNumber/100);
-						if ($debug) Debug.write("2 x,y :: ",x,y);
-						
-						var tObject = new Object();
-						tObject["action"] = "onmouseup";
-						tObject["x"] = Math.round(x);
-						tObject["y"] = Math.round(y);
-						
-						this.sendRemoteCursorEvent.tObject = tObject;
-						if (canvas.isAllowedToRemoteControl || canvas.ismoderator) {
-							this.sendRemoteCursorEvent.doCall();
-						}
-					]]>
+				<![CDATA[
+					var x = this.getMouse("x");
+					var y = this.getMouse("y");
+					if ($debug) Debug.write("1 x,y :: ",x,y);
+					x /= (parent.parent.parent._zoombar._zoom.initialNumber/100);
+					y /= (parent.parent.parent._zoombar._zoom.initialNumber/100);
+					if ($debug) Debug.write("2 x,y :: ",x,y);
+
+					var tObject = new Object();
+					tObject["action"] = "onmouseup";
+					tObject["x"] = Math.round(x);
+					tObject["y"] = Math.round(y);
+
+					this.sendRemoteCursorEvent.tObject = tObject;
+					if (canvas.isAllowedToRemoteControl || canvas.ismoderator) {
+						this.sendRemoteCursorEvent.doCall();
+					}
+				]]>
 				</handler>
-				
+
 				<!--
 				public synchronized Boolean sendRemoteCursorEvent(String streamid, Map messageObj)
 				 -->
@@ -324,27 +310,23 @@
 						<netparam><method name="getValue">return parent.tObject;</method></netparam>
 						<handler name="ondata" args="value">
 						//The onResult-Handler will be called be the rtmpconnection
-						//if( $debug ) Debug.write("+++++++++++++++++ stopRecordingShow: ",value);	
+						//if( $debug ) Debug.write("+++++++++++++++++ stopRecordingShow: ",value);
 						//parent.close();
-					</handler>  
-				</netRemoteCallHib> 
-				 
+					</handler>
+				</netRemoteCallHib>
+
 			</videoObjectPlayScreenShare>
-			
 		</view>
-		
+
 		<om_vscrollbar />
 		<om_hscrollbar />
-		
-	</view>	
-	
+	</view>
+
 	<view name="_infoBox" x="0" visibility="hidden" >
-		
-		<view name="innerBox" height="${ parent.parent.height }" 
-			  visible="${ ((canvas.ismoderator) ? true : ((canvas.isAllowedToRemoteControl) ? true : false )) }">
-			
-			<labelExplorerBox name="_infoBox" labelid="1088" 
-				  docking="true" resizeable="false" closable="true" valign="middle"
+		<view name="innerBox" height="${ parent.parent.height }"
+				visible="${ ((canvas.ismoderator) ? true : ((canvas.isAllowedToRemoteControl) ? true : false )) }">
+			<labelExplorerBox name="_infoBox" labelid="1088"
+					docking="true" resizeable="false" closable="true" valign="middle"
 					x="0" height="400" width="170">
 				<switch>
 					<when property="$as3">
@@ -368,19 +350,19 @@
 					}
 					]]>
 				</handler>
-			
+
 				<view x="4" resource="warning_icon_rsc" y="26" />
-			
+
 				<view y="22" width="$once{ parent.width - 35 }" height="130" x="30" >
 					<labelText fontsize="10" fontstyle="bold" labelid="1086"
 						multiline="true" width="$once{ parent.width - 16 }" selectable="true" />
 				</view>
-				
+
 				<view y="76" width="$once{ parent.width - 7 }" height="130" x="4" >
 					<labelText fontsize="10" labelid="1085"
 						multiline="true" width="$once{ parent.width - 16 }" selectable="true" />
 				</view>
-				
+
 				<labelCheckbox x="4" y="$once{ parent.height-42 }" fontsize="11"
 									name="_doNotShowAgain" labelid="1123" >
 					<attribute name="checkboxIsinited" value="false" type="boolean"/>
@@ -414,123 +396,80 @@
 						var g = t.data;
 						if (g["image"]==null) g["image"]=new Array();
 						g["image"]["donotaskagainrdc"]=v;
-						
+
 						if ($debug) Debug.write("g[image][donotaskagainrdc] ",g["image"]["donotaskagainrdc"]);
 						if ($debug) Debug.write("g[image] ",g["image"]);
-						
+
 						t.flush();
 					</handler>
-				</labelCheckbox>	
-				
-				<simpleLabelButton labelid="642" width="100" x="$once{ parent.width-105 }" 
+				</labelCheckbox>
+
+				<simpleLabelButton labelid="642" width="100" x="$once{ parent.width-105 }"
 						y="$once{ parent.height-24 }" onclick="this.parent.close();" />
-						
 			</labelExplorerBox>
-			
 		</view>
-		
 	</view>
 
 	<view name="_zoombar" x="20" visibility="hidden" y="${ parent.height-26 }">
-		
 		<method name="setDefaultZoom">
 			if (parent.initObject.VWidth > (parent._subcontent.width-16) ) {
 				var newZoom = Math.round(( (parent._subcontent.width-16) /parent.initObject.VWidth)*100);
-				
+
 				if ($debug) Debug.write("newZoom ",newZoom);
-				
+
 				this._zoom.setSliderValue(newZoom);
-				
+
 				this._zoom.oninitialNumber.sendEvent(newZoom);
 			}
-			
+
 			this.setDefaultHeight();
 		</method>
-		
+
 		<method name="setDefaultHeight">
 			if (parent.initObject.VHeight > (parent._subcontent.height-16)) {
 				var newZoom = Math.round(( (parent._subcontent.height-16) /parent.initObject.VHeight)*100);
-				
+
 				if ($debug) Debug.write("newZoom ",newZoom);
-				
+
 				this._zoom.setSliderValue(newZoom);
-				
+
 				this._zoom.oninitialNumber.sendEvent(newZoom);
 			}
 		</method>
-		
+
 		<simplelayout axis="x" spacing="2" />
-		
+
 		<labelText labelid="852" resize="true" y="4" />
-		
+
 		<changeWidthSlider name="_zoom" initialNumberInit="100" x="10"
 			  boxPosition="up" initialNumber="100" maximum="200">
 			<handler name="oninitialNumber" args="i">
 				if (parent.parent.isStarted) {
-					
+
 					var newWidth = parent.parent.initObject.VWidth * (i/100);
 					var newHeight = parent.parent.initObject.VHeight * (i/100);
-					
+
 					parent.parent._subcontent._content._video.setAttribute("width",newWidth);
 					parent.parent._subcontent._content._video.setAttribute("height",newHeight);
-					
+
 				}
 			</handler>
 		</changeWidthSlider>
-		
+
 		<labelText x="64" y="4" labelid="253" />
-		
-		<labelText x="84" y="4" labelid="1096" />  
-		
-		<!--
-		<resetCombobox name="languages" width="60" y="6" x="200" >
-			<handler name="oninit">
-				<![CDATA[
-					//getBrowserLang
-					
-					var thisItem = this;
-				
-					function callback(returnValue) {
-							
-						if ($debug) Debug.write(" callback ",returnValue);
-						
-						if (returnValue.indexOf("de") >= 0) {
-							thisItem.selectItemAt(1);
-						} else if (returnValue.indexOf("de") >= 0) {
-							thisItem.selectItemAt(0);
-						} else {
-							thisItem.selectItemAt(0);
-							//Show Error Box that we currently have no 
-							//Keyboard Scheme available for that country
-						}
-						
-					}
-					
-					lz.Browser. callJS("getBrowserLang",callback);
-					
-					
-					//var t = lz.Browser;
-					//if ($debug) Debug.write("lz.Browser :: ",t);
-					
-					//this.selectItemAt(0);
-				]]>
-			</handler>
-			<labeldTextListItem labelid="1094" value="en_US" />
-			<labeldTextListItem labelid="1095" value="de_DE" />
-		</resetCombobox> 
-		 -->
+		<labelText x="84" y="4" labelid="1096" />
 	</view>
-	
+
 	<simpleLabelButton name="_pause" visibility="hidden"
-		labelid="854" width="100" x="${ parent.width-204 }" 
-		y="${ parent.height-22 }" onclick="this.parent.doMinimize();" />
-	
+			labelid="854" width="100" x="${ parent.width-204 }"
+			y="${ parent.height-22 }" onclick="this.parent.doMinimize();" />
+
 	<simpleLabelButton name="_close" visibility="hidden"
-		labelid="851" width="100" x="${ parent.width-102 }" 
-		y="${ parent.height-22 }" onclick="this.parent.doClose();" />
-		
-	<animatorgroup name="_showScreenSharing" started="false" 
-					process="simultaneous" duration="1000" >
+			labelid="851" width="100" x="${ parent.width-102 }"
+			y="${ parent.height-22 }" onclick="this.parent.doClose();" />
+
+	<animatorgroup name="_showScreenSharing" started="false"
+			process="simultaneous" duration="1000" >
 		<handler name="onstop">
 			if ($debug) Debug.write("onstop this._y.to ",this._y.to);
 			if (!parent.isStarted) {

Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/screensharing/videoObjectPlayScreenShare.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/screensharing/videoObjectPlayScreenShare.lzx?rev=1780875&r1=1780874&r2=1780875&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/screensharing/videoObjectPlayScreenShare.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/screensharing/videoObjectPlayScreenShare.lzx Mon Jan 30 08:14:38 2017
@@ -7,41 +7,37 @@
   to you under the Apache License, Version 2.0 (the
   "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
-  
+
   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
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
-  
+
 -->
 <library>
 
-
 <!---
-	Contains no microphone or camera Object, this view can only 
+	Contains no microphone or camera Object, this view can only
 	subscribe to a video or live-stream
 
  -->
-	
 <class name="tempTextBox" extends="view" width="120" height="40" bgcolor="0x000000">
-	
 	<attribute name="isStopped" value="false" type="boolean"/>
-	
+
 	<handler name="oninit">
 		parent.sendCursorVisible(false);
 		lz.Timer.addTimer( new LzDelegate( this, "removeThis" ), 3000 );
 	</handler>
-	
+
 	<method name="removeThis" args="refObj">
 		this._out.setAttribute('started', true);
 	</method>
-	
-	<animator name="_out" attribute="opacity" to="0" 
-			  duration="750" started="false">
+
+	<animator name="_out" attribute="opacity" to="0" duration="750" started="false">
 		<handler name="onstop">
 			if (parent.isStopped) {
 				return;
@@ -53,15 +49,14 @@
 			parent.parent.sendCursorVisible(true);
 		</handler>
 	</animator>
-	
-	<view name="_bg" bgcolor="0x7fff00" width="$once{ parent.width }"
-		  height="$once{ parent.height }">
+
+	<view name="_bg" bgcolor="0x7fff00" width="$once{ parent.width }" height="$once{ parent.height }">
 		<handler name="oninit">
 			this._in.setAttribute('started', true);
 		</handler>
-		
-		<animator name="_out" attribute="opacity" to="0.3" 
-			  duration="250" started="false">
+
+		<animator name="_out" attribute="opacity" to="0.3"
+				duration="250" started="false">
 			<handler name="onstop">
 				if (parent.parent.isStopped) {
 					return;
@@ -69,9 +64,9 @@
 				parent._in.setAttribute('started', true);
 			</handler>
 		</animator>
-		
-		<animator name="_in" attribute="opacity" to="1" 
-			  duration="250" started="false">
+
+		<animator name="_in" attribute="opacity" to="1"
+				duration="250" started="false">
 			<handler name="onstop">
 				if (parent.parent.isStopped) {
 					return;
@@ -79,86 +74,79 @@
 				parent._out.setAttribute('started', true);
 			</handler>
 		</animator>
-		
 	</view>
-	
+
 	<view name="_bg2" bgcolor="0x7fff00" width="$once{ parent.width }" height="18">
 		<labelText x="2" y="1" labelid="1124" />
 	</view>
-	
+
 	<inputtext name="_text" width="$once{ parent.width - 4 }" height="20" y="18"
-			   bgcolor="0xFFFFFF" x="2" >
+			bgcolor="0xFFFFFF" x="2" >
 		<handler name="ontext" args="txt">
 			if ($debug) Debug.warn("ontext ",txt);
 			parent.parent.doBroadcastText(txt);
 			parent._out.setAttribute('started', true);
 		</handler>
 	</inputtext>
-	
-</class>	
+</class>
 
 <class name="copiedTextPopup" extends="labelExplorerBox" labelid="1121"
 	docking="true" resizeable="true" closable="true" y="100"
 	x="$once{ parent.width/2 - this.width/2 }" height="160" width="324">
 
 	<attribute name="error" value="" type="string" />
-	
-	<view name="_box" y="24" width="${ parent.width - 20 }" 
-		  height="${ parent.height - 50 }" x="10" clip="true">
+
+	<view name="_box" y="24" width="${ parent.width - 20 }"
+			height="${ parent.height - 50 }" x="10" clip="true">
 		<text fontsize="10" fontstyle="bold" text="${ parent.parent.error }"
 			multiline="true" width="${ parent.width - 16 }" selectable="true" />
 	</view>
-	
-	<simpleLabelButton labelid="642" width="100" x="${ parent.width-105 }" 
-		   y="${ parent.height-24 }" onclick="this.parent.close();" />
 
+	<simpleLabelButton labelid="642" width="100" x="${ parent.width-105 }"
+			y="${ parent.height-24 }" onclick="this.parent.close();" />
 </class>
-			
+
 <class name="screenShareCursorObject" extends="view" resource="menupointer_rsc">
-	
 	<attribute name="refObj" value="null" />
-	
+
 	<contextmenu>
-			
 		<handler name="onmenuopen">
 			parent.refObj.currentX = parent.refObj.getMouse("x");
 			parent.refObj.currentY = parent.refObj.getMouse("y");
 			if ($debug) Debug.write("onmenuopen x,y ",parent.currentX,parent.currentY);
 		</handler>
-		
-		<contextmenuitem caption="$once{ canvas.getLabelName(1119) }" 
-						 onselect="parent.parent.refObj.insertText()" />
-		
-		<contextmenuitem caption="$once{ canvas.getLabelName(1120) }" 
-						 onselect="parent.parent.refObj.copyFromRemote()" />
-						 
-		<contextmenuitem caption="$once{ canvas.getLabelName(1122) }" 
-						 onselect="parent.parent.refObj.showFromRemote()" />
-						 
+
+		<contextmenuitem caption="$once{ canvas.getLabelName(1119) }"
+				onselect="parent.parent.refObj.insertText()" />
+
+		<contextmenuitem caption="$once{ canvas.getLabelName(1120) }"
+				onselect="parent.parent.refObj.copyFromRemote()" />
+
+		<contextmenuitem caption="$once{ canvas.getLabelName(1122) }"
+				onselect="parent.parent.refObj.showFromRemote()" />
 	</contextmenu>
-</class>			
-					   
+</class>
+
 <class name="videoObjectPlayScreenShare" extends="view">
-	
-	<baseVideoStream name="_videostream" bgcolor="black" 
-		  width="${parent.width}" height="${parent.height}" >
-		
+	<baseVideoStream name="_videostream" bgcolor="black"
+			width="${parent.width}" height="${parent.height}" >
+
 		<attribute name="currentX" value="0" type="number" />
 		<attribute name="currentY" value="0" type="number" />
-		
+
 		<method name="insertText">
 			if (canvas.isAllowedToRemoteControl || canvas.ismoderator) {
 				new lz.tempTextBox(this,{
-						   x:this.currentX,
-						   y:this.currentY
-						});
+						x:this.currentX,
+						y:this.currentY
+					});
 			} else {
 				new lz.labelerrorPopup(canvas,{
-							   errorlabelid:1125
-							});
+						errorlabelid:1125
+					});
 			}
 		</method>
-		
+
 		<method name="sendCursorVisible" args="bool">
 			if (bool) {
 				parent.parent.parent.parent.currentCursorObject.setAttribute("visibility","visible");
@@ -166,73 +154,69 @@
 				parent.parent.parent.parent.currentCursorObject.setAttribute("visibility","hidden");
 			}
 		</method>
-		
+
 		<method name="doBroadcastText" args="txt">
 			if (canvas.isAllowedToRemoteControl || canvas.ismoderator) {
 				var tObject = new Object();
 				tObject["action"] = "paste";
-				
+
 				tObject["paste"] = txt;
-				
+
 				parent.sendRemoteCursorEvent.tObject = tObject;
-				
+
 				if ($debug) Debug.warn("doBroadcastText :: ",txt);
-				
+
 				parent.sendRemoteCursorEvent.doCall();
 			} else {
 				new lz.labelerrorPopup(canvas,{
-							   errorlabelid:1125
-							});
+						errorlabelid:1125
+					});
 			}
 		</method>
-		
+
 		<method name="copyFromRemote">
 			if (canvas.isAllowedToRemoteControl || canvas.ismoderator) {
 				var tObject = new Object();
 				tObject["action"] = "copy";
-				
+
 				tObject["clientId"] = canvas.streamid;
-				
+
 				parent.sendRemoteCursorEvent.tObject = tObject;
 				parent.sendRemoteCursorEvent.doCall();
 			} else {
 				new lz.labelerrorPopup(canvas,{
-							   errorlabelid:1125
-							});
+						errorlabelid:1125
+					});
 			}
 		</method>
-		
+
 		<method name="showFromRemote">
 			var tObject = new Object();
 			tObject["action"] = "show";
-			
+
 			tObject["clientId"] = canvas.streamid;
-			
+
 			parent.sendRemoteCursorEvent.tObject = tObject;
 			parent.sendRemoteCursorEvent.doCall();
 		</method>
-		
+
 		<contextmenu>
-			
 			<handler name="onmenuopen">
 				parent.currentX = parent.getMouse("x");
 				parent.currentY = parent.getMouse("y");
 				if ($debug) Debug.write("onmenuopen x,y ",parent.currentX,parent.currentY);
 			</handler>
-			
-			<contextmenuitem caption="$once{ canvas.getLabelName(1119) }" 
-							 onselect="parent.parent.insertText()" />
-			
-			<contextmenuitem caption="$once{ canvas.getLabelName(1120) }" 
-							 onselect="parent.parent.copyFromRemote()" />
-							 
-			<contextmenuitem caption="$once{ canvas.getLabelName(1122) }" 
-							 onselect="parent.parent.showFromRemote()" />
-							 
+
+			<contextmenuitem caption="$once{ canvas.getLabelName(1119) }"
+					onselect="parent.parent.insertText()" />
+
+			<contextmenuitem caption="$once{ canvas.getLabelName(1120) }"
+					onselect="parent.parent.copyFromRemote()" />
+
+			<contextmenuitem caption="$once{ canvas.getLabelName(1122) }"
+					onselect="parent.parent.showFromRemote()" />
 		</contextmenu>
-		
 	</baseVideoStream>
-		
 </class>
 
 </library>