openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From solo...@apache.org
Subject svn commit: r1713276 [1/2] - in /openmeetings/branches/3.1.x: openmeetings-flash/ openmeetings-flash/src/main/swf/ openmeetings-flash/src/main/swf/base/ openmeetings-flash/src/main/swf/base/components/ openmeetings-flash/src/main/swf/base/components/ex...
Date Sun, 08 Nov 2015 17:58:01 GMT
Author: solomax
Date: Sun Nov  8 17:58:00 2015
New Revision: 1713276

URL: http://svn.apache.org/viewvc?rev=1713276&view=rev
Log:
[OPENMEETINGS-1279] swf8 code is now compilable into swf11

Removed:
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/validbox/
Modified:
    openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml
    openmeetings/branches/3.1.x/openmeetings-flash/pom.xml
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/colorpicker.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/fillColorChoose.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineOnlyColorChoose.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/vslider.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/baseBoundingBorderView.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/presenter/guiPresenter.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/tableListItem.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customEdittext.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customInputtext.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/sharedObject.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/emotIconsSelector.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/fontOptions.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/globalMethods.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/roomListInviteUserItem.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListItem.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationFilesList.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawSave.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawLine.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawTriangle.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/simpletestvalidText.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/test-regExp.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/components/explorer/explorerBox.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/remote/rtmpConnection.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/commonVideoViewContentSWF10.lzx
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/main.as3.lzx
    openmeetings/branches/3.1.x/openmeetings-server/   (props changed)

Modified: openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml Sun Nov  8 17:58:00 2015
@@ -33,24 +33,15 @@
 		<fileset dir="${laszlo46.home}/WEB-INF/lib" includes="*.jar" />
 	</path>
 
-	<target name="client.only" depends="compile.laszlo.networktesting" unless="client-already-built">
+	<target name="client.only" depends="compile.laszlo.main.as3,compile.laszlo.main,compile.laszlo.networktesting" unless="client-already-built">
 		<property name="client-already-built" value="true"/>
 	</target>
 
-	<target name="client.debug.only" depends="compile.laszlo.main.debug,compile.laszlo.networktesting.debug" />
+	<target name="client.debug.only" depends="compile.laszlo.main.debug.as3,compile.laszlo.main.debug,compile.laszlo.networktesting.debug" >
+		<property name="client-already-built" value="true"/>
+	</target>
 
 	<target name="-compile.flash" description="compile flash application">
-		<!-- commented for now
-		<echo message="flash.src.dir == '${flash.src.dir}'" />
-		<echo message="classpathref == '${flash.classpath.ref}'" />
-		<echo message="laszlo.home == '${flash.lps.home}'" />
-		<echo message="flash.debug == '${flash.debug}'" />
-		<echo message="laszlo.proxied == '${laszlo.proxied}'" />
-		<echo message="flash.runtime == '${flash.runtime}'" />
-		<echo message="out.dir.swf == '${out.dir.swf}'" />
-		<echo message="flash.main.file == '${flash.main.file}'" />
-		<echo message="flash.out.file == '${flash.out.file}'" />
-		-->
 		<java classname="org.openlaszlo.compiler.Main" fork="true" newenvironment="true" failonerror="true" dir="${flash.src.dir}" classpathref="${flash.classpath.ref}">
 			<jvmarg value="-DLPS_HOME=${flash.lps.home}" />
 			<jvmarg value="-Dlzdebug=false" />
@@ -61,15 +52,15 @@
 		</java>
 	</target>
 
-	<target name="compile.laszlo.networktesting" depends="compile.laszlo.networktesting.debug">
+	<target name="compile.laszlo.main.debug.as3" depends="-retrieve-openlaszlo46">
 		<antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
 			<param name="flash.classpath.ref" value="laszlo46.lib" />
-			<param name="flash.src.dir" value="${laszlo.as3.src.dir}/networkTesting" />
+			<param name="flash.src.dir" value="${laszlo.as3.src.dir}" />
 			<param name="flash.lps.home" value="${laszlo46.home}" />
-			<param name="flash.runtime" value="swf10" />
-			<param name="flash.main.file" value="networktesting.lzx" />
-			<param name="flash.out.file" value="networktesting.swf10.swf" />
-			<param name="flash.debug" value="" />
+			<param name="flash.runtime" value="swf11" />
+			<param name="flash.main.file" value="main.as3.lzx" />
+			<param name="flash.out.file" value="maindebug.as3.swf11.swf" />
+			<param name="flash.debug" value="--debug" />
 		</antcall>
 	</target>
 
@@ -87,42 +78,37 @@
 
 	<target name="compile.laszlo.main" depends="compile.laszlo.main.debug">
 		<antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
-			<param name="flash.classpath.ref" value="laszlo.lib" />
-			<param name="flash.src.dir" value="${laszlo.src.dir}" />
-			<param name="flash.lps.home" value="${laszlo.home}" />
-			<param name="flash.runtime" value="swf8" />
+			<param name="flash.classpath.ref" value="laszlo46.lib" />
+			<param name="flash.src.dir" value="${laszlo.as2.src.dir}" />
+			<param name="flash.lps.home" value="${laszlo46.home}" />
+			<param name="flash.runtime" value="swf11" />
 			<param name="flash.main.file" value="main.lzx" />
-			<param name="flash.out.file" value="main.swf8.swf" />
+			<param name="flash.out.file" value="main.swf11.swf" />
 			<param name="flash.debug" value="" />
 		</antcall>
 	</target>
 
-	<!--target name="compile.laszlo.main.debug" depends="-retrieve-openlaszlo"-->
 	<target name="compile.laszlo.main.debug" depends="-retrieve-openlaszlo46">
 		<antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
-			<!--param name="flash.classpath.ref" value="laszlo.lib" /-->
 			<param name="flash.classpath.ref" value="laszlo46.lib" />
-			<!--param name="flash.src.dir" value="${laszlo.src.dir}" /-->
 			<param name="flash.src.dir" value="${laszlo.as2.src.dir}" />
-			<!--param name="flash.lps.home" value="${laszlo.home}" /-->
 			<param name="flash.lps.home" value="${laszlo46.home}" />
-			<!--param name="flash.runtime" value="swf8" /-->
 			<param name="flash.runtime" value="swf11" />
 			<param name="flash.main.file" value="main.lzx" />
-			<param name="flash.out.file" value="maindebug.swf8.swf" />
+			<param name="flash.out.file" value="maindebug.swf11.swf" />
 			<param name="flash.debug" value="--debug" />
 		</antcall>
 	</target>
 
-	<target name="compile.laszlo.main.debug.as3" depends="-retrieve-openlaszlo46">
+	<target name="compile.laszlo.networktesting" depends="compile.laszlo.networktesting.debug">
 		<antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
 			<param name="flash.classpath.ref" value="laszlo46.lib" />
-			<param name="flash.src.dir" value="${laszlo.as3.src.dir}" />
+			<param name="flash.src.dir" value="${laszlo.as3.src.dir}/networkTesting" />
 			<param name="flash.lps.home" value="${laszlo46.home}" />
-			<param name="flash.runtime" value="swf11" />
-			<param name="flash.main.file" value="main.as3.lzx" />
-			<param name="flash.out.file" value="maindebug.as3.swf11.swf" />
-			<param name="flash.debug" value="--debug" />
+			<param name="flash.runtime" value="swf10" />
+			<param name="flash.main.file" value="networktesting.lzx" />
+			<param name="flash.out.file" value="networktesting.swf10.swf" />
+			<param name="flash.debug" value="" />
 		</antcall>
 	</target>
 

Modified: openmeetings/branches/3.1.x/openmeetings-flash/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/pom.xml?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/pom.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/pom.xml Sun Nov  8 17:58:00 2015
@@ -80,7 +80,7 @@
 							<exportAntProperties>true</exportAntProperties>
 							<target>
 								<ant antfile="${basedir}/openlaszlo.xml" target="client.only"/>
-								<!-- ant antfile="${basedir}/openlaszlo.xml" target="client.debug.only"/-->
+								<!--ant antfile="${basedir}/openlaszlo.xml" target="client.debug.only"/-->
 							</target>
 							<skip>${om.quick.build}</skip>
 						</configuration>

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx Sun Nov  8 17:58:00 2015
@@ -24,6 +24,14 @@
     height="400" bgcolor="$once{ canvas.getThemeColor('styleMenuBarBaseColor') }" 
 	onmousedown="this._startDragState(this)" onmouseup="this._removeDragState(this)" >
 
