incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1382159 - in /incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager: Properties/ Properties/baselines/ SWFs/
Date Fri, 07 Sep 2012 20:25:59 GMT
Author: cframpton
Date: Fri Sep  7 20:25:59 2012
New Revision: 1382159

URL: http://svn.apache.org/viewvc?rev=1382159&view=rev
Log:
Embed missing fonts.  Fix up PopUpManager_properties_spark so you can run individual tests
without it blowing up if there is no popup to "clean".

Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/Properties/PopUpManager_properties_spark.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/Properties/baselines/PopUp_properties_height_300.png
    incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/Properties/baselines/PopUp_properties_width_300.png
    incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Basic.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Basic_spark.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Bugs_spark.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/Properties/PopUpManager_properties_spark.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/Properties/PopUpManager_properties_spark.mxml?rev=1382159&r1=1382158&r2=1382159&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/Properties/PopUpManager_properties_spark.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/Properties/PopUpManager_properties_spark.mxml
Fri Sep  7 20:25:59 2012
@@ -42,12 +42,12 @@
 					}
 				}
 		    }*/
-		    if(application.iPopUp.visible)
+		    if(application.iPopUp && application.iPopUp.visible)
 		    {
 		        PopUpManager.removePopUp(application.iPopUp);
 		    }
 
-		    if(application.canvasPopUp.visible)
+		    if(application.canvasPopUp && application.canvasPopUp.visible)
 		    {
 		        PopUpManager.removePopUp(application.canvasPopUp);
 		    }

Modified: incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/Properties/baselines/PopUp_properties_height_300.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/Properties/baselines/PopUp_properties_height_300.png?rev=1382159&r1=1382158&r2=1382159&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/Properties/baselines/PopUp_properties_width_300.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/Properties/baselines/PopUp_properties_width_300.png?rev=1382159&r1=1382158&r2=1382159&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Basic.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Basic.mxml?rev=1382159&r1=1382158&r2=1382159&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Basic.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Basic.mxml
Fri Sep  7 20:25:59 2012
@@ -19,6 +19,9 @@
 -->
 <mx:Application backgroundColor="0xFFFFFF" backgroundImage="" xmlns:mx="http://www.adobe.com/2006/mxml"
width="800" height="700"
     xmlns:comps="comps.*" >
+    
+    <mx:Style source="Assets/myStyles.css" />
+
 <mx:Script>
     <![CDATA[
 

Modified: incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Basic_spark.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Basic_spark.mxml?rev=1382159&r1=1382158&r2=1382159&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Basic_spark.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Basic_spark.mxml
Fri Sep  7 20:25:59 2012
@@ -67,7 +67,7 @@
 				embedAsCFF: false;
 			}		
 	 
-	 		mx|TextInput, mx|Button, mx|Panel, mx|Label {
+	 		mx|TextInput, mx|Button, mx|Panel, mx|Label, mx|DateChooser, mx|TitleWindow {
 	 			fontAntiAliasType: "normal";
 				fontFamily: MyArialHalo;
 				fontSize: 12;

Modified: incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Bugs_spark.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Bugs_spark.mxml?rev=1382159&r1=1382158&r2=1382159&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Bugs_spark.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/Managers/PopUpManager/SWFs/PopUpManager_Bugs_spark.mxml
Fri Sep  7 20:25:59 2012
@@ -22,6 +22,41 @@
     <s:layout>
 	        <s:VerticalLayout />
     </s:layout>
+
+    <fx:Style source="Assets/myStyles.css" />
+
+    <fx:Style>
+	 		@namespace s "library://ns.adobe.com/flex/spark";
+	 		@namespace mx "library://ns.adobe.com/flex/mx";
+	 		
+	 		@font-face{
+	 			src: url("../../../../Assets/Fonts/Open_Sans/OpenSans-Regular.ttf");
+	 			fontFamily: myArial;
+	 			embedAsCFF: true;
+	 		}
+	 
+	 
+	 		@font-face{
+	 			src: url("../../../../Assets/Fonts/Open_Sans/OpenSans-Bold.ttf");
+	 			fontWeight: bold;
+	 			fontFamily: myArial;
+	 			embedAsCFF: true;
+	 		}
+	 
+	 		@font-face{
+	 			src: url("../../../../Assets/Fonts/Open_Sans/OpenSans-Italic.ttf");
+	 			fontStyle: italic;
+	 			fontFamily: myArial;
+	 			embedAsCFF: true;
+	 
+	 		}
+	 			 
+	 		s|RichEditableText, s|Label {
+	 			fontAntiAliasType: "normal";
+				fontFamily: MyArial;
+			}
+    </fx:Style>
+    
 <fx:Script>
     <![CDATA[
 
@@ -138,8 +173,6 @@
   ]]>
 </fx:Script>
 
-<fx:Style source="Assets/myStyles.css" />
-
 <mx:TextInput id="ta" />
 <mx:Panel id="pnl1" />
 <mx:Button id="button1" label="open spark Panel" click="openSparkPanel()" />



Mime
View raw message