+	<switch>
+		<when property="$as3">
+			<passthrough>
+				import flash.filters.DropShadowFilter;
+			</passthrough>
+		</when>
+	</switch>
+
 	<attribute name="showWindowEffect" value="false" type="boolean" />
 	
 	<attribute name="annimationStartStyle" value="center" type="string" />
@@ -74,7 +82,7 @@
     	//if($debug) Debug.write("sendAnniComplete");
     	this.setAttribute('visibility','visible');
     	this.animationInited.sendEvent(null);
-    	this.setShadow(); 	
+    	this.setShadow(true); 	
     </method>
 
     <method name="setShadow" args="bool">
@@ -85,7 +93,7 @@
             //Debug.write(this.normalMC);
             ////Debug.write("this.normalMC: ",this.normalMC);
             ////Debug.write("this: ",this);
-           	this.displacementMap = new flash.filters.DropShadowFilter();
+           	this.displacementMap = new DropShadowFilter();
             this.normalMC.filters = [this.displacementMap];
         }
         ]]>              

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx Sun Nov  8 17:58:00 2015
@@ -41,7 +41,6 @@
     <include href="calendar/" />
     <include href="simplevaluelist/" />
     <include href="upload/" /> 
-    <include href="validbox/" />
     <include href="presenter/" />
     <include href="lps/" />
     <include href="conferencebox/" />

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/colorpicker.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/colorpicker.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/colorpicker.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/colorpicker.lzx Sun Nov  8 17:58:00 2015
@@ -38,17 +38,13 @@
     </handler>
 </class>    
 
-<class name="colorPot" width="13" height="13" 
-    onmouseout="">
-    <handler name="onmouseover">
-        var t = _root.createEmptyMovieClip('hans2',20);
-        var myColorTZ = new Color(t);
-        myColorTZ.setRGB(this.mycolor);        
-        this.setAttribute('mycolorString',this.parent.parent.parent.numberToRGB(myColorTZ));
-    </handler>
+<class name="colorPot" width="13" height="13" onmouseout="">
     <attribute name="mycolor" type="color" value="0x000000"/>
     <attribute name="mycolorString" type="string" value="0x000000"/>
     <attribute name="listener" type="expression"/>
+    <handler name="onmouseover">
+        this.setAttribute('mycolorString',this.parent.parent.parent.numberToRGB(this.mycolor));
+    </handler>
     <handler name="onclick">
         listener.changeColor(this.mycolor);
         listener.close();
@@ -102,9 +98,8 @@
        ]]> 
     </method>  
     
-    <method name="doDefaultColor" args="thisC">
+    <method name="doDefaultColor" args="c">
         <![CDATA[            
-            var c = thisC.getRGB();
             var r = (c >> 16) & 0xff;
             var g = (c >> 8) &  0xff;
             var b = c & 0xff;
@@ -157,9 +152,9 @@
             var b = c & 0xff;
             ////Debug.write("r g b: ",r,g,b);
             
-            HEX_R = r.toString(16).toUpperCase();
-            HEX_G = g.toString(16).toUpperCase();
-            HEX_B = b.toString(16).toUpperCase();
+            var HEX_R = r.toString(16).toUpperCase();
+            var HEX_G = g.toString(16).toUpperCase();
+            var HEX_B = b.toString(16).toUpperCase();
             
             if (HEX_R.length < 2) {
                 HEX_R = "0"+HEX_R;

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/fillColorChoose.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/fillColorChoose.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/fillColorChoose.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/fillColorChoose.lzx Sun Nov  8 17:58:00 2015
@@ -82,9 +82,6 @@
     </method>    
     
     <method name="toggle">
-        var t = _root.createEmptyMovieClip('hans',10);
-        var myColor = new Color(t);
-        myColor.setRGB(selectedColor);
         if (this.boxPosition=="up"){
 	        this.colorPickRef = new lz.colorpicker(canvas,{btnRef:this,
 	        	x:(this.getAttributeRelative('x',canvas)-(250-this.width)),
@@ -94,18 +91,15 @@
 	        	x:(this.getAttributeRelative('x',canvas)-(250-this.width)),
 	        	y:(this.getAttributeRelative('y',canvas))});
         }
-        this.colorPickRef.doDefaultColor(myColor);
+        this.colorPickRef.doDefaultColor(selectedColor);
         lz.ModeManager.makeModal( this.colorPickRef );
     </method>
     
     <method name="setTransformedStringColor">
         ////Debug.write("setTransformedStringColor: ",this,this.selectedColor);
-        var t = _root.createEmptyMovieClip('hans2',20);
-        var myColor = new Color(t);
-        myColor.setRGB(this.selectedColor);
         //var a = myColor.getTransform();
         ////Debug.write("a: ",a);
-        var col = this.numberToRGB(myColor);
+        var col = this.numberToRGB(this.selectedColor);
         ////Debug.write("col: ",col);
         this.setAttribute('selectedColorTransformedString',col);
     </method>
@@ -118,9 +112,9 @@
             var b = c & 0xff;
             ////Debug.write("r g b: ",r,g,b);
             
-            HEX_R = r.toString(16).toUpperCase();
-            HEX_G = g.toString(16).toUpperCase();
-            HEX_B = b.toString(16).toUpperCase();
+            var HEX_R = r.toString(16).toUpperCase();
+            var HEX_G = g.toString(16).toUpperCase();
+            var HEX_B = b.toString(16).toUpperCase();
             
             if (HEX_R.length < 2) {
                 HEX_R = "0"+HEX_R;

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx Sun Nov  8 17:58:00 2015
@@ -84,9 +84,6 @@
     </method>    
     
     <method name="toggle">
-        var t = _root.createEmptyMovieClip('hans',10);
-        var myColor = new Color(t);
-        myColor.setRGB(selectedColor);
         if (this.boxPosition=="up"){
 	        this.colorPickRef = new lz.colorpicker(canvas,{btnRef:this,
 	        	x:(this.getAttributeRelative('x',canvas)-(250-this.width)),
@@ -97,18 +94,15 @@
 	        	y:(this.getAttributeRelative('y',canvas))});
         }
 
-        this.colorPickRef.doDefaultColor(myColor);
+        this.colorPickRef.doDefaultColor(selectedColor);
         lz.ModeManager.makeModal( this.colorPickRef );
     </method>
     
     <method name="setTransformedStringColor">
         ////Debug.write("setTransformedStringColor: ",this,this.selectedColor);
-        var t = _root.createEmptyMovieClip('hans2',20);
-        var myColor = new Color(t);
-        myColor.setRGB(this.selectedColor);
         //var a = myColor.getTransform();
         ////Debug.write("a: ",a);
-        var col = this.numberToRGB(myColor);
+        var col = this.numberToRGB(this.selectedColor);
         ////Debug.write("col: ",col);
         this.setAttribute('selectedColorTransformedString',col);
     </method>
@@ -121,9 +115,9 @@
             var b = c & 0xff;
             ////Debug.write("r g b: ",r,g,b);
             
-            HEX_R = r.toString(16).toUpperCase();
-            HEX_G = g.toString(16).toUpperCase();
-            HEX_B = b.toString(16).toUpperCase();
+            var HEX_R = r.toString(16).toUpperCase();
+            var HEX_G = g.toString(16).toUpperCase();
+            var HEX_B = b.toString(16).toUpperCase();
             
             if (HEX_R.length < 2) {
                 HEX_R = "0"+HEX_R;

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineOnlyColorChoose.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineOnlyColorChoose.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineOnlyColorChoose.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineOnlyColorChoose.lzx Sun Nov  8 17:58:00 2015
@@ -40,22 +40,16 @@
     </method>    
     
     <method name="toggle">
-        var t = _root.createEmptyMovieClip('hans',10);
-        var myColor = new Color(t);
-        myColor.setRGB(selectedColor);
         this.colorPickRef = new lz.colorpicker(canvas,{btnRef:this,x:(this.getAttributeRelative('x',canvas)-(250-this.width)),y:(this.getAttributeRelative('y',canvas))});
-        this.colorPickRef.doDefaultColor(myColor);
+        this.colorPickRef.doDefaultColor(selectedColor);
         lz.ModeManager.makeModal( this.colorPickRef );
     </method>
     
     <method name="setTransformedStringColor">
         ////Debug.write("setTransformedStringColor: ",this,this.selectedColor);
-        var t = _root.createEmptyMovieClip('hans2',20);
-        var myColor = new Color(t);
-        myColor.setRGB(this.selectedColor);
         //var a = myColor.getTransform();
         ////Debug.write("a: ",a);
-        var col = this.numberToRGB(myColor);
+        var col = this.numberToRGB(this.selectedColor);
         ////Debug.write("col: ",col);
         this.setAttribute('selectedColorTransformedString',col);
     </method>
@@ -68,9 +62,9 @@
             var b = c & 0xff;
             ////Debug.write("r g b: ",r,g,b);
             
-            HEX_R = r.toString(16).toUpperCase();
-            HEX_G = g.toString(16).toUpperCase();
-            HEX_B = b.toString(16).toUpperCase();
+            var HEX_R = r.toString(16).toUpperCase();
+            var HEX_G = g.toString(16).toUpperCase();
+            var HEX_B = b.toString(16).toUpperCase();
             
             if (HEX_R.length < 2) {
                 HEX_R = "0"+HEX_R;

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/vslider.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/vslider.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/vslider.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/vslider.lzx Sun Nov  8 17:58:00 2015
@@ -79,7 +79,7 @@
         <method name="getPosFromValue" args="val">
             var perc = (val-this.parent.minvalue) / (this.parent.maxvalue-this.parent.minvalue);
             //Debug.write(perc);
-            valY = (this.parent.switchaxis) ? ( (1-perc) * (this.parent.height-this.height)) : (perc * (this.parent.height-this.height));
+            var valY = (this.parent.switchaxis) ? ( (1-perc) * (this.parent.height-this.height)) : (perc * (this.parent.height-this.height));
             //Debug.write("valY: ",Math.round(valY));
             return Math.round(valY);
         </method>

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/baseBoundingBorderView.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/baseBoundingBorderView.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/baseBoundingBorderView.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/panel/baseBoundingBorderView.lzx Sun Nov  8 17:58:00 2015
@@ -22,6 +22,13 @@
 
 <class name="baseBoundingBorderView" extends="view" width="250" y="100" height="400"
 	onmousedown="this._startDragState(this)" onmouseup="this._removeDragState(this)" >
+	<switch>
+		<when property="$as3">
+			<passthrough>
+				import flash.filters.DropShadowFilter;
+			</passthrough>
+		</when>
+	</switch>
 	
 	<!--- Can this Box be docked to others and 
 			the width/height of parent compoent barrier -->
@@ -86,7 +93,7 @@
     	this.initheight=this.height;
 		////Debug.write("this.isopen: ",this.isopen);
 		if (!this.open) toggleopen();
-    	if (this.hasshadow) this.setShadow(); 
+    	if (this.hasshadow) this.setShadow(true); 
     </handler>
     
     <method name="setShadow" args="bool">
@@ -97,7 +104,7 @@
             //Debug.write(this.normalMC);
             ////Debug.write("this.normalMC: ",this.normalMC);
             ////Debug.write("this: ",this);
-           	this.displacementMap = new flash.filters.DropShadowFilter();
+           	this.displacementMap = new DropShadowFilter();
             this.normalMC.filters = [this.displacementMap];
         }
         ]]>              

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/presenter/guiPresenter.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/presenter/guiPresenter.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/presenter/guiPresenter.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/presenter/guiPresenter.lzx Sun Nov  8 17:58:00 2015
@@ -23,6 +23,13 @@
 <class name="guiPresenter" extends="view" width="250" height="400" 
     clickable="$once{ this.isdragable }"
 	onmousedown="this._startDragState(this)" onmouseup="this._removeDragState(this)" >
+	<switch>
+		<when property="$as3">
+			<passthrough>
+				import flash.filters.DropShadowFilter;
+			</passthrough>
+		</when>
+	</switch>
     
     <handler name="oninit">
         this.setShadow();
@@ -32,7 +39,7 @@
         <![CDATA[
         if (this.isinited && this.hasshadow){
             this.normalMC = this.getDisplayObject();
-            this.displacementMap = new flash.filters.DropShadowFilter();
+            this.displacementMap = new DropShadowFilter();
             this.normalMC.filters = [this.displacementMap];
         }
         ]]>              

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/tableListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/tableListItem.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/tableListItem.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/tableListItem.lzx Sun Nov  8 17:58:00 2015
@@ -20,8 +20,7 @@
 -->
 <library>
 
-<class name="tableListItem" extends="view"
-    bgcolor="${ ( this.isaltered ) ? red : white }" height="22">
+<class name="tableListItem" extends="view" bgcolor="${ ( this.isaltered ) ? 'red' : 'white' }" height="22">
     
     <handler name="oninit">
         this.changeholder = new Array();

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customEdittext.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customEdittext.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customEdittext.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customEdittext.lzx Sun Nov  8 17:58:00 2015
@@ -21,7 +21,13 @@
 <library>
 
 <class name="customEdittext" extends="inputtext" bgcolor="0xFFFFFF" fontsize="11" height="20" >
-	
+    <switch>
+        <when property="$as3">
+            <passthrough>
+                import flash.system.Capabilities;
+            </passthrough>
+        </when>
+    </switch>
 	<view name="v_border" height="1"       bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }" width="$once{parent.width}" />
     <view name="h_border" width="1"  y="1" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }" height="$once{parent.height -1}" />
 	
@@ -48,14 +54,14 @@
     
     <handler name="ontext" args="txt">
     	<![CDATA[
-            
+            /* FIXME TODO as2->3 migration commented for now
     	    //
     	   
-    	    if (System.capabilities.os.indexOf('Linux')==-1) { 
+    	    if (Capabilities.os.indexOf('Linux')==-1) { 
                 return; 
 	        }
 	        
-	        //if ($debug) Debug.write("System.capabilities.os -- START ",System.capabilities.os,txt);
+	        //if ($debug) Debug.write("Capabilities.os -- START ",Capabilities.os,txt);
 	        
 	        if (txt == null || txt.length == 0) {
 	        	return;
@@ -145,7 +151,7 @@
             }
             
             //if ($debug) Debug.write("-- END ",this.text);
-            
+            */
     	]]>
     </handler>
     

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customInputtext.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customInputtext.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customInputtext.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/customInputtext.lzx Sun Nov  8 17:58:00 2015
@@ -21,7 +21,13 @@
 <library>
 
 <class name="customInputtext" extends="inputtext">
-	  
+    <switch>
+        <when property="$as3">
+            <passthrough>
+                import flash.system.Capabilities;
+            </passthrough>
+        </when>
+    </switch>
 	 <!-- lost selection workaroud -->
 	 <attribute name="selPosition" type="integer"/>
 	 <attribute name="selSize" type="integer"/>
@@ -49,14 +55,14 @@
 	  
 	 <handler name="ontext" args="txt">
         <![CDATA[
-            
+             /* FIXME TODO as2->3 migration
             //
            
-            if (System.capabilities.os.indexOf('Linux')==-1) { 
+            if (Capabilities.os.indexOf('Linux')==-1) { 
                 return; 
             }
             
-            //if ($debug) Debug.write("System.capabilities.os -- START ",System.capabilities.os,txt);
+            //if ($debug) Debug.write("Capabilities.os -- START ", Capabilities.os,txt);
             
             if (txt == null || txt.length == 0) {
                 return;
@@ -146,7 +152,7 @@
             }
             
             //if ($debug) Debug.write("-- END ",this.text);
-            
+            */
         ]]>
     </handler>
   	

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/text/labelTooltip.lzx Sun Nov  8 17:58:00 2015
@@ -92,8 +92,14 @@
     <attribute name="text" value="" type="string" />
 </class>
 
-<class name="xmlCrmTooltip" extends="view" bgcolor="0x000000" 
-    width="${ this._text.width+2 }" height="${ this._text.height+2 }" >
+<class name="xmlCrmTooltip" extends="view" bgcolor="0x000000" width="${ this._text.width+2 }" height="${ this._text.height+2 }" >
+	<switch>
+		<when property="$as3">
+			<passthrough>
+				import flash.filters.DropShadowFilter;
+			</passthrough>
+		</when>
+	</switch>
     <attribute name="text" value="" type="string" />
     <attribute name="holder" value="null" />
     <text x="1" y="1" text="${ parent.text }" resize="true" 
@@ -108,15 +114,21 @@
         <![CDATA[
         if (this.isinited){
             this.normalMC = this.getDisplayObject();
-           	this.displacementMap = new flash.filters.DropShadowFilter();
+           	this.displacementMap = new DropShadowFilter();
             this.normalMC.filters = [this.displacementMap];
         }
         ]]>              
     </method> 
 </class>
 
-<class name="xmlCrmTooltipMulti" extends="view" bgcolor="0x000000" 
-    width="${ this._text.width+2 }" height="${ this._text.height+2 }" >
+<class name="xmlCrmTooltipMulti" extends="view" bgcolor="0x000000" width="${ this._text.width+2 }" height="${ this._text.height+2 }" >
+	<switch>
+		<when property="$as3">
+			<passthrough>
+				import flash.filters.DropShadowFilter;
+			</passthrough>
+		</when>
+	</switch>
     <attribute name="text" value="" type="string" />
     <attribute name="holder" value="null" />
     <text x="1" y="1" text="${ parent.text }" resize="true" 
@@ -128,7 +140,7 @@
         <![CDATA[
         if (this.isinited){
             this.normalMC = this.getDisplayObject();
-           	this.displacementMap = new flash.filters.DropShadowFilter();
+           	this.displacementMap = new DropShadowFilter();
             this.normalMC.filters = [this.displacementMap];
         }
         ]]>              

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx Sun Nov  8 17:58:00 2015
@@ -19,15 +19,22 @@
   
 -->
 <library>
+	<switch>
+		<when property="$as3">
+			<passthrough>
+				import flash.external.ExternalInterface;
+			</passthrough>
+		</when>
+	</switch>
 
 <script>
 <![CDATA[
 
 
-	flash.external.ExternalInterface.addCallback("redirectToUrlCallback", null, redirectToUrlCallback);
-	flash.external.ExternalInterface.addCallback("getTimeZoneOffsetCallback", null, getTimeZoneOffsetCallback);
-    flash.external.ExternalInterface.addCallback("getBrowserInfoCallback", null, getBrowserInfoCallback);
-    flash.external.ExternalInterface.addCallback("getBrowserLangCallback", null, getBrowserLangCallback);
+	ExternalInterface.addCallback("redirectToUrlCallback", redirectToUrlCallback);
+	ExternalInterface.addCallback("getTimeZoneOffsetCallback", getTimeZoneOffsetCallback);
+    ExternalInterface.addCallback("getBrowserInfoCallback", getBrowserInfoCallback);
+    ExternalInterface.addCallback("getBrowserLangCallback", getBrowserLangCallback);
 
 	
 	var redirectToUrlReturnObject = null;
@@ -40,7 +47,7 @@
 		
 		redirectToUrlReturnObject = returnObject;
 		
-		flash.external.ExternalInterface.call("redirectToUrl", url);
+		ExternalInterface.call("redirectToUrl", url);
 		
 		//lz.Browser.callJS("redirectToUrl",callback,this.redirectURL);
 	}
@@ -57,7 +64,7 @@
 		
 		timeZoneOffsetReturnObject = returnObject;
 		
-		flash.external.ExternalInterface.call("getTimeZoneOffset");
+		ExternalInterface.call("getTimeZoneOffset");
 		
 		//lz.Browser.callJS("getTimeZoneOffset",getTimeZoneOffsetCallback);
 	}
@@ -74,7 +81,7 @@
         
         browserInfoReturnObject = returnObject;
         
-        flash.external.ExternalInterface.call("getBrowserInfo");
+        ExternalInterface.call("getBrowserInfo");
         
         //lz.Browser.callJS("getBrowserInfo",callback);
     }
@@ -91,7 +98,7 @@
         
         browserLangReturnObject = returnObject;
         
-        flash.external.ExternalInterface.call("getBrowserLang");
+        ExternalInterface.call("getBrowserLang");
         
         //lz.Browser.callJS("getBrowserLang",callback);
     }

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx Sun Nov  8 17:58:00 2015
@@ -42,9 +42,15 @@
     </method>
 </class>
 
-<class name="hibRtmpConnection" extends="rtmpConnection" debug="false"
-    src="$once{ this.getUrl() }" >
-
+<class name="hibRtmpConnection" extends="rtmpConnection" debug="false" src="$once{ this.getUrl() }" >
+    <switch>
+        <when property="$as3">
+            <passthrough>
+                import flash.system.Capabilities;
+				import flash.external.ExternalInterface;
+            </passthrough>
+        </when>
+    </switch>
     <attribute name="counterror" type="number" value="0" />
     
     <attribute name="loaderVar" value="null" />
@@ -336,9 +342,9 @@
 	        } else if (userlang == -1) {
 	            var lang_id = canvas.default_lang_id;
 	            
-	            var browserLang = flash.external.ExternalInterface.call("function(){return window.navigator.systemLanguage || window.navigator.userLanguage || window.navigator.language;}");
+	            var browserLang = ExternalInterface.call("function(){return window.navigator.systemLanguage || window.navigator.userLanguage || window.navigator.language;}");
 	            if (browserLang == null) {
-	                browserLang = "" + System.capabilities.language;
+	                browserLang = "" + Capabilities.language;
 	            }
 	            if (browserLang != null && browserLang.length > 1) {
 	                var lngCode = browserLang.substring(0, 2);
@@ -1665,12 +1671,19 @@
         </netRemoteCallHib>      
                
 		<netRemoteCallHib name="newPoll" funcname="newPoll">
+		    <switch>
+		        <when property="$as3">
+		            <passthrough>
+						import flash.external.ExternalInterface;
+		            </passthrough>
+		        </when>
+		    </switch>
 			<handler name="ondata" args="value">
 			<![CDATA[
 				//The onResult-Handler will be called by the rtmpconnection
 				if ($debug) Debug.write("newPoll : ", value);
 				if (canvas.user_id != value.createdBy.user_id) {
-					flash.external.ExternalInterface.call("vote", canvas.publicSID);
+					ExternalInterface.call("vote", canvas.publicSID);
 				}
 			]]>
 			</handler>
@@ -1686,11 +1699,6 @@
                         canvas.ifrm.createIFrame();
                         canvas.setAttribute('htmlframeisloaded',true);
                     }
-                } else if (value[0]=='sharewhiteside'){
-                    if (canvas.htmlframeisloaded){      
-                        _htmlside.setAttribute('text',value[2]);
-                        canvas.ifrm.setAttribute('isrc','http://'+value[2]);
-                    }
                 }
                 ]]>
             </handler>   

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx Sun Nov  8 17:58:00 2015
@@ -22,6 +22,14 @@
 <!-- methods for main.lzx -->
 
 <library>
+	<switch>
+		<when property="$as3">
+			<passthrough>
+				import flash.external.ExternalInterface;
+				import flash.net.LocalConnection;
+			</passthrough>
+		</when>
+	</switch>
 
 	<class name="baseconfmenucommand" extends="command" >
     	<attribute name="enabled" value="true" type="boolean" />
@@ -275,8 +283,6 @@
         	return;
         }
         
-        
-
         this.setAttribute('lc_SID', lc_SID);
         this.setAttribute('vid_lc_name', this.lc_SID + "__videoLC");
         this.setAttribute('rtmp_lc_name', this.lc_SID + "__rtmpLC");
@@ -307,6 +313,8 @@
         }
     
         mainBaseText.setAttribute('text',canvas.currentappname);
+        var _url = this.getDisplayObject().loaderInfo.url;
+        if($debug) Debug.write("_url: ",_url);
         var cleanUrl = _url;
         
         var hasParams = _url.indexOf("?");
@@ -489,7 +497,7 @@
 		canvas.thishib.counterror = 100;
 		canvas.thishib.disconnect();
 		canvas.thishib._nc.close();
-		flash.external.ExternalInterface.call("roomExit");
+		ExternalInterface.call("roomExit");
 	</method>
 	
 	<!---
@@ -500,15 +508,15 @@
             if($debug) Debug.write("doActionmenu: ",stringSub);
             if (canvas._conferencemenu.visibility == 'visible'){
             	 if (stringSub == "invitation") {
-            	 	flash.external.ExternalInterface.call("openInvitation");
+            	 	ExternalInterface.call("openInvitation");
 			    } else if (stringSub=='editWhiteboardDefault') {
                     new lz.editWhiteboardDefault(canvas.main_content._content.inner);
                 } else if (stringSub=='createPoll') {
-                    flash.external.ExternalInterface.call("createPoll", canvas.publicSID);
+                    ExternalInterface.call("createPoll", canvas.publicSID);
                 } else if (stringSub=='pollResults') {
-                    flash.external.ExternalInterface.call("pollResults", canvas.publicSID);
+                    ExternalInterface.call("pollResults", canvas.publicSID);
                 } else if (stringSub=='checkPollVoted') {
-                    flash.external.ExternalInterface.call("vote");
+                    ExternalInterface.call("vote");
                 } else if (stringSub=='importFile') {
                     new lz.uploadWindowExplorer(canvas.main_content._content.inner,{
                             x:60,uploadmodule:canvas.uploadmoduleimg,
@@ -665,14 +673,6 @@
 	    ]]>
 	</method>
 	
-	<method name="addBrowserTabHistory" args="value">
-	    <![CDATA[
-	    //Debug.write("addBrowserTabHistory: ",value);
-	    _browserhistory.addItem(value);
-	    this.browserTabHistory.push(value);
-	    ]]>
-	</method>
-	  
 	<!---
 	@doc The function does compare the new moderator list with the old and prepares the list 
 		the removeModeratorList is used in the performance optimized user list of the restricted 

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx Sun Nov  8 17:58:00 2015
@@ -21,7 +21,16 @@
 
 
 <class name="rtmpConnection" extends="node">
-    	
+
+        <switch>
+            <when property="$as3">
+                <passthrough>
+                    import flash.net.NetConnection;
+                    import flash.events.NetStatusEvent;
+                </passthrough>
+            </when>
+        </switch>
+
     	<attribute name="debug" value="false" type="boolean" />
     	
     	<event name="onconnect"/>
@@ -33,12 +42,12 @@
         <attribute name="lastCalled" value="null" />
     	
     	<attribute name="src" value="" type="string"/>
-    	
+
 		<method name="connect">
             this._nc = new NetConnection();
 
             // local reference to rtmpconnection
-            this._nc.t = this;     
+            //this._nc.t = this;
             
             this._nc.proxyType = canvas.proxyType;
             
@@ -47,36 +56,47 @@
             	if($debug) Debug.write("*** debug ***");
             }
             
-            //canvas.currentNC is the reference to the NetConnection that is used in the NetStream
-            canvas.currentNC = this._nc;
-            
-            this._nc.onStatus = function(info){
-                this.t._onStatus(info);
-            }
+            this._nc.addEventListener(NetStatusEvent.NET_STATUS, _onStatus);
             
     		if($debug) Debug.write("devRtmpConnection/registerMethods()");
+    		var clientObj = {};
+    		clientObj.setId = this.setId;
+    		
+    		this._nc.client = clientObj;
+    		
 			//Register Methods
-			this.registerMethods();    	            
+			//this.registerMethods();
 		</method>
 		
-        <method name="_onStatus" args="info"><![CDATA[
-            if (this.debug) {
-                Debug.write("devrtmpconnection", this, "_onStatus", info.code);
+        <method name="_onStatus" args="stats"><![CDATA[
+            if ($debug) {
+                Debug.write("devrtmpconnection", this, "_onStatus", stats.info.code);
             }
 
             var msg = "";
+            var s;
 
-            switch (info.code) {
+            switch (stats.info.code) {
 
                 case "NetConnection.Connect.Success": {
                     // The connection attempt succeeded.
-                    msg = info.code;
+                    //canvas.currentNC is the reference to the NetConnection that is used in the NetStream
+                    msg = stats.info.code;
+                    canvas.currentNC = this._nc;
                     s = 2;
                     break;
                 }
+                
+                case "NetConnection.Connect.Closed": {
+                    msg = stats.info.code;
+                    this._nc = null;
+                    canvas.currentNC = null;
+                    s = 0;
+                    break;
+                }
 
                 default: {
-                    msg = info.code;
+                    msg = stats.info.code;
                     s = 0;
                     break;
                 }
@@ -95,9 +115,10 @@
         </method>	
         
         <method name="disconnect">
-            this.ondisconnect.sendEvent();
-        	canvas.currentNC = null;
-            this._nc.close();
+        	if ($debug) Debug.write(" DISCONNECT ");
+        	if (this._nc != null) {
+                this._nc.close();
+            }
         </method>
     <!--- 
         With this function all methods are registered to the NetConnection
@@ -162,9 +183,6 @@
     <method name="callRPC" args="func, obj, params">
     	if (this.debug) Debug.write("*** call: func, obj, params",func,obj, typeof (params) ,params.length);
     	if (params.length != 0){
-	    	//does this really work?
-	    	ASSetPropFlags(_global, null, 8, 1);
-	    	//Debug.write("does it work?",arguments);
 	    	<!--
 	    	this._nc.call.apply(this._nc,arguments);
 	    	 -->
@@ -223,6 +241,13 @@
     -->
     <class name="netremotecall" extends="node">
 
+        <switch>
+            <when property="$as3">
+                <passthrough>
+                    import flash.net.Responder;
+                </passthrough>
+            </when>
+        </switch>
 
         <!--- Name of the remote function. -->
         <attribute name="funcname" value="$once{null}" type="string" />
@@ -231,8 +256,7 @@
     
         <attribute name="dataobject" value="null" />
 		
-        <!--- Data handling event. args="value" 
-        @keywords private  -->
+        <!--- Data handling event. args="value"  -->
         <event name="ondata" />
 
         <!--- Error handling event. -->
@@ -290,7 +314,6 @@
           ]]>
         </method>
 
-
         <!--- Handle the result returned from the remote method. -->
         <method name="onResult" args="value"><![CDATA[
             // Can be overriden.

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/sharedObject.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/sharedObject.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/sharedObject.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/sharedObject.lzx Sun Nov  8 17:58:00 2015
@@ -22,6 +22,14 @@
 
 <class name="sharedObject" extends="node">
 
+    <switch>
+        <when property="$as3">
+            <passthrough>
+                import flash.net.SharedObject;
+            </passthrough>
+        </when>
+    </switch>
+
 	<attribute name="so" value="null" />
 	<attribute name="onStatus" value="null" />
 	
@@ -29,7 +37,7 @@
 	<method name="connect" args="so_Name,nc,persistant">
 
 		//Debug.write("connect SharedObject: ",nc.uri);
-		this.so = SharedObject.getRemote(so_Name,nc.uri,persistant); 
+		this.so = this.getRemote(so_Name,nc.uri,persistant);
 		
 		var t = this;
 		this.so.onSync = function (evtObj){
@@ -45,7 +53,7 @@
     <method name="getRemote" args="so_Name,nc,persistant">
 
         //Debug.write("connect SharedObject: ",nc.uri);
-        this.so = SharedObject.getRemote(so_Name,nc.uri,persistant); 
+        this.so = this.getRemote(so_Name,nc.uri,persistant);
 
         var t = this;
         this.so.onSync = function (evtObj){
@@ -57,7 +65,7 @@
     <!--- create Object if not existing  -->
     <method name="getLocal" args="name">
 
-        this.so = SharedObject.getLocal(name); 
+        this.so = this.getLocal(name);
 
         var t = this;
         this.so.onSync = function (evtObj){

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx Sun Nov  8 17:58:00 2015
@@ -19,6 +19,16 @@
   
 -->
 <canvas width="100%" height="100%" title="OpenMeetings">
+	<switch>
+		<when property="$as3">
+			<passthrough>
+				import flash.external.ExternalInterface;
+				import flash.events.StatusEvent;
+				import flash.net.SharedObject;
+				import flash.net.LocalConnection;
+			</passthrough>
+		</when>
+	</switch>
 <switch>
 	<when property="$debug">
 		<method name="doDebugInit">
@@ -52,7 +62,7 @@
 
 	<!-- main colors: 264269 -->
 	<handler name="oninit">
-		flash.external.ExternalInterface.call("loadingComplete");
+		ExternalInterface.call("loadingComplete");
 		doDebugInit();
 		var cmenu = new LzContextMenu();
 		canvas.setDefaultContextMenu(cmenu);
@@ -63,7 +73,7 @@
 		if($debug) Debug.write("canvas.lc: ", canvas.lc);
 		localConnectionQProcessorDelegate = new LzDelegate(parent, "processLocalQ");
 		lz.Timer.addTimer(localConnectionQProcessorDelegate, 0);
-		canvas.lc.onStatus = function(obj:flash.events.StatusEvent) {
+		canvas.lc.onStatus = function(obj) {
 			if (obj.level == 'error') {
 				if($debug) Debug.warn("LocalConnection:: error while sending ", obj);
 			} else {
@@ -93,7 +103,8 @@
 
 	<method name="realSendViaLocalConnection" args="lc_name,methodName,tArray">
 	<![CDATA[
-		var so:SharedObject = SharedObject.getLocal("__getObjectSizeHelper");
+		/* FIXME TODO as2->3 migration
+		var so = SharedObject.getLocal("__getObjectSizeHelper");
 		so.data.o = tArray;
 		var size:Number = so.getSize();
 		so.clear();
@@ -104,6 +115,7 @@
 			return;
 		}
 		if ($debug) Debug.info("sendViaLocalConnection ", lc_name, methodName, size); //,tArray
+		*/
 		try{
 			if (tArray == null || tArray.length == 0) {
 				canvas.lc.send(lc_name,methodName);

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/emotIconsSelector.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/emotIconsSelector.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/emotIconsSelector.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/emotIconsSelector.lzx Sun Nov  8 17:58:00 2015
@@ -60,7 +60,7 @@
 					if($debug) Debug.write("emotIconsSelector/getAllPublicEmoticons : ",value);
 					for (var i=0;i<value.length;i++){
 						var swfurl = canvas.getUrl() + 'public/emoticons/'+value[i][0];
-						iconlabel = value[i][1];
+						var iconlabel = value[i][1];
 						if (value[i].length>4){
 							iconlabel += ", "+value[i][2];							
 						}

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/fontOptions.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/fontOptions.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/fontOptions.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/fontOptions.lzx Sun Nov  8 17:58:00 2015
@@ -116,9 +116,7 @@
 				this.colorPickRef = new lz.colorpicker(canvas,{btnRef:this,
 	        		x:(this.getAttributeRelative('x',canvas)-(250-this.width)),
 	        		y:(this.getAttributeRelative('y',canvas)-154+this.height)});
-	        	var myColor = new Color();
-        		myColor.setRGB(0);
-	        	this.colorPickRef.doDefaultColor(myColor);
+	        	this.colorPickRef.doDefaultColor(0);
 	        	this.colorBeforeOpen = colorPickRef.selectedColor;
 	        	lz.ModeManager.makeModal(this.colorPickRef);
 			]]>

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/globalMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/globalMethods.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/globalMethods.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/globalMethods.lzx Sun Nov  8 17:58:00 2015
@@ -130,7 +130,7 @@ function measureLine(){
                 
         textObject[currentLine] = new Array();
         textObject[currentLine]["text"] = testTxt2;
-        metrics2 = myTextFormat.getTextExtent(textObject[currentLine]["text"], 100000);
+        var metrics2 = myTextFormat.getTextExtent(textObject[currentLine]["text"], 100000);
         textObject[currentLine]["lineWidth"] = metrics2.width;
         currentLine += 1;
         //if ($debug) Debug.write("new line: ", textObject[currentLine]["text"]);

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/roomListInviteUserItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/roomListInviteUserItem.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/roomListInviteUserItem.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/inviteuser/roomListInviteUserItem.lzx Sun Nov  8 17:58:00 2015
@@ -69,7 +69,7 @@
 		<handler name="onclick">
 			canvas.isConference = !this.isaudience;
 			if (this.isaudience)
-				connectedIsAudience = '_' + 'audi';
+				var connectedIsAudience = '_' + 'audi';
 			if (this.ispublic) {
 				hib.conferencedomain = "public";
 				hib.currentroomid = this.obj.rooms_id;

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListItem.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListItem.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/roomListItem.lzx Sun Nov  8 17:58:00 2015
@@ -70,7 +70,7 @@
 			if (obj != null) {
     			canvas.isConference = !this.isaudience;
     			if (this.isaudience)
-    				connectedIsAudience = '_' + 'audi';
+    				var connectedIsAudience = '_' + 'audi';
     			if (this.ispublic) {
     				hib.conferencedomain = "public";
     				hib.currentroomid = this.obj.rooms_id;
@@ -125,7 +125,7 @@
 			
 			canvas.isConference = !this.isaudience;
 			if (this.isaudience)
-				connectedIsAudience = '_' + 'audi';
+				var connectedIsAudience = '_' + 'audi';
 			if (this.ispublic) {
 				var roomObj = this.obj;
 				hib.conferencedomain = "public";

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx Sun Nov  8 17:58:00 2015
@@ -23,7 +23,7 @@
 <class name="dtmfButton" extends="button" width="20" height="20" >
     <attribute name="dtmf" value="" type="string"/>
     <handler name="onclick">
-        callDTMFButton(this,this.text);
+        //callDTMFButton(this,this.text);
     </handler>
     <method name="doNextSipNumber">
         if ($debug) Debug.write("doNextSipNumber ",this.text);
@@ -123,6 +123,8 @@
 	]]>
 	</handler>
     
+    <method name="createMenu"/>
+    
 	<handler name="onkeydown" reference="lz.Keys" args="keyCode">
 	<![CDATA[
 		if ($debug) Debug.write("onkeydown:: keyCode = ", keyCode);

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx Sun Nov  8 17:58:00 2015
@@ -144,15 +144,15 @@
 	<text multiline="true" x="180" width="$once{ parent.width - 306 }" fontsize="11" selectable="true" name="multi" >
 		<handler name="oninit">
 			<![CDATA[
-				
+				/* FIXME TODO as2->3 migration
 				if(canvas.isrtl!='true'){
 					this.sprite.__LZtextclip.wordWrap = false;
 					if($debug) Debug.write("New Text");
 					//Debug.write(this.sprite.getTextFormat());
-					tFormat = this.sprite.__LZtextclip.getTextFormat();
+					var tFormat = getTextFormat();
 					//Debug.write(this.sprite.__LZtextclip.getTextFormat());
 					tFormat.leading = 4;
-					this.sprite.__LZtextclip.setTextFormat(tFormat);
+					setTextFormat(tFormat);
 					var items = parent.messageObj;
 					var t = "";
 					//items[0] = ["text","hello your are the hero lets check accomodation today i need some input"];
@@ -193,13 +193,13 @@
 					
 					//if ($debug) Debug.write("text: ",this.getText());
 					
-					//Debug.write(this.sprite.__LZtextclip.getTextFormat());
+					//Debug.write(this.getTextFormat());
 					tFormat.leading = parent.leading;
-					this.sprite.__LZtextclip.setTextFormat(tFormat);
-					//Debug.write(this.sprite.__LZtextclip.textHeight);
+					setTextFormat(tFormat);
+					//Debug.write(this.textHeight);
 					//Debug.write(getLineHeight());
-					//Debug.write(this.sprite.__LZtextclip.textHeight+12);
-					this.setAttribute('height',this.sprite.__LZtextclip.textHeight+12);
+					//Debug.write(this.textHeight+12);
+					this.setAttribute('height',this.textHeight+12);
 				}
 				else{
 					var t = "";
@@ -213,7 +213,7 @@
 					
 					this.setAttribute('text',this.getText()+ t);
 				}
-				
+				*/
 				parent.setAttribute('height',this.height);
 				parent.header_user.setAttribute('height',this.height);
 				parent.bg.setAttribute('height',this.height-1);

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationFilesList.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationFilesList.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationFilesList.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationFilesList.lzx Sun Nov  8 17:58:00 2015
@@ -51,7 +51,7 @@
     </method>
     
     <method name="addListpresentationFilePDF" args="pdfname,swfName,fileExplorerItemId">
-    	if ($debug) Debug.write("addListpresentationFilePDF ",originalName,pdfname,swfName,fileExplorerItemId);
+    	if ($debug) Debug.write("addListpresentationFilePDF ",pdfname,swfName,fileExplorerItemId);
         new lz.listPresentationFilePDFExplorer(this._table._listcontent,{
 	        				isExplorer:true,
 	        				isoriginal:true,

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx Sun Nov  8 17:58:00 2015
@@ -21,6 +21,13 @@
 <library>
 
 <class name="baseDraw" extends="view" >
+    <switch>
+        <when property="$as3">
+            <passthrough>
+                import flash.printing.PrintJob;
+            </passthrough>
+        </when>
+    </switch>
 
 	<attribute name="currentlayer" value="null" />
 	<attribute name="layers" value="null" />
@@ -92,14 +99,11 @@
 	 -->
 	<attribute name="drawmodus" value="hand" type="string" />
 	
-	<!-- This List holds all ActionObject
-		currently paintings
-				  letters -->
+	<!-- This List holds all ActionObject currently paintings letters -->
 	<attribute name="baseactionobjectList" value="null" />
 	<attribute name="baseredoactionobjectList" value="null" />
 	
-	<!-- This List hold a reference to all 
-		Array of Drawing Action, it is needed for coping the view and undo/redo -->
+	<!-- This List hold a reference to all Array of Drawing Action, it is needed for coping the view and undo/redo -->
 	<attribute name="basetempactionobjectList" value="null" />
 	
 	<attribute name="basdrawredoView" value="null" />
@@ -339,7 +343,7 @@
                 	
                     //myResult = my_pj.addPage(mc, null, {printAsBitmap:true}, 1);
                     //my_pj.send();
-                    delete my_pj;
+                    my_pj = null;
                 }
     		}
     		

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx Sun Nov  8 17:58:00 2015
@@ -340,7 +340,7 @@
 		              this.syncImageRefObj.baseurl,this.syncImageRefObj.fileName,
 		              this.syncImageRefObj.moduleName,this.syncImageRefObj.parentPath,
 		              this.syncImageRefObj.room,this.syncImageRefObj.domain,
-		              this.getSWFDocumentStatus(),
+		              false,this.syncImageRefObj.uniqueObjectSyncName,this.getSWFDocumentStatus(),
                       this.getZIndex());		
     </method>
 	

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx Sun Nov  8 17:58:00 2015
@@ -571,7 +571,7 @@
         		this.boundingref._innerDrag.onmouseup.sendEvent();
         	}
         }
-        this.setCurrentDocument();
+        this.setCurrentDocument(null);
     </method>
     
     <method name="setCurrentDocument" args="itemRefName">

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawSave.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawSave.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawSave.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawSave.lzx Sun Nov  8 17:58:00 2015
@@ -21,6 +21,14 @@
 <library>
 
 <class name="baseDrawSave" extends="baseDrawImage" >
+	<switch>
+		<when property="$as3">
+			<passthrough>
+				import flash.display.BitmapData;
+				import flash.geom.Matrix;
+			</passthrough>
+		</when>
+	</switch>
 	
 	<!-- saveing a file to a wml Object -->
 	<attribute name="savefileName" value="savefileName1" type="string" />
@@ -94,10 +102,10 @@
         <![CDATA[
         this.MCRef = this.getDisplayObject();
         //Debug.write("this.MCRef: ",this.MCRef);
-        this.snap = new flash.display.BitmapData(this.width, this.height, false, 0 );
+        this.snap = new BitmapData(this.width, this.height, false, 0 );
         
         //Matrix to scale the new image
-        this.MatrixValue = new flash.geom.Matrix();
+        this.MatrixValue = new Matrix();
         this.MatrixValue.scale(1, 1);
         //Copy video image
         this.snap.draw(this.MCRef,  this.MatrixValue); 
@@ -149,6 +157,7 @@
     <method name="sendPHPData" args="pix,pixH,pixW">
         //Debug.write("### sendPHPData: ",pix,pixH,pixW);
         <![CDATA[
+        	/* FIXME TODO as2->3 migration
 	        //Create the LoadVars object and pass data to PHP script
 	        var output = new LoadVars();
 	        output.img = pix.toString();
@@ -156,6 +165,7 @@
 	        output.width = pixW;
 	        //The page (and this movie itself) should be in a server to work
 	        output.send(this.sendURL, "output", "POST");
+	        */
         ]]> 
     </method>
 	

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx Sun Nov  8 17:58:00 2015
@@ -21,7 +21,13 @@
 <library>
     
 <class name="baseDrawArrow" extends="baseDrawULine" >
-    
+    <switch>
+        <when property="$as3">
+            <passthrough>
+                import flash.geom.Point;
+            </passthrough>
+        </when>
+    </switch>
     <!-- for drawing drawarrow -->
     <attribute name="currentdrawarrowlinestroke" value="0x000000" />
     <attribute name="currentdrawarrowlinestrokeDis" value="1" type="number" />
@@ -46,8 +52,8 @@
 		            name:oid_name,width:this.width,height:this.height,
 		            opacity:this.currentdrawarrowOpacity});
             
-            var pArrowStart = new flash.geom.Point(this.startx,this.starty);
-            var pArrowEnd = new flash.geom.Point(this.endx,this.endy);
+            var pArrowStart = new Point(this.startx,this.starty);
+            var pArrowEnd = new Point(this.endx,this.endy);
             
             //if ($debug) Debug.write("start,end,line",pArrowStart,pArrowEnd,this.currentdrawarrowlinelineWidth);
             this.drawArrow(this.currentlayer,pArrowStart,pArrowEnd,this.currentdrawarrowlinelineWidth,
@@ -119,8 +125,8 @@
 	            name:tempName,x:minx,y:miny,width:width,height:height,
 	            opacity:this.currentdrawarrowOpacity});
 	            
-	        var pArrowStart = new flash.geom.Point(x1,y1);
-            var pArrowEnd = new flash.geom.Point(x2,y2);
+	        var pArrowStart = new Point(x1,y1);
+            var pArrowEnd = new Point(x2,y2);
             
             //if ($debug) Debug.write("start,end,line",pArrowStart,pArrowEnd,this.currentdrawarrowlinelineWidth);
             this.drawArrow(this.currentlayer,pArrowStart,pArrowEnd,this.currentdrawarrowlinelineWidth,
@@ -177,8 +183,8 @@
                 height:lastActionObject[lastActionObject.length-2],
                 opacity:lastActionObject[6]});
             
-            var pArrowStart = new flash.geom.Point(lastActionObject[7],lastActionObject[8]);
-            var pArrowEnd = new flash.geom.Point(lastActionObject[9],lastActionObject[10]);
+            var pArrowStart = new Point(lastActionObject[7],lastActionObject[8]);
+            var pArrowEnd = new Point(lastActionObject[9],lastActionObject[10]);
             
             //if ($debug) Debug.write("start,end,line",pArrowStart,pArrowEnd,this.currentdrawarrowlinelineWidth);
             this.drawArrow(tmpCurrentlayer,pArrowStart,pArrowEnd,lastActionObject[2],
@@ -215,7 +221,7 @@
             var halfWidth:Number = (arrowStyle.headWidth != -1) ? arrowStyle.headWidth/2 : arrowStyle.headLength/2; 
             
             //Figure out the line start/end points
-            var startNorm = new flash.geom.Point(fullVect.y,-fullVect.x);
+            var startNorm = new Point(fullVect.y,-fullVect.x);
             startNorm.normalize(arrowStyle.shaftThickness/2);
             var start1 = start.add(startNorm);
             var start2 = start.subtract(startNorm);
@@ -251,7 +257,7 @@
             //if ($debug) Debug.write("edge2: ",edge2.toString());
             
             //Figure out where the arrow connects the the shaft, then calc the intersections
-            var shaftCenter = flash.geom.Point.interpolate(end,headPnt,arrowStyle.shaftPosition);
+            var shaftCenter = Point.interpolate(end,headPnt,arrowStyle.shaftPosition);
             //if ($debug) Debug.write("end: ",end.toString());
             //if ($debug) Debug.write("headPnt",headPnt.toString());
             //if ($debug) Debug.write("arrowStyle.shaftPosition: ",arrowStyle.shaftPosition);
@@ -263,7 +269,7 @@
             //if ($debug) Debug.write("inter2: ",inter2.toString());
             
             //Figure out the control points
-            var edgeCenter = flash.geom.Point.interpolate(end,headPnt,arrowStyle.edgeControlPosition);
+            var edgeCenter = Point.interpolate(end,headPnt,arrowStyle.edgeControlPosition);
             var edgeNorm = startNorm.clone();
             edgeNorm.normalize(halfWidth*arrowStyle.edgeControlSize);
             //if ($debug) Debug.write("halfWidth*arrowStyle.edgeControlSize: "+(halfWidth*arrowStyle.edgeControlSize));
@@ -358,7 +364,7 @@
                 
             }
             
-            return new flash.geom.Point(x,y);
+            return new Point(x,y);
         ]]>
     </method>    
     

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawLine.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawLine.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawLine.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawLine.lzx Sun Nov  8 17:58:00 2015
@@ -101,10 +101,10 @@
 
 			if (this.isSnapToGrid) {
 
-				xgrid = Math.round((minx - 1 - (this.currentlinelineWidth / 2))
+				var xgrid = Math.round((minx - 1 - (this.currentlinelineWidth / 2))
 						/ this.gridWidth)
 						* this.gridWidth;
-				ygrid = Math.round((miny - 1 - (this.currentlinelineWidth / 2))
+				var ygrid = Math.round((miny - 1 - (this.currentlinelineWidth / 2))
 						/ this.gridWidth)
 						* this.gridWidth;
 

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx Sun Nov  8 17:58:00 2015
@@ -183,9 +183,9 @@
 
 			if (this.isSnapToGrid) {
 
-				xgrid = Math.round((minx - 1) / this.gridWidth)
+				var xgrid = Math.round((minx - 1) / this.gridWidth)
 						* this.gridWidth;
-				ygrid = Math.round((miny - 1) / this.gridWidth)
+				var ygrid = Math.round((miny - 1) / this.gridWidth)
 						* this.gridWidth;
 
 				this.currentlayer = new lz.drawViewNew(this, {

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawTriangle.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawTriangle.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawTriangle.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawTriangle.lzx Sun Nov  8 17:58:00 2015
@@ -193,6 +193,7 @@
             name:'_innerTriangle',x:0,y:0,width:objRef.width,height:objRef.height});
         this.drawtriangleHistory(this.currentlayer,0,0,
             objRef.width,objRef.height,
+            0, 0, 0, 0, 0, 0, //tx1,ty1,tx2,ty2,tx3,ty3
             this.currenttrianglestroke,this.currenttriangleineWidth,
             this.currenttrianglestrokeFill,this.currenttrianglestrokeDis,
             this.currenttrianglestrokeFillDis);

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/simpletestvalidText.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/simpletestvalidText.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/simpletestvalidText.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/simpletestvalidText.lzx Sun Nov  8 17:58:00 2015
@@ -34,219 +34,6 @@ String.prototype.startsWith = function(p
 ]]>
 </script>
 	
-<handler name="oninit">
-	<![CDATA[
-		var tChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-		var tCharsSmall = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz";
-		
-		this._validbox.addAndSelectItem("Da","1");
-	]]>
-</handler>
-	
-    <class name="validText" extends="edittext">
-        
-        <!--- The method to be called for validating -->
-        <attribute name="validate_method" value="null" />
-        
-        <!--- the id-attribute of the resultset -->
-        <attribute name="resultId" value="id" type="string" />
-        <!--- the name-attribute of the resultset -->
-        <attribute name="resultName" value="name" type="string" />        
-					
-        <attribute name="initSelect" value="false" type="boolean" />
-					
-        <attribute name="timerDelegate" value="null"/>
-        <attribute name="typetime" type="number" value="500"/>
-        <attribute name="timerIsInited" value="false" type="boolean"/>
-        
-        <!--- items to be shown in the floatinglist -->
-        <attribute name="shownitems" value="7" type="number" />          
-        <attribute name="spacing" value="1" type="number" />  
-        <!--- The vertical offset of the floatinglist attached to this
-              combobox. -->
-        <attribute name="attachoffset" value="-1" type="number"/>
-        <!--- Whether a scrollbar should automatically show up when there are more
-              items than shownitems. -->
-        <attribute name="autoscrollbar" value="true"/>   
-
-        <!--- The border size ( in pixels ) of the popup list.  -->
-        <attribute name="bordersize"   value="1" />      
-        
-        <attribute name="currentValue" type="string" value="" />
-        
-        <!--- refernce to the current selected item -->
-        <attribute name="_selected" value="null" />    
-        
-        <method name="addAndSelectItem" args="txt,id">
-            this.cblist.addItem(txt,id);
-            this.currentValue = id;
-            this.setAttribute('text',txt);
-        </method>    
-        
-        <method name="setSelection" args="obj">
-            this._selected = obj;
-            this.currentValue = obj.value;
-            this.setAttribute('text',obj.text);
-            this.setOpen(false,true);
-            this.onselect.sendEvent();
-        </method>    
-        
-        <handler name="onselect" args="obj" />
-        
-        <method name="getValue">
-            return this.currentValue;
-        </method>
-
-                    <!-- arrow down and up both popup floatinglist, and pass the key event to it -->
-        <handler name="onkeydown" args="key">
-            <![CDATA[
-                //Debug.write("onkeydown: ",key);
-                // 38 is up-arrow
-                // 40 is down-arrow
-                // 32 is space
-                // 13 is return
-                if ((key==38) || (key==40)) {
-                    if (!this.isopen) {
-                        this.setOpen(true, true); // open, withKey
-                    } else {
-                        lz.Focus.setFocus(this.cblist, true);
-                    }
-                    // pass the key event on to the floatinglist
-                    this.cblist.onkeydown.sendEvent(key);
-                } else if (key==27){
-                    if (!this.isopen) {
-                        this.setOpen(true, true); // open, withKey
-                    } else {
-                        lz.Focus.setFocus(this.cblist, true);
-                    }
-                    this.cblist.onkeydown.sendEvent(key);
-                } else if (key!=13 && key!=9){
-                    //Don't handle Enter and Tab Events cause it will open the listItems
-                    ////Debug.write("onkeydown txt: ",this.getText());
-                    if (!this.initSelect){
-                        ////Debug.write("onvalue: ",txt,this);
-                        if (!this.timerIsInited){
-                            this.timerIsInited = true;
-                            this.timerDelegate = new LzDelegate( this, "validatedText" );
-                            ////Debug.write("+++++++++++++++++ addTimer");
-                            //Debug.write("+++++++++++++++++ removeTimer ",lz.Timer.countTimers());
-                            lz.Timer.addTimer( this.timerDelegate, this.typetime );
-                        } else {
-                            ////Debug.write("############### resetTimer NO ADDING ");
-                            //Debug.write("############### resetTimer ",lz.Timer.countTimers());
-                            lz.Timer.resetTimer( this.timerDelegate, this.typetime );
-                        }
-                    } else {
-                        this.initSelect = false;
-                    }
-                }
-            ]]>
-        </handler>
-        
-        <method name="validatedText">
-            <![CDATA[
-                ////Debug.write("validatedText: ",this.getText());
-                //this.reset();
-                if (!this.initSelect){
-                    var t = this.validate_method(this.getText());
-                    ////Debug.write('t: ',t.length);
-                    //this.parent._cblist.setAttribute('visible',true);
-                    this.cblist.removeAllItems();
-                    for (var i=0;i<t.length;i++){
-                        ////Debug.write(t[i][this.resultName],t[i][this.resultId]);
-                        this.cblist.addItem(t[i][this.resultName],t[i][this.resultId]);
-                    }                
-
-                    ////Debug.write("validateText: ",this.getText());
-                    if (!this.isopen) {
-                        this.setOpen(true, true); // open, withKey
-                    }
-                    this.timerIsInited = false;
-                } else {
-                    this.initSelect=false;
-                    this.timerIsInited = false;
-                }
-            ]]>
-        </method>	
-        
-        <attribute name="isopen" value="false" type="boolean" setter="this.setOpen(isopen)" />
-        
-        <handler name="onisopen" args="bool" />
-        
-        <method name="setOpen" args="open, withkey" >
-            if (!this.isinited) {
-                this.isopen = open;
-                return;
-            }
-            if (open) { // open combox
-                if (this.isopen) return; // tends to get called more than once, esp when
-
-                this.cblist.bringToFront();
-                this.cblist.setVisible(true);
-
-                this.isopen = true;
-                if (this['onisopen']) this.onisopen.sendEvent(true);
-            } else { // close combox
-                if (!this['isopen']) return;
-                this.isopen = false;
-
-                this.cblist.setVisible(false);
-                if (this['onisopen']) this.onisopen.sendEvent(false);
-                if ( lz.Focus.getFocus() == this.cblist ) {
-                    lz.Focus.setFocus(this, withkey);
-                }
-            }
-        </method>           
-
-        <floatinglist name="cblist"
-                      width="${owner.width - 1}"
-                      bordersize="${this.owner.bordersize}"
-                      spacing="${this.owner.spacing}"
-                      visible="false"
-                      shownitems="${this.owner.shownitems}"
-                      attach="bottom"
-                      attachoffset="${this.owner.attachoffset}"
-                      multiselect="false"
-                      autoscrollbar="${owner.autoscrollbar}" >
-
-            <method name="_dokeyup" args="kc"
-                    event="onkeyup">
-                if (kc == 27) {  // escape needs to close floating list
-                    this.owner.setOpen(false);
-                }
-            </method>
-            <method name="removeAllItems" args="index"> 
-                for (var eg in _contentview.subviews){
-                    _removeitem(_contentview.subviews[eg]); 
-                } 
-            </method>	
-            <handler name="onselect" args="obj">
-                ////Debug.write("obj: ",obj);
-                this.owner.setSelection(obj);
-            </handler>	            	
-        </floatinglist>        
-        
-         <handler name="onclick" reference="lz.GlobalMouse" args="who">
-           <![CDATA[ 
-               //need to use lz.GlobalMouse, since we don't get clicks if we're
-               //checked. NB that lz.GlobalMouse sends its events before the view
-               //receives the events, so we can just unlock it here, and the
-               //checkbox can do its normal onclick handling.
-               //Debug.write("onclick lz.GlobalMouse",lz.GlobalMouse,who);
-               //if (who != this.cblist && who.childOf(this.cblist)){
-               //    this.setOpen(false,false);
-               //} 
-               // LPP-3165
-           ]]>
-         </handler>        
-
-    </class>
-	
-
-	<validText y="20" width="270" name="_validbox" 
-        shownitems="7" validate_method="$once{ canvas.validateCountry }" 
-        resultId="state_id" resultName="name" />
-    
     <button x="300" y="20" text="getValues">
         <handler name="onclick">
             //Debug.write(parent._validbox.getValue());




Mime
View raw message