You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/09/10 23:23:06 UTC
[royale-asjs] branch develop updated (b9f6c98 -> 7d5e10c)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from b9f6c98 update all jewel themes
new c168c0d quiet some warnings
new 6580536 add spark modules as lookup
new f94ffc6 changes to get a clean compile of a subset of TDF that Alina uses
new a62a853 comment out APIs Alina's app isn't using so the compile is successful
new 7d5e10c more errors fixed now that SWF compile reports more errors
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/mxroyale/tourdeflexmodules/build.xml | 32 +-
.../mxroyale/tourdeflexmodules/src/explorer.xml | 52 +-
.../src/mx/containers/SimpleControlBarExample.mxml | 2 +-
.../src/mx/containers/TitleWindowApp.mxml | 5 +-
.../src/mx/controls/ButtonExample.mxml | 4 +-
.../src/mx/controls/SimpleAlert.mxml | 5 +-
.../src/mx/controls/SimpleImage.mxml | 2 +-
.../src/mx/controls/SpacerExample.mxml | 4 +-
.../src/mx/effects/GlowEffectExample.mxml | 2 +-
.../src/mx/effects/MoveEffectExample.mxml | 2 +-
.../src/mx/effects/ParallelEffectExample.mxml | 2 +-
.../src/mx/effects/ResizeEffectExample.mxml | 2 +-
.../src/spark/containers/TileGroupExample.mxml | 3 +-
.../src/spark/controls/ButtonExample.mxml | 6 +-
.../src/spark/controls/CheckboxExample.mxml | 4 +-
.../src/spark/controls/DataGroupExample.mxml | 3 +-
.../src/spark/controls/DropdownExample.mxml | 11 +-
.../src/spark/controls/ListExample.mxml | 8 +-
.../src/spark/controls/NumericStepperExample.mxml | 9 +-
.../spark/controls/RichEditableTextExample.mxml | 14 +-
.../src/spark/controls/TextAreaExample.mxml | 6 +-
.../src/spark/controls/TextInputExample.mxml | 8 +-
.../src/spark/controls/TextLayout1Example.mxml | 33 +-
.../src/spark/controls/TitleWindowExample.mxml | 5 +-
.../spark/itemRenderers/ItemRenderer1Example.mxml | 4 +-
.../spark/itemRenderers/ItemRenderer2Example.mxml | 4 +-
.../src/main/config/compile-js-config.xml | 1 +
.../src/main/config/compile-swf-config.xml | 2 +
.../src/main/resources/spark-royale-manifest.xml | 5 +
.../src/main/royale/spark/components/DataGroup.as | 26 +-
.../royale/spark/components/RichEditableText.as | 44 +-
.../src/main/royale/spark/components/TextArea.as | 10 +-
.../src/main/royale/spark/components/TileGroup.as | 685 +++++++++++++++++++++
.../spark/components/supportClasses/GroupBase.as | 39 +-
.../src/main/royale/spark/layouts/ColumnAlign.as} | 48 +-
.../src/main/royale/spark/layouts/RowAlign.as} | 48 +-
.../src/main/royale/spark/layouts/TileLayout.as | 8 +-
.../main/royale/spark/layouts/TileOrientation.as} | 40 +-
38 files changed, 981 insertions(+), 207 deletions(-)
create mode 100644 frameworks/projects/SparkRoyale/src/main/royale/spark/components/TileGroup.as
copy frameworks/projects/{MXRoyale/src/main/royale/mx/core/FlexGlobals.as => SparkRoyale/src/main/royale/spark/layouts/ColumnAlign.as} (59%)
copy frameworks/projects/{MXRoyale/src/main/royale/mx/core/FlexGlobals.as => SparkRoyale/src/main/royale/spark/layouts/RowAlign.as} (59%)
copy frameworks/projects/{MXRoyale/src/main/royale/mx/core/FlexGlobals.as => SparkRoyale/src/main/royale/spark/layouts/TileOrientation.as} (61%)
[royale-asjs] 03/05: changes to get a clean compile of a subset of
TDF that Alina uses
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit f94ffc651cc4a9dbf08b7f2ebbe7204584265829
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Sep 10 14:27:47 2018 -0700
changes to get a clean compile of a subset of TDF that Alina uses
---
.../src/main/resources/spark-royale-manifest.xml | 3 +
.../src/main/royale/spark/components/DataGroup.as | 26 +-
.../royale/spark/components/RichEditableText.as | 44 +-
.../src/main/royale/spark/components/TextArea.as | 10 +-
.../src/main/royale/spark/components/TileGroup.as | 685 +++++++++++++++++++++
.../spark/components/supportClasses/GroupBase.as | 39 +-
.../src/main/royale/spark/layouts/ColumnAlign.as | 66 ++
.../src/main/royale/spark/layouts/RowAlign.as | 66 ++
.../src/main/royale/spark/layouts/TileLayout.as | 8 +-
.../main/royale/spark/layouts/TileOrientation.as | 56 ++
10 files changed, 933 insertions(+), 70 deletions(-)
diff --git a/frameworks/projects/SparkRoyale/src/main/resources/spark-royale-manifest.xml b/frameworks/projects/SparkRoyale/src/main/resources/spark-royale-manifest.xml
index 4bc5d2c..97fe44b 100644
--- a/frameworks/projects/SparkRoyale/src/main/resources/spark-royale-manifest.xml
+++ b/frameworks/projects/SparkRoyale/src/main/resources/spark-royale-manifest.xml
@@ -55,6 +55,7 @@
<component id="GroupBase" class="spark.components.supportClasses.GroupBase"/>
<component id="HGroup" class="spark.components.HGroup"/>
<component id="VGroup" class="spark.components.VGroup"/>
+ <component id="TileGroup" class="spark.components.TileGroup"/>
<component id="ListBase" class="spark.components.supportClasses.ListBase"/>
<component id="ItemRenderer" class="spark.components.supportClasses.ItemRenderer"/>
<component id="GradientEntry" class="mx.graphics.GradientEntry" lookupOnly="true"/>
@@ -71,8 +72,10 @@
<component id="BitmapImage" class="spark.primitives.BitmapImage"/>
<component id="Image" class="spark.components.Image"/>
<component id="HorizontalLayout" class="spark.layouts.HorizontalLayout"/>
+ <component id="TileLayout" class="spark.layouts.TileLayout"/>
<component id="Module" class="mx.modules.Module" lookupOnly="true"/>
+ <component id="ArrayCollection" class="mx.collections.ArrayCollection" lookupOnly="true"/>
<!-- Text Layout Framework (TLF) -->
<component id="a" class="org.apache.royale.textLayout.elements.LinkElement" lookupOnly="true"/>
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/DataGroup.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/DataGroup.as
index 1a378b7..d70b9ff 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/DataGroup.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/DataGroup.as
@@ -26,7 +26,7 @@ import flash.geom.Rectangle;
import flash.utils.Dictionary;
import flash.utils.getQualifiedClassName;
*/
-/* import mx.collections.IList;
+/*
import mx.core.IDataRenderer;
import mx.core.IInvalidating;
import mx.core.ILayoutElement;
@@ -42,13 +42,14 @@ import spark.events.RendererExistenceEvent;
*/
import mx.core.IFactory;
import mx.core.IVisualElement;
-
+import mx.collections.IList;
import spark.components.supportClasses.GroupBase;
import mx.core.IUIComponent;
import mx.core.mx_internal;
use namespace mx_internal; // for mx_internal property contentChangeDelta
+import org.apache.royale.core.ISelectionModel;
/**
* Dispatched when a renderer is added to this dataGroup.
@@ -613,27 +614,20 @@ public class DataGroup extends GroupBase
* @playerversion Flash 10
* @playerversion AIR 1.5
* @productversion Flex 4
+ * @royaleignorecoercion mx.collections.IList
*/
- /* public function get dataProvider():IList
+ public function get dataProvider():IList
{
- return _dataProvider;
+ return (model as ISelectionModel).dataProvider as IList;
}
- */
/**
- * @private
+ * @royaleignorecoercion org.apache.royale.core.ISelectionModel
*/
- /* public function set dataProvider(value:IList):void
+ public function set dataProvider(value:IList):void
{
- if (_dataProvider == value)
- return;
-
- removeDataProviderListener();
- _dataProvider = value; // listener will be added by commitProperties()
- dataProviderChanged = true;
- invalidateProperties();
- dispatchEvent(new Event("dataProviderChanged"));
+ (model as ISelectionModel).dataProvider = value;
}
- */
+
/**
* @private
* Used below for sorting the virtualRendererIndices Vector.
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/RichEditableText.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/RichEditableText.as
index f412763..72fe595 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/RichEditableText.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/RichEditableText.as
@@ -80,7 +80,6 @@ package spark.components
import mx.core.IIMESupport;
import mx.core.ISystemCursorClient;
import mx.core.mx_internal;
- import mx.events.FlexEvent;
import mx.managers.IFocusManager;
import mx.utils.StringUtil;
@@ -94,6 +93,7 @@ package spark.components
use namespace mx_internal;
use namespace tlf_internal; */
+ import mx.events.FlexEvent;
import mx.core.UIComponent;
import mx.managers.IFocusManagerComponent;
@@ -140,7 +140,7 @@ package spark.components
* @playerversion AIR 1.5
* @productversion Royale 0.9.4
*/
- // [Event(name="change", type="spark.events.TextOperationEvent")]
+ [Event(name="change", type="spark.events.TextOperationEvent")]
/**
* Dispatched when the user presses the Enter key,
@@ -1247,7 +1247,7 @@ package spark.components
/**
* @private
*/
- //private var _content:Object;
+ private var _content:Object;
/**
* @private
@@ -1269,7 +1269,7 @@ package spark.components
* Similar metadata on TLF classes causes the same rules to apply
* within <p>, <span>, etc.
*/
- //[RichTextContent]
+ [RichTextContent]
/**
* This property is intended for use in MXML at compile time;
@@ -1307,15 +1307,15 @@ package spark.components
* @playerversion AIR 1.5
* @productversion Royale 0.9.4
*/
- /* public function get content():Object
+ public function get content():Object
{
- return textFlow;
- } */
+ return _content; //return textFlow;
+ }
/**
* @private
*/
- /* public function set content(value:Object):void
+ public function set content(value:Object):void
{
// Treat setting the 'content' to null
// as if 'text' were being set to the empty String
@@ -1330,23 +1330,25 @@ package spark.components
return;
_content = value;
- contentChanged = true;
- source = "content";
+ //contentChanged = true;
+ //source = "content";
// Of 'text', 'textFlow', and 'content', the last one set wins.
- textChanged = false;
- textFlowChanged = false;
+ //textChanged = false;
+ //textFlowChanged = false;
// The other two are now invalid and must be recalculated when needed.
_text = null;
- _textFlow = null;
-
+ //_textFlow = null;
+
+ /*
invalidateProperties();
invalidateSize();
invalidateDisplayList();
+ */
dispatchEvent(new FlexEvent(FlexEvent.VALUE_COMMIT));
- } */
+ }
//----------------------------------
// displayAsPassword
@@ -1400,7 +1402,7 @@ package spark.components
/**
* @private
*/
- //private var _editable:Boolean = true;
+ private var _editable:Boolean = true;
/**
* @private
@@ -1429,25 +1431,27 @@ package spark.components
* @playerversion AIR 1.5
* @productversion Royale 0.9.4
*/
- /* public function get editable():Boolean
+ public function get editable():Boolean
{
return _editable;
- } */
+ }
/**
* @private
*/
- /* public function set editable(value:Boolean):void
+ public function set editable(value:Boolean):void
{
if (value == _editable)
return;
_editable = value;
+ /*
editableChanged = true;
invalidateProperties();
invalidateDisplayList();
- } */
+ */
+ }
//----------------------------------
// editingMode
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/TextArea.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/TextArea.as
index 3008dad..f716a60 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/TextArea.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/TextArea.as
@@ -20,9 +20,9 @@
package spark.components
{
+import org.apache.royale.textLayout.elements.TextFlow;
/* import flash.events.Event;
-import flashx.textLayout.elements.TextFlow;
import flashx.textLayout.formats.TextLayoutFormat;
import mx.core.ScrollPolicy;
@@ -563,10 +563,12 @@ public class TextArea extends SkinnableTextBase
* @playerversion AIR 1.5
* @productversion Royale 0.9.4
*/
- /* public function get textFlow():TextFlow
+ public function get textFlow():TextFlow
{
- return getTextFlow();
- } */
+ trace("TextArea textFlow not implemented");
+ //return getTextFlow();
+ return null;
+ }
/**
* @private
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/TileGroup.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/TileGroup.as
new file mode 100644
index 0000000..73c0bae
--- /dev/null
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/TileGroup.as
@@ -0,0 +1,685 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package spark.components
+{
+import org.apache.royale.events.Event;
+import spark.layouts.TileLayout;
+import spark.layouts.supportClasses.LayoutBase;
+
+//[IconFile("TileGroup.png")]
+
+[Exclude(name="layout", kind="property")]
+
+/**
+ * The TileGroup container is an instance of the Group container
+ * that uses the TileLayout class.
+ * Do not modify the <code>layout</code> property.
+ * Instead, use the properties of the TileGroup class to modify the
+ * characteristics of the TileLayout class.
+ *
+ * <p>The TileGroup container has the following default characteristics:</p>
+ * <table class="innertable">
+ * <tr><th>Characteristic</th><th>Description</th></tr>
+ * <tr><td>Default size</td><td>Large enough to display its children</td></tr>
+ * <tr><td>Minimum size</td><td>0 pixels</td></tr>
+ * <tr><td>Maximum size</td><td>10000 pixels wide and 10000 pixels high</td></tr>
+ * </table>
+ *
+ * @mxml
+ *
+ * <p>The <code><s:TileGroup></code> tag inherits all of the tag
+ * attributes of its superclass and adds the following tag attributes:</p>
+ *
+ * <pre>
+ * <s:TileGroup
+ * <strong>Properties</strong>
+ * columnAlign="left"
+ * columnCount="-1"
+ * columnWidth="0"
+ * horizontalAlign="justify"
+ * horizontalGap="6"
+ * orientation="rows"
+ * padding="0"
+ * paddingBottom="0"
+ * paddingLeft="0"
+ * paddingRight="0"
+ * paddingTop="0"
+ * requestedColumnCount"-1"
+ * requestedRowCount="-1"
+ * rowAlign="top"
+ * rowCount="-1"
+ * rowHeight="0"
+ * verticalAlign="justify"
+ * verticalGap="6"
+ * />
+ * </pre>
+ *
+ * @see spark.layouts.TileLayout
+ * @includeExample examples/TileGroupExample.mxml
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+public class TileGroup extends Group
+{
+// include "../core/Version.as";
+
+ /**
+ * Constructor.
+ * Initializes the <code>layout</code> property to an instance of
+ * the TileLayout class.
+ *
+ * @see spark.layouts.TileLayout
+ * @see spark.components.HGroup
+ * @see spark.components.VGroup
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function TileGroup():void
+ {
+ super();
+ super.layout = new TileLayout();
+ }
+
+ private function get tileLayout():TileLayout
+ {
+ return TileLayout(layout);
+ }
+
+ //--------------------------------------------------------------------------
+ //
+ // Properties
+ //
+ //--------------------------------------------------------------------------
+
+ //----------------------------------
+ // columnAlign
+ //----------------------------------
+
+ [Inspectable(category="General", enumeration="left,justifyUsingGap,justifyUsingWidth", defaultValue="left")]
+
+ /**
+ * @copy spark.layouts.TileLayout#columnAlign
+ *
+ * @default "left"
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function get columnAlign():String
+ {
+ return tileLayout.columnAlign;
+ }
+
+ /**
+ * @private
+ */
+ public function set columnAlign(value:String):void
+ {
+ tileLayout.columnAlign = value;
+ }
+
+ //----------------------------------
+ // columnCount
+ //----------------------------------
+
+ [Bindable("propertyChange")]
+ [Inspectable(category="General")]
+
+ /**
+ * @copy spark.layouts.TileLayout#columnCount
+ *
+ * @default -1
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function get columnCount():int
+ {
+ return tileLayout.columnCount;
+ }
+
+ //----------------------------------
+ // columnWidth
+ //----------------------------------
+
+ [Bindable("propertyChange")]
+ [Inspectable(category="General", minValue="0.0")]
+
+ /**
+ * @copy spark.layouts.TileLayout#columnWidth
+ *
+ * @default 0
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function get columnWidth():int
+ {
+ return tileLayout.columnWidth;
+ }
+
+ /**
+ * @private
+ */
+ public function set columnWidth(value:int):void
+ {
+ tileLayout.columnWidth = value;
+ }
+
+ //----------------------------------
+ // horizontalAlign
+ //----------------------------------
+
+ [Inspectable(category="General", enumeration="left,right,center,justify", defaultValue="justify")]
+
+ /**
+ * @copy spark.layouts.TileLayout#horizontalAlign
+ *
+ * @default "justify"
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function get horizontalAlign():String
+ {
+ return tileLayout.horizontalAlign;
+ }
+
+ /**
+ * @private
+ */
+ public function set horizontalAlign(value:String):void
+ {
+ tileLayout.horizontalAlign = value;
+ }
+
+ //----------------------------------
+ // horizontalGap
+ //----------------------------------
+
+ [Bindable("propertyChange")]
+ [Inspectable(category="General", defaultValue="6")]
+
+ /**
+ * @copy spark.layouts.TileLayout#horizontalGap
+ *
+ * @default 6
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function get horizontalGap():int
+ {
+ return tileLayout.horizontalGap;
+ }
+
+ /**
+ * @private
+ */
+ public function set horizontalGap(value:int):void
+ {
+ tileLayout.horizontalGap = value;
+ }
+
+ //----------------------------------
+ // orientation
+ //----------------------------------
+
+ [Inspectable(category="General", enumeration="rows,columns", defaultValue="rows")]
+
+ /**
+ * @copy spark.layouts.TileLayout#orientation
+ *
+ * @default "rows"
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function get orientation():String
+ {
+ return tileLayout.orientation;
+ }
+
+ /**
+ * @private
+ */
+ public function set orientation(value:String):void
+ {
+ tileLayout.orientation = value;
+ }
+
+ //----------------------------------
+ // padding
+ //----------------------------------
+
+ [Inspectable(category="General", defaultValue="0.0")]
+
+ /**
+ * @copy spark.layouts.TileLayout#padding
+ *
+ * @default 0
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function get padding():Number
+ {
+ return tileLayout.padding;
+ }
+
+ /**
+ * @private
+ */
+ public function set padding(value:Number):void
+ {
+ tileLayout.padding = value;
+ }
+
+ //----------------------------------
+ // paddingLeft
+ //----------------------------------
+
+ [Inspectable(category="General", defaultValue="0.0")]
+
+ /**
+ * @copy spark.layouts.TileLayout#paddingLeft
+ *
+ * @default 0
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ override public function get paddingLeft():Number
+ {
+ return tileLayout.paddingLeft;
+ }
+
+ /**
+ * @private
+ */
+ override public function set paddingLeft(value:Number):void
+ {
+ tileLayout.paddingLeft = value;
+ }
+
+ //----------------------------------
+ // paddingRight
+ //----------------------------------
+
+ [Inspectable(category="General", defaultValue="0.0")]
+
+ /**
+ * @copy spark.layouts.TileLayout#paddingRight
+ *
+ * @default 0
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ override public function get paddingRight():Number
+ {
+ return tileLayout.paddingRight;
+ }
+
+ /**
+ * @private
+ */
+ override public function set paddingRight(value:Number):void
+ {
+ tileLayout.paddingRight = value;
+ }
+
+ //----------------------------------
+ // paddingTop
+ //----------------------------------
+
+ [Inspectable(category="General", defaultValue="0.0")]
+
+ /**
+ * @copy spark.layouts.TileLayout#paddingTop
+ *
+ * @default 0
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ override public function get paddingTop():Number
+ {
+ return tileLayout.paddingTop;
+ }
+
+ /**
+ * @private
+ */
+ override public function set paddingTop(value:Number):void
+ {
+ tileLayout.paddingTop = value;
+ }
+
+ //----------------------------------
+ // paddingBottom
+ //----------------------------------
+
+ [Inspectable(category="General", defaultValue="0.0")]
+
+ /**
+ * @copy spark.layouts.TileLayout#paddingBottom
+ *
+ * @default 0
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ override public function get paddingBottom():Number
+ {
+ return tileLayout.paddingBottom;
+ }
+
+ /**
+ * @private
+ */
+ override public function set paddingBottom(value:Number):void
+ {
+ tileLayout.paddingBottom = value;
+ }
+
+ //----------------------------------
+ // requestedColumnCount
+ //----------------------------------
+
+ [Inspectable(category="General", minValue="-1")]
+
+ /**
+ * @copy spark.layouts.TileLayout#requestedColumnCount
+ *
+ * @default -1
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function get requestedColumnCount():int
+ {
+ return tileLayout.requestedColumnCount;
+ }
+
+ /**
+ * @private
+ */
+ public function set requestedColumnCount(value:int):void
+ {
+ tileLayout.requestedColumnCount = value;
+ }
+
+ //----------------------------------
+ // requestedRowCount
+ //----------------------------------
+
+ [Inspectable(category="General", minValue="-1")]
+
+ /**
+ * @copy spark.layouts.TileLayout#requestedRowCount
+ *
+ * @default -1
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function get requestedRowCount():int
+ {
+ return tileLayout.requestedRowCount;
+ }
+
+ /**
+ * @private
+ */
+ public function set requestedRowCount(value:int):void
+ {
+ tileLayout.requestedRowCount = value;
+ }
+
+ //----------------------------------
+ // rowAlign
+ //----------------------------------
+
+ [Inspectable(category="General", enumeration="top,justifyUsingGap,justifyUsingHeight", defaultValue="top")]
+
+ /**
+ * @copy spark.layouts.TileLayout#rowAlign
+ *
+ * @default "top"
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function get rowAlign():String
+ {
+ return tileLayout.rowAlign;
+ }
+
+ /**
+ * @private
+ */
+ public function set rowAlign(value:String):void
+ {
+ tileLayout.rowAlign = value;
+ }
+
+ //----------------------------------
+ // rowCount
+ //----------------------------------
+
+ [Bindable("propertyChange")]
+ [Inspectable(category="General")]
+
+ /**
+ * @copy spark.layouts.TileLayout#rowCount
+ *
+ * @default -1
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function get rowCount():int
+ {
+ return tileLayout.rowCount;
+ }
+
+ //----------------------------------
+ // rowHeight
+ //----------------------------------
+
+ [Bindable("propertyChange")]
+ [Inspectable(category="General", minValue="0.0")]
+
+ /**
+ * @copy spark.layouts.TileLayout#rowHeight
+ *
+ * @default 0
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function get rowHeight():int
+ {
+ return tileLayout.rowHeight;
+ }
+
+ /**
+ * @private
+ */
+ public function set rowHeight(value:int):void
+ {
+ tileLayout.rowHeight = value;
+ }
+
+ //----------------------------------
+ // verticalAlign
+ //----------------------------------
+
+ [Inspectable(category="General", enumeration="top,bottom,middle,justify", defaultValue="justify")]
+
+ /**
+ * @copy spark.layouts.TileLayout#verticalAlign
+ *
+ * @default "justify"
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function get verticalAlign():String
+ {
+ return tileLayout.verticalAlign;
+ }
+
+ /**
+ * @private
+ */
+ public function set verticalAlign(value:String):void
+ {
+ tileLayout.verticalAlign = value;
+ }
+
+ //----------------------------------
+ // verticalGap
+ //----------------------------------
+
+ [Bindable("propertyChange")]
+ [Inspectable(category="General", defaultValue="6")]
+
+ /**
+ * @copy spark.layouts.TileLayout#verticalGap
+ *
+ * @default 6
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function get verticalGap():int
+ {
+ return tileLayout.verticalGap;
+ }
+
+ /**
+ * @private
+ */
+ public function set verticalGap(value:int):void
+ {
+ tileLayout.verticalGap = value;
+ }
+
+ //--------------------------------------------------------------------------
+ //
+ // Overridden Properties
+ //
+ //--------------------------------------------------------------------------
+
+ //----------------------------------
+ // layout
+ //----------------------------------
+
+ /**
+ * @private
+ override public function set layout(value:LayoutBase):void
+ {
+ throw(new Error(resourceManager.getString("components", "layoutReadOnly")));
+ }
+ */
+
+ //--------------------------------------------------------------------------
+ //
+ // Event Handlers
+ //
+ //--------------------------------------------------------------------------
+
+ /**
+ * @private
+ override public function addEventListener(type:String, listener:Function, useCapture:Boolean = false, priority:int = 0, useWeakReference:Boolean = false):void
+ {
+ if (type == "propertyChange")
+ {
+ if (!hasEventListener(type))
+ tileLayout.addEventListener(type, redispatchHandler);
+ }
+ super.addEventListener(type, listener, useCapture, priority, useWeakReference)
+ }
+ */
+
+ /**
+ * @private
+ override public function removeEventListener(type:String, listener:Function, useCapture:Boolean = false):void
+ {
+ super.removeEventListener(type, listener, useCapture);
+ if (type == "propertyChange")
+ {
+ if (!hasEventListener(type))
+ tileLayout.removeEventListener(type, redispatchHandler);
+ }
+ }
+ */
+
+ private function redispatchHandler(event:Event):void
+ {
+ dispatchEvent(event);
+ }
+
+}
+}
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/GroupBase.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/GroupBase.as
index ef4ff64..51aa21e 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/GroupBase.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/GroupBase.as
@@ -728,7 +728,7 @@ public class GroupBase extends UIComponent implements ILayoutParent
// clipAndEnableScrolling
//----------------------------------
- //private var clipAndEnableScrollingExplicitlySet:Boolean = false;
+ private var _clipAndEnableScrolling:Boolean = false;
/**
* @copy spark.core.IViewport#clipAndEnableScrolling
@@ -740,45 +740,32 @@ public class GroupBase extends UIComponent implements ILayoutParent
* @playerversion AIR 1.5
* @productversion Royale 0.9.4
*/
- /* public function get clipAndEnableScrolling():Boolean
+ public function get clipAndEnableScrolling():Boolean
{
- if (_layout)
- {
- return _layout.clipAndEnableScrolling;
- }
- else if (_layoutProperties &&
- _layoutProperties.clipAndEnableScrolling !== undefined)
+ COMPILE::JS
{
- return _layoutProperties.clipAndEnableScrolling;
+ return element.style.overflow == "auto";
}
- else
+ COMPILE::SWF
{
- return false;
+ return _clipAndEnableScrolling;
}
- } */
+ }
/**
* @private
*/
- /* public function set clipAndEnableScrolling(value:Boolean):void
+ public function set clipAndEnableScrolling(value:Boolean):void
{
- clipAndEnableScrollingExplicitlySet = true;
- if (_layout)
+ COMPILE::JS
{
- _layout.clipAndEnableScrolling = value;
+ element.style.overflow = value ? "auto" : "none";
}
- else if (_layoutProperties)
- {
- _layoutProperties.clipAndEnableScrolling = value;
- }
- else
+ COMPILE::SWF
{
- _layoutProperties = {clipAndEnableScrolling: value};
+ _clipAndEnableScrolling = value;
}
-
- // clipAndEnableScrolling affects measured minimum size
- invalidateSize();
- } */
+ }
//----------------------------------
// scrollRect
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/layouts/ColumnAlign.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/layouts/ColumnAlign.as
new file mode 100644
index 0000000..c78360f
--- /dev/null
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/layouts/ColumnAlign.as
@@ -0,0 +1,66 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package spark.layouts
+{
+
+/**
+ * The ColumnAlign class defines the possible values for the
+ * <code>columnAlign</code> property of the TileLayout class.
+ *
+ * @see TileLayout#columnAlign
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+public final class ColumnAlign
+{
+ /**
+ * Do not justify the rows.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public static const LEFT:String = "left";
+
+ /**
+ * Justify the rows by increasing the vertical gap.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public static const JUSTIFY_USING_GAP:String = "justifyUsingGap";
+
+ /**
+ * Justify the rows by increasing the row height.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public static const JUSTIFY_USING_WIDTH:String = "justifyUsingWidth";
+}
+}
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/layouts/RowAlign.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/layouts/RowAlign.as
new file mode 100644
index 0000000..5c9c460
--- /dev/null
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/layouts/RowAlign.as
@@ -0,0 +1,66 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package spark.layouts
+{
+
+/**
+ * The RowAlign class defines the possible values for the
+ * <code>rowAlign</code> property of the TileLayout class.
+ *
+ * @see TileLayout#rowAlign
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+public final class RowAlign
+{
+ /**
+ * Do not justify the rows.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public static const TOP:String = "top";
+
+ /**
+ * Justify the rows by increasing the vertical gap.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public static const JUSTIFY_USING_GAP:String = "justifyUsingGap";
+
+ /**
+ * Justify the rows by increasing the row height.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public static const JUSTIFY_USING_HEIGHT:String = "justifyUsingHeight";
+}
+}
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/layouts/TileLayout.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/layouts/TileLayout.as
index c13748e..08f6e5f 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/layouts/TileLayout.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/layouts/TileLayout.as
@@ -1344,7 +1344,7 @@ public class TileLayout extends LayoutBase
_numElementsCached = count;
for (var i:int = 0; i < count; i++)
{
- var el:ILayoutElement = layoutTarget.getElementAt(i);
+ var el:ILayoutElement = layoutTarget.getElementAt(i) as ILayoutElement;
if (!el || !el.includeInLayout)
{
_numElementsCached--;
@@ -1391,7 +1391,7 @@ public class TileLayout extends LayoutBase
for (var i:int = 0; i < count; i++)
{
- var el:ILayoutElement = layoutTarget.getElementAt(i);
+ var el:ILayoutElement = layoutTarget.getElementAt(i) as ILayoutElement;
if (!el || !el.includeInLayout)
_numElementsCached--;
}
@@ -1484,7 +1484,7 @@ public class TileLayout extends LayoutBase
i = visibleEndIndex;
continue;
}
- var el:ILayoutElement = layoutTarget.getElementAt(i);
+ var el:ILayoutElement = layoutTarget.getElementAt(i) as ILayoutElement;
if (!el)
continue;
if (el is IVisualElement)
@@ -2009,7 +2009,7 @@ public class TileLayout extends LayoutBase
IVisualElement(el).visible = true;
}
else
- el = layoutTarget.getElementAt(index);
+ el = layoutTarget.getElementAt(index) as ILayoutElement;
if (!el || !el.includeInLayout)
continue;
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/layouts/TileOrientation.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/layouts/TileOrientation.as
new file mode 100644
index 0000000..7921c06
--- /dev/null
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/layouts/TileOrientation.as
@@ -0,0 +1,56 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package spark.layouts
+{
+
+/**
+ * The TileOrientation class defines the possible values for the
+ * <code>orientation</code> property of the TileLayout class.
+ *
+ * @see TileLayout#orientation
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+public final class TileOrientation
+{
+ /**
+ * Arranges elements row by row.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public static const ROWS:String = "rows";
+
+ /**
+ * Arranges elements column by column.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public static const COLUMNS:String = "columns";
+}
+}
\ No newline at end of file
[royale-asjs] 01/05: quiet some warnings
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit c168c0d7b6347587977a5f5ced827a126d08ef3e
Author: Alex Harui <ah...@apache.org>
AuthorDate: Fri Sep 7 09:23:53 2018 -0700
quiet some warnings
---
.../js/projects/SparkRoyaleJS/src/main/config/compile-js-config.xml | 1 +
frameworks/projects/SparkRoyale/src/main/config/compile-swf-config.xml | 2 ++
2 files changed, 3 insertions(+)
diff --git a/frameworks/js/projects/SparkRoyaleJS/src/main/config/compile-js-config.xml b/frameworks/js/projects/SparkRoyaleJS/src/main/config/compile-js-config.xml
index c9785ab..9936e99 100644
--- a/frameworks/js/projects/SparkRoyaleJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/projects/SparkRoyaleJS/src/main/config/compile-js-config.xml
@@ -68,6 +68,7 @@
<path-element>../../../../../libs/EffectsJS.swc</path-element>
<path-element>../../../../../libs/ExpressJS.swc</path-element>
<path-element>../../../../../libs/GraphicsJS.swc</path-element>
+ <path-element>../../../../../libs/HTMLJS.swc</path-element>
<path-element>../../../../../libs/NetworkJS.swc</path-element>
<path-element>../../../../../libs/ChartsJS.swc</path-element>
<path-element>../../../../../libs/MXRoyaleJS.swc</path-element>
diff --git a/frameworks/projects/SparkRoyale/src/main/config/compile-swf-config.xml b/frameworks/projects/SparkRoyale/src/main/config/compile-swf-config.xml
index 20a0a17..d14487d 100644
--- a/frameworks/projects/SparkRoyale/src/main/config/compile-swf-config.xml
+++ b/frameworks/projects/SparkRoyale/src/main/config/compile-swf-config.xml
@@ -34,7 +34,9 @@
<path-element>../../../../../libs/Basic.swc</path-element>
<path-element>../../../../../libs/Binding.swc</path-element>
<path-element>../../../../../libs/Collections.swc</path-element>
+ <path-element>../../../../../libs/Effects.swc</path-element>
<path-element>../../../../../libs/Graphics.swc</path-element>
+ <path-element>../../../../../libs/HTML.swc</path-element>
<path-element>../../../../../libs/MXRoyale.swc</path-element>
<path-element>../../../../../libs/Reflection.swc</path-element>
<path-element>../../../../../libs/Text.swc</path-element>
[royale-asjs] 02/05: add spark modules as lookup
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 65805361d54ad646910e5e20ef86b1ee824b7769
Author: Alex Harui <ah...@apache.org>
AuthorDate: Fri Sep 7 09:24:18 2018 -0700
add spark modules as lookup
---
.../projects/SparkRoyale/src/main/resources/spark-royale-manifest.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/frameworks/projects/SparkRoyale/src/main/resources/spark-royale-manifest.xml b/frameworks/projects/SparkRoyale/src/main/resources/spark-royale-manifest.xml
index 296b13a..4bc5d2c 100644
--- a/frameworks/projects/SparkRoyale/src/main/resources/spark-royale-manifest.xml
+++ b/frameworks/projects/SparkRoyale/src/main/resources/spark-royale-manifest.xml
@@ -72,6 +72,8 @@
<component id="Image" class="spark.components.Image"/>
<component id="HorizontalLayout" class="spark.layouts.HorizontalLayout"/>
+ <component id="Module" class="mx.modules.Module" lookupOnly="true"/>
+
<!-- Text Layout Framework (TLF) -->
<component id="a" class="org.apache.royale.textLayout.elements.LinkElement" lookupOnly="true"/>
<component id="br" class="org.apache.royale.textLayout.elements.BreakElement" lookupOnly="true"/>
[royale-asjs] 04/05: comment out APIs Alina's app isn't using so
the compile is successful
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit a62a8535aac8cb21debc32983b330b5d5a4c5bbb
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Sep 10 14:28:56 2018 -0700
comment out APIs Alina's app isn't using so the compile is successful
---
examples/mxroyale/tourdeflexmodules/build.xml | 32 ++++++++++---
.../mxroyale/tourdeflexmodules/src/explorer.xml | 52 ++++++++++++++++------
.../src/spark/containers/TileGroupExample.mxml | 3 +-
.../src/spark/controls/ButtonExample.mxml | 4 +-
.../src/spark/controls/CheckboxExample.mxml | 4 +-
.../src/spark/controls/DataGroupExample.mxml | 3 +-
.../src/spark/controls/DropdownExample.mxml | 11 +++--
.../src/spark/controls/ListExample.mxml | 8 ++--
.../src/spark/controls/NumericStepperExample.mxml | 9 ++--
.../spark/controls/RichEditableTextExample.mxml | 14 +++---
.../src/spark/controls/TextAreaExample.mxml | 6 ++-
.../src/spark/controls/TextInputExample.mxml | 8 +++-
.../src/spark/controls/TextLayout1Example.mxml | 33 +++++++-------
.../spark/itemRenderers/ItemRenderer1Example.mxml | 4 +-
14 files changed, 131 insertions(+), 60 deletions(-)
diff --git a/examples/mxroyale/tourdeflexmodules/build.xml b/examples/mxroyale/tourdeflexmodules/build.xml
index 49b08bb..8102215 100644
--- a/examples/mxroyale/tourdeflexmodules/build.xml
+++ b/examples/mxroyale/tourdeflexmodules/build.xml
@@ -303,31 +303,38 @@
<compile-mxml example="/spark/controls/AccordionExample"/>
-->
<compile-mxml example="/spark/controls/AdvancedDatagridExample"/>
+ <!--
<compile-mxml example="/spark/controls/ColorPickerExample"/>
+ -->
<compile-mxml example="/spark/controls/ComboBoxExample"/>
<compile-mxml example="/spark/controls/DataGridExample"/>
<compile-mxml example="/spark/controls/DataGroupExample"/>
+ <!--
<compile-mxml example="/spark/controls/MenuExample"/>
+ -->
<compile-mxml example="/spark/controls/RichEditableTextExample"/>
+ <!--
<compile-mxml example="/spark/controls/DateChooserExample"/>
<compile-mxml example="/spark/controls/DateFieldExample"/>
<compile-mxml example="/spark/controls/FormExample"/>
<compile-mxml example="/spark/controls/ImageExample"/>
<compile-mxml example="/spark/controls/LinkBarExample"/>
<compile-mxml example="/spark/controls/LinkButtonExample"/>
- <!--
<compile-mxml example="/spark/controls/OLAPDataGridExample"/>
<compile-mxml example="/spark/controls/PopupButtonExample"/>
- -->
<compile-mxml example="/spark/controls/ProgressBarExample"/>
+ -->
<!-- Currently broken <compile-mxml example="/spark/controls/SWFLoaderExample"/> -->
<compile-mxml example="/spark/controls/TitleWindowExample"/>
<compile-mxml example="/spark/controls/ToggleButtonBarExample"/>
+ <!--
<compile-mxml example="/spark/controls/ToolTipExample"/>
<compile-mxml example="/spark/controls/TreeExample"/>
<compile-mxml example="/spark/controls/ViewStackExample"/>
+ -->
<compile-mxml example="/spark/controls/TextAreaExample"/>
<compile-mxml example="/spark/controls/TextInputExample"/>
+ <!--
<compile-mxml example="/spark/controls/TextLayout1Example"/>
<compile-mxml example="/spark/controls/TextLayout2Example"/>
<compile-mxml example="/spark/controls/TextLayout3Example"/>
@@ -341,26 +348,31 @@
<compile-mxml example="/spark/layouts/CustomLayoutFlickrWheelExample"/>
<compile-mxml example="/spark/layouts/CustomLayoutFlowExample"/>
<compile-mxml example="/spark/layouts/CustomLayoutHBaselineExample"/>
+ -->
<compile-mxml example="/spark/itemRenderers/ItemRenderer1Example"/>
<compile-mxml example="/spark/itemRenderers/ItemRenderer2Example"/>
+ <!--
<compile-mxml example="/spark/fxg/BitmapImageExample"/>
<compile-mxml example="/spark/fxg/EclipseExample"/>
<compile-mxml example="/spark/fxg/LineExample"/>
<compile-mxml example="/spark/fxg/RectExample"/>
<compile-mxml example="/spark/fxg/RichTextExample"/>
+ -->
<compile-mxml example="/spark/containers/SampleHGroup"/>
<compile-mxml example="/spark/containers/SampleVGroup"/>
+ <!--
<compile-mxml example="/spark/containers/SampleVerticalHorizontalAlign"/>
<compile-mxml example="/spark/containers/SkinnableDataContainerExample"/>
+ -->
<compile-mxml example="/spark/containers/TileGroupExample"/>
+ <!--
<compile-mxml example="/spark/effects/Move3DExample"/>
<compile-mxml example="/spark/effects/WipeExample"/>
- <!--
<compile-mxml example="/spark/charts/AreaChartExample"/>
<compile-mxml example="/spark/charts/BarChartExample"/>
<compile-mxml example="/spark/charts/BubbleChartExample"/>
@@ -373,7 +385,6 @@
<compile-mxml example="/spark/charts/SeriesInterpolateExample"/>
<compile-mxml example="/spark/charts/SeriesSlideExample"/>
<compile-mxml example="/spark/charts/SeriesZoomExample"/>
- -->
<compile-mxml example="/spark/components/SearchExample"/>
<compile-mxml example="/spark/components/VideoPlayerExample"/>
@@ -414,11 +425,13 @@
<compile-mxml example="/spark/modules/ModuleExample"/>
<compile-mxml example="/spark/modules/Module1"/>
<compile-mxml example="/spark/modules/Module2"/>
+ -->
<!-- currently broken <compile-mxml example="/spark/tlf/TextLayoutEditorSample"/> -->
</target>
<target name="compile-spark2" description="compile second set of spark examples">
+ <!--
<compile-mxml example="/spark/i18n/SparkCollatorExample"/>
<compile-mxml example="/spark/i18n/SparkCollator2Example"/>
<compile-mxml example="/spark/i18n/SparkCurrencyValidatorExample"/>
@@ -452,9 +465,11 @@
<compile-mxml example="/spark/controls/SampleStackedFormExample"/>
<compile-mxml example="/spark/controls/OSMFExample"/>
+ -->
</target>
<target name="compile-spark3" description="compile third set of spark examples">
+ <!--
<compile-mxml example="/spark/other/BidirectionalBinding1Example"/>
<compile-mxml example="/spark/other/BidirectionalBinding2Example"/>
<compile-mxml example="/spark/other/ControllingViewportExample"/>
@@ -480,36 +495,42 @@
<compile-mxml example="/spark/skinning/SkinningApplication3Example"/>
<compile-mxml example="/spark/skinning/SkinningContainerExample"/>
<compile-mxml example="/spark/css/CSSIDSelectorExample"/>
+ -->
<compile-mxml example="/spark/controls/ButtonExample"/>
<!--
<compile-mxml example="/spark/controls/ButtonBarExample"/>
- -->
<compile-mxml example="/spark/controls/PopUpAnchor1Example"/>
<compile-mxml example="/spark/controls/PopUpAnchor2Example"/>
+ -->
<compile-mxml example="/spark/controls/ToggleButtonExample"/>
<compile-mxml example="/spark/controls/CheckboxExample"/>
<compile-mxml example="/spark/controls/DropdownExample"/>
<compile-mxml example="/spark/controls/NumericStepperExample"/>
<compile-mxml example="/spark/controls/RadioButtonExample"/>
<compile-mxml example="/spark/controls/ToggleButton2Example"/>
+ <!--
<compile-mxml example="/spark/controls/ScrollBarExample"/>
<compile-mxml example="/spark/controls/Scroller1Example"/>
<compile-mxml example="/spark/controls/Scroller2Example"/>
<compile-mxml example="/spark/controls/SliderExample"/>
<compile-mxml example="/spark/controls/SpinnerExample"/>
<compile-mxml example="/spark/controls/VideoPlayerExample"/>
+ -->
<compile-mxml example="/spark/controls/ListExample"/>
</target>
<target name="compile-apache" description="compile apache examples">
+ <!--
<compile-mxml example="/apache/ApacheFlex4_8_0"/>
<compile-mxml example="/apache/ApacheFlex4_9_0"/>
<compile-mxml example="/apache/ApacheFlex4_10_0"/>
<compile-mxml example="/apache/ApacheFlex4_11_0"/>
<compile-mxml example="/apache/ApacheFlex4_12_1"/>
<compile-mxml example="/apache/ApacheFlex4_13_0"/>
+ -->
<!-- <compile-mxml example="/apache/ApacheFlex4_13_0"/> -->
+ <!--
<compile-mxml example="/apache/formatters/PostCodeFormatterExample"/>
<compile-mxml example="/apache/validators/PostCodeValidatorExample"/>
<compile-mxml-locales example="/apache/i18n/LocaleExample"/>
@@ -520,6 +541,7 @@
<compile-mxml example="/apache/i18n/NumericStepperExample"/>
<compile-mxml example="/apache/containers/CalloutExample"/>
<compile-mxml example="/apache/controls/MaskedTextInputExample"/>
+ -->
<!-- Uncomment when Flex 4.14 is released -->
<!-- compile-mxml example="/apache/controls/SparkRichTextEditorExample"/-->
diff --git a/examples/mxroyale/tourdeflexmodules/src/explorer.xml b/examples/mxroyale/tourdeflexmodules/src/explorer.xml
index 03ef158..959872a 100755
--- a/examples/mxroyale/tourdeflexmodules/src/explorer.xml
+++ b/examples/mxroyale/tourdeflexmodules/src/explorer.xml
@@ -248,6 +248,7 @@
</node>
<node label="Spark Framework Components">
<node label="Techniques and Examples">
+ <!--
<node label="Advanced CSS">
<node label="Descendant Selector" module="spark/css/CSSDescendantSelectorExample" />
<node label="ID Selector" module="spark/css/CSSIDSelectorExample" />
@@ -261,6 +262,7 @@
<node label="Busy Cursor" module="spark/other/Cursor1Example" />
<node label="Custom Cursor" module="spark/other/Cursor2Example" />
</node>
+ -->
<!-- Require remote service to work
<node label="DataGrid">
<node label="DataGrid" module="spark/controls/DataGridExample2"/>
@@ -275,6 +277,7 @@
<node label="Data Paging" module="spark/controls/ListDataPagingExample" />
</node>
-->
+ <!--
<node label="Drag and Drop">
<node label="List to List" module="spark/other/DragAndDrop1Example" />
<node label="List to Panel" module="spark/other/DragAndDrop2Example" />
@@ -301,11 +304,13 @@
<node label="String Tools" module="spark/i18n/SparkStringToolsExample"/>
<node label="Formatters" module="spark/i18n/SparkFormatterExample"/>
</node>
+ -->
<node label="Item Renderers">
<node label="List" module="spark/itemRenderers/ListItemRendererExample" src="spark/itemRenderers/MyListItemRenderer.mxml"/>
<node label="Scale Image" module="spark/itemRenderers/ItemRenderer1Example" src="spark/itemRenderers/renderers/ImageRenderer1.mxml" />
<node label="3D Rotate" module="spark/itemRenderers/ItemRenderer2Example" src="spark/itemRenderers/renderers/ImageRenderer2.mxml" />
</node>
+ <!--
<node label="Events">
<node label="Inline property" module="spark/events/EventExample1" />
<node label="Inline block" module="spark/events/EventExample2" />
@@ -323,14 +328,12 @@
<node label="Modules">
<node label="Load" module="spark/modules/ModuleExample" />
</node>
- <!--
<node label="Repeater">
<node label="Repeater" module="spark/other/RepeaterExample" />
</node>
<node label="ScrollBars">
<node label="ScrollBars" module="spark/other/ScrollBarsExample" />
</node>
- -->
<node label="Skinning">
<node label="Button With Icon" module="spark/skinning/ButtonWithIconExample" src="spark/skinning/skins/CloseButtonSkin.mxml&spark/skinning/skins/AddButtonSkin.mxml&spark/skinning/skins/IconTextButtonSkin.mxml" />
<node label="Gradient Skin" module="spark/skinning/SkinningApplication1Example" src="spark/skinning/skins/GradientBackgroundAppSkin.mxml"/>
@@ -341,7 +344,9 @@
<node label="Viewport">
<node label="Controlling Viewport" module="spark/other/ControllingViewportExample" />
</node>
+ -->
</node>
+ <!--
<node label="Effects and Filters">
<node label="Move 3D" module="spark/effects/Move3DExample" />
<node label="Filter" module="spark/other/FilterExample" />
@@ -355,26 +360,34 @@
<node label="Rotate 3D" module="spark/effects/Rotate3DExample" />
<node label="Scale 3D" module="spark/effects/Scale3DExample" />
</node>
+ -->
<node label="Visual Components">
<node label="Containers">
<!--
<node label="Accordion" module="spark/controls/AccordionExample" />
- -->
<node label="Border" module="spark/containers/BorderExample"/>
+ -->
<node label="DataGroup" module="spark/controls/DataGroupExample" />
<node label="Form" module="spark/controls/FormExample" />
<node label="HGroup" module="spark/containers/SampleHGroup" />
<node label="Group" module="spark/containers/GroupExample"/>
<node label="Panel" module="spark/containers/PanelExample"/>
+ <!--
<node label="SkinnableDataContainer" module="spark/containers/SkinnableDataContainerExample" />
<node label="TabNavigator" module="spark/containers/TabNavigator1Example" />
<node label="TabNavigator" module="spark/containers/TabNavigator2Example" />
+ -->
<node label="TileGroup" module="spark/containers/TileGroupExample" />
<node label="TitleWindow" module="spark/controls/TitleWindowExample" />
+ <!--
<node label="ViewStack" module="spark/controls/ViewStackExample" />
+ -->
<node label="VGroup" module="spark/containers/SampleVGroup" />
+ <!--
<node label="Vertical Horizontal Align" module="spark/containers/SampleVerticalHorizontalAlign" />
+ -->
</node>
+ <!--
<node label="Graphics and FXG">
<node label="Drop Shadow" module="spark/fxg/DropShadowGraphicExample" />
<node label="Image" module="spark/fxg/BitmapImageExample" />
@@ -386,73 +399,90 @@
<node label="RichText" module="spark/fxg/RichTextExample" />
<node label="Static FXG" module="spark/fxg/StaticFXGExample" />
</node>
+ -->
<node label="General Controls">
+ <!--
<node label="AdvancedDataGrid" module="spark/controls/AdvancedDatagridExample" />
+ -->
<node label="Checkbox" module="spark/controls/CheckboxExample"/>
+ <!--
<node label="ColorPicker" module="spark/controls/ColorPickerExample" />
+ -->
<node label="ComboBox" module="spark/controls/ComboBoxExample" />
<node label="DropDown" module="spark/controls/DropdownExample"/>
<node label="DataGrid" module="spark/controls/DataGridExample" />
<node label="Image" module="spark/controls/ImageExample" />
<node label="List" module="spark/controls/ListExample" />
+ <!--
<node label="Menu" module="spark/controls/MenuExample" />
<node label="NumericStepper" module="spark/controls/NumericStepperExample"/>
<node label="OLAPDataGrid" module="spark/controls/OLAPDataGridExample" />
<node label="ProgressBar" module="spark/controls/ProgressBarExample" />
+ -->
<node label="RadioButton" module="spark/controls/RadioButtonExample"/>
<!--
<node label="ScrollBar" module="spark/controls/ScrollBarExample" />
<node label="Scroller" module="spark/controls/Scroller1Example"/>
<node label="Scroller and Tabbing" module="spark/controls/Scroller2Example"/>
- -->
<node label="Slider" module="spark/controls/SliderExample"/>
<node label="Spinner" module="spark/controls/SpinnerExample"/>
+ -->
<!-- Removed to avoid putting swf in repo
<node label="SWFloader" module="spark/controls/SWFLoaderExample" />
-->
+ <!--
<node label="ToolTip" module="spark/controls/ToolTipExample" />
<node label="Tree" module="spark/controls/TreeExample" />
<node label="VideoDisplay" module="spark/controls/VideoDisplayExample" />
+ -->
<!-- Removed as it's using an external asset they may not work any more
<node label="VideoDisplay" module="spark/controls/OSMFExample" />
-->
+ <!--
<node label="VideoPlayer" module="spark/controls/VideoPlayerExample" />
- </node>
+ -->
+ </node>
<node label="Button Controls">
<node label="Button" module="spark/controls/ButtonExample"/>
<!--
<node label="ButtonBar" module="spark/controls/ButtonBarExample"/>
- -->
<node label="LinkBar" module="spark/controls/LinkBarExample" />
<node label="LinkButton" module="spark/controls/LinkButtonExample" />
<node label="PopUpButton" module="spark/controls/PopupButtonExample" />
<node label="PopUpAnchor" module="spark/controls/PopUpAnchor1Example"/>
<node label="PopUpAnchor" module="spark/controls/PopUpAnchor2Example"/>
<node label="ToggleButton" module="spark/controls/ToggleButtonExample"/>
+ -->
<node label="ToggleButtonBar" module="spark/controls/ToggleButtonBarExample" />
</node>
+ <!--
<node label="Date Controls">
<node label="DateChooser" module="spark/controls/DateChooserExample" />
<node label="DateField" module="spark/controls/DateFieldExample" />
</node>
+ -->
<node label="Text Controls">
<node label="RichEditableText" module="spark/controls/RichEditableTextExample" />
<node label="TextArea" module="spark/controls/TextAreaExample" />
<node label="TextInput" module="spark/controls/TextInputExample" />
+ <!--
<node label="Sample Layout" module="spark/controls/TextLayout1Example" />
<node label="News Layout" module="spark/controls/TextLayout2Example" />
<node label="Text Controls" module="spark/controls/TextLayout3Example" />
<node label="Import Format Types" module="spark/controls/TextLayout4Example" />
+ -->
<!-- Doesn't comile with current version of TLF
<node label="Text Layout Editor" module="spark/tlf/TextLayoutEditorSample" />
-->
</node>
+ <!--
<node label="Layouts">
<node label="Animated" module="spark/layouts/CustomLayoutAnimatedExample" />
<node label="Baseline" module="spark/layouts/CustomLayoutHBaselineExample" />
<node label="Image Wheel" module="spark/layouts/CustomLayoutFlickrWheelExample" />
<node label="Text Flow" module="spark/layouts/CustomLayoutFlowExample" />
</node>
+ -->
</node>
<!--
<node label="Charts">
@@ -469,7 +499,6 @@
<node label="SeriesSlide" module="spark/charts/SeriesSlideExample" />
<node label="SeriesZoom" module="spark/charts/SeriesZoomExample" />
</node>
- -->
<node label="Validators and Formatters">
<node label="Validators">
<node label="CreditCardValidator" module="spark/validators/CreditCardValidatorExample" />
@@ -492,19 +521,18 @@
<node label="ZipCodeFormatter" module="spark/formatters/ZipCodeFormatterExample" />
</node>
</node>
+ -->
</node>
+ <!--
<node label="Apache Flex Components and Features">
<node label="Apache Flex 4.8" module="apache/ApacheFlex4_8_0">
- <!-- Do we habe any examples here? -->
</node>
<node label="Apache Flex 4.9" module="apache/ApacheFlex4_9_0">
- <!-- Add more examples here -->
<node label="PostCodeFormatter" module="apache/formatters/PostCodeFormatterExample"/>
<node label="PostCodeValidator" module="apache/validators/PostCodeValidatorExample"/>
<node label="New SDK locales" module="apache/i18n/LocaleExample"/>
</node>
<node label="Apache Flex 4.10" module="apache/ApacheFlex4_10_0">
- <!-- Add more examples here -->
<node label="International Dates" module="apache/i18n/DateExample"/>
<node label="Millisecond Formatting" module="apache/i18n/MillisecondExample"/>
<node label="NumberStepper" module="apache/i18n/NumericStepperExample"/>
@@ -512,15 +540,12 @@
<node label="Timezone Formatting" module="apache/i18n/TimeZoneExample"/>
</node>
<node label="Apache Flex 4.11" module="apache/ApacheFlex4_11_0">
- <!-- Add more examples here -->
<node label="Callout" module="apache/containers/CalloutExample"/>
</node>
<node label="Apache Flex 4.12" module="apache/ApacheFlex4_12_1">
- <!-- Add more examples here -->
<node label="MaskedTextInput" module="apache/controls/MaskedTextInputExample"/>
</node>
<node label="Apache Flex 4.13" module="apache/ApacheFlex4_13_0">
- <!-- Add examples here -->
</node>
<node label="Apache Flex 4.14" module="apache/ApacheFlex4_14_0">
<node label="MaskedTextInput" module="apache/controls/SparkRichTextEditorExample"/>
@@ -530,5 +555,6 @@
<node label="Spark Spelling Example" module="apache/squiggly/SpellingExExample"/>
</node>
</node>
+ -->
</node>
</compTree>
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/containers/TileGroupExample.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/containers/TileGroupExample.mxml
index 17a512a..04450dd 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/containers/TileGroupExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/containers/TileGroupExample.mxml
@@ -65,7 +65,8 @@
<s:VGroup top="10" left="10">
<s:HGroup verticalAlign="middle">
<s:Label text="Orientation:"/>
- <s:DropDownList id="orientation" dataProvider="{new ArrayList(orientArray)}" prompt="columns"/>
+ <!--<s:DropDownList id="orientation" dataProvider="{new ArrayList(orientArray)}" prompt="columns"/>-->
+ <s:DropDownList id="orientation" dataProvider="{new ArrayList(orientArray)}"/>
</s:HGroup>
<s:HGroup verticalAlign="middle">
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/controls/ButtonExample.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/controls/ButtonExample.mxml
index 553270c..a3e254a 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/controls/ButtonExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/controls/ButtonExample.mxml
@@ -23,7 +23,7 @@
<fx:Script>
<![CDATA[
- import flash.events.Event;
+ import org.apache.royale.events.Event;
protected function buttonClickHandler(event:Event):void
{
@@ -49,9 +49,11 @@ component looks like it can be pressed. The default skin has a text label."/>
click="buttonClickHandler(event)"
fontWeight="normal"/>
<s:Button id="disabledBtn" label="Disabled Button" enabled="false"/>
+ <!--
<s:Button id="repeatBtn" label="Repeat Button"
buttonDown="buttonClickHandler(event)"
autoRepeat="true"/>
+ -->
<s:Label verticalAlign="justify"
text="Hold down on repeat button to see autoRepeat behavior."/>
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/controls/CheckboxExample.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/controls/CheckboxExample.mxml
index b0a9449..9712698 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/controls/CheckboxExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/controls/CheckboxExample.mxml
@@ -36,15 +36,17 @@
totalCost -= 0.25;
}
// Format the totalCost and then display it in a label.
- totalString.text = usdFormatter.format(totalCost);
+ totalString.text = /*usdFormatter.format(*/totalCost/*);*/.toString();
}
]]>
</fx:Script>
<fx:Declarations>
+ <!--
<mx:CurrencyFormatter id="usdFormatter" precision="2" currencySymbol="$"
decimalSeparatorFrom="." decimalSeparatorTo="."
useNegativeSign="true"
useThousandsSeparator="true" alignSymbol="left"/>
+ -->
</fx:Declarations>
<s:Panel title="CheckBox Sample" width="100%" height="100%">
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/controls/DataGroupExample.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/controls/DataGroupExample.mxml
index e5f3386..bcd4633 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/controls/DataGroupExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/controls/DataGroupExample.mxml
@@ -88,6 +88,7 @@
]]>
</fx:Script>
+ <!--
<s:transitions>
<mx:Transition fromState="normal" toState="hovered">
<s:Animate target="{flightPlan}" duration="200">
@@ -100,7 +101,7 @@
</s:Animate>
</mx:Transition>
</s:transitions>
-
+ -->
<s:Rect left="0" right="0" top="0" bottom="0" radiusX="5" radiusY="5">
<s:fill>
<s:SolidColor color="#E1ECF4" />
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/controls/DropdownExample.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/controls/DropdownExample.mxml
index 1433965..b4158f9 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/controls/DropdownExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/controls/DropdownExample.mxml
@@ -52,7 +52,7 @@
private function handleDepartmentSelected(event:IndexChangeEvent):void
{
- list2.prompt="Select Item";
+ //list2.prompt="Select Item";
list2.selectedIndex=-1; // reset so prompt shows
if (list1.selectedIndex==0)
list2.dataProvider=elecItems;
@@ -70,11 +70,14 @@
<s:VGroup width="100%" height="100%" left="120" top="5">
<s:Label text="RJ's Warehouse Price Checker" fontSize="18" />
- <s:DropDownList id="list1" width="50%" dataProvider="{depts}" labelField="label"
+ <!--<s:DropDownList id="list1" width="50%" dataProvider="{depts}" labelField="label"
prompt="Select Category"
- change="handleDepartmentSelected(event)"/>
+ change="handleDepartmentSelected(event)"/>-->
+ <s:DropDownList id="list1" width="50%" dataProvider="{depts}" labelField="label"
+ change="handleDepartmentSelected(event)"/>
<s:Label id="text2"/>
- <s:DropDownList id="list2" width="50%" labelField="label" prompt="None"/>
+ <!--<s:DropDownList id="list2" width="50%" labelField="label" prompt="None"/>-->
+ <s:DropDownList id="list2" width="50%" labelField="label"/>
<mx:Spacer height="10"/>
<s:Label fontSize="14" color="0x336699" text="The price of item: {list2.selectedItem.label} is: ${list1.selectedItem.data}" verticalAlign="bottom"/>
</s:VGroup>
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/controls/ListExample.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/controls/ListExample.mxml
index ab492dd..997eef5 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/controls/ListExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/controls/ListExample.mxml
@@ -37,15 +37,16 @@
}
protected function buyBtn_clickHandler(event:MouseEvent):void
{
- txtResponse.text="Thank you for your order totaling: " + usdFormatter.format(totalPrice) + "\nItems will ship in 3 days.";
+ txtResponse.text="Thank you for your order totaling: " + /*usdFormatter.format(totalPrice)*/totalPrice.toString() + "\nItems will ship in 3 days.";
}
]]>
</fx:Script>
<fx:Declarations>
+ <!--
<mx:CurrencyFormatter id="usdFormatter" precision="2" currencySymbol="$"
decimalSeparatorFrom="." decimalSeparatorTo="." useNegativeSign="true"
- useThousandsSeparator="true" alignSymbol="left"/>
+ useThousandsSeparator="true" alignSymbol="left"/>-->
</fx:Declarations>
<fx:Style>
@namespace "library://ns.apache.org/royale/spark";
@@ -84,7 +85,8 @@
color="0xAE0A0A" fontWeight="bold"/>
<s:VGroup>
<mx:Spacer height="10"/>
- <s:Label text="Total of Items selected: {usdFormatter.format(this.totalPrice)}"/>
+ <!--<s:Label text="Total of Items selected: {usdFormatter.format(this.totalPrice)}"/>-->
+ <s:Label text="Total of Items selected: {totalPrice}"/>
<s:Button id="buyBtn" horizontalCenter="0" bottom="30" label="Buy Now!"
fontWeight="bold"
click="buyBtn_clickHandler(event)"/>
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/controls/NumericStepperExample.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/controls/NumericStepperExample.mxml
index 7a831c5..d8aa032 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/controls/NumericStepperExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/controls/NumericStepperExample.mxml
@@ -60,13 +60,16 @@ for stepping through the valid values. You can use the Up Arrow and Down arrow k
<mx:Form>
<mx:FormHeading id="formHead" label="Welcome to Ticket Grabber!"/>
<mx:FormItem label="Name:">
- <s:TextInput id="nameTxt" widthInChars="20"/>
+ <!--<s:TextInput id="nameTxt" widthInChars="20"/>-->
+ <s:TextInput id="nameTxt" />
</mx:FormItem>
<mx:FormItem label="Address:">
- <s:TextArea widthInChars="20" heightInLines="2"/>
+ <!--<s:TextArea widthInChars="20" heightInLines="2"/>-->
+ <s:TextArea />
</mx:FormItem>
<mx:FormItem label="Phone:">
- <s:TextInput id="phoneTxt" widthInChars="20"/>
+ <!--<s:TextInput id="phoneTxt" widthInChars="20"/>-->
+ <s:TextInput id="phoneTxt"/>
</mx:FormItem>
<mx:FormItem label="Select # of tickets:">
<s:NumericStepper id="numStepper" width="55"
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/controls/RichEditableTextExample.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/controls/RichEditableTextExample.mxml
index 0f02b85..260234f 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/controls/RichEditableTextExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/controls/RichEditableTextExample.mxml
@@ -20,15 +20,15 @@
<s:Module xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:s="library://ns.apache.org/royale/spark"
xmlns:mx="library://ns.apache.org/royale/mx"
- preinitialize="init()">
+ initialize="init()">
<!-- Based on samples from Peter DeHaan's blog: http://blog.flexexamples.com/ -->
<fx:Script>
- import flashx.textLayout.elements.Configuration;
- import flashx.textLayout.elements.TextFlow;
- import flashx.textLayout.formats.TextDecoration;
- import flashx.textLayout.formats.TextLayoutFormat;
+ import org.apache.royale.textLayout.elements.Configuration;
+ import org.apache.royale.textLayout.elements.TextFlow;
+ import org.apache.royale.textLayout.formats.TextDecoration;
+ import org.apache.royale.textLayout.formats.TextLayoutFormat;
import spark.events.TextOperationEvent;
@@ -36,11 +36,14 @@
protected static var lineCount:uint = 0;
protected function richEdTxt_changeHandler(evt:TextOperationEvent):void {
+ /*
lineCount = richEdTxt.mx_internal::textContainerManager.numLines;
lineCnt.text = lineCount.toString();
+ */
}
protected function init():void {
+ /*
var cfg:Configuration = TextFlow.defaultConfiguration;
var normalTLF:TextLayoutFormat = new TextLayoutFormat(cfg.defaultLinkNormalFormat);
@@ -57,6 +60,7 @@
cfg.defaultLinkHoverFormat = hoverTLF;
cfg.defaultLinkActiveFormat = activeTLF;
TextFlow.defaultConfiguration = cfg;
+ */
}
</fx:Script>
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/controls/TextAreaExample.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/controls/TextAreaExample.mxml
index ccadd30..56b699c 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/controls/TextAreaExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/controls/TextAreaExample.mxml
@@ -45,7 +45,8 @@
</s:HGroup>
<s:HGroup verticalAlign="middle">
<s:Label text="Specify Text Alignment:"/>
- <s:DropDownList id="alignVal" prompt="left" change="this.changeHandler()">
+ <!--<s:DropDownList id="alignVal" prompt="left" change="this.changeHandler()">-->
+ <s:DropDownList id="alignVal" change="this.changeHandler()">
<s:dataProvider>
<mx:ArrayList>
<fx:String>left</fx:String>
@@ -60,7 +61,8 @@
</s:HGroup>
<s:HGroup verticalAlign="middle">
<s:Label text="Direction:"/>
- <s:DropDownList id="direction" prompt="ltr" change="this.changeHandler()">
+ <!--<s:DropDownList id="direction" prompt="ltr" change="this.changeHandler()">-->
+ <s:DropDownList id="direction" change="this.changeHandler()">
<s:dataProvider>
<mx:ArrayList>
<fx:String>ltr</fx:String>
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/controls/TextInputExample.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/controls/TextInputExample.mxml
index 5a443b5..2bf5613 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/controls/TextInputExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/controls/TextInputExample.mxml
@@ -36,8 +36,10 @@
{
txt.maxChars = this.maxChars.value;
txt.restrict = this.restrictStr.text;
+ /*
RichEditableText(txt.textDisplay).textFlow.textAlign = alignVal.selectedItem;
RichEditableText(txt.textDisplay).textFlow.direction = direction.selectedItem;
+ */
}
]]>
@@ -55,7 +57,8 @@
</s:HGroup>
<s:HGroup verticalAlign="middle">
<s:Label text="Specify Text Alignment:"/>
- <s:DropDownList id="alignVal" prompt="left" change="this.changeHandler(null)">
+ <!--<s:DropDownList id="alignVal" prompt="left" change="this.changeHandler(null)">-->
+ <s:DropDownList id="alignVal" change="this.changeHandler(null)">
<s:dataProvider>
<mx:ArrayList>
<fx:String>left</fx:String>
@@ -70,7 +73,8 @@
</s:HGroup>
<s:HGroup verticalAlign="middle">
<s:Label text="Direction:"/>
- <s:DropDownList id="direction" prompt="ltr" change="this.changeHandler(null)">
+ <!--<s:DropDownList id="direction" prompt="ltr" change="this.changeHandler(null)">-->
+ <s:DropDownList id="direction" change="this.changeHandler(null)">
<s:dataProvider>
<mx:ArrayList>
<fx:String>rtl</fx:String>
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/controls/TextLayout1Example.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/controls/TextLayout1Example.mxml
index 243e136..b93ec04 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/controls/TextLayout1Example.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/controls/TextLayout1Example.mxml
@@ -28,20 +28,20 @@
<fx:Script>
<![CDATA[
- import flashx.textLayout.container.ContainerController;
- import flashx.textLayout.conversion.ITextImporter;
- import flashx.textLayout.conversion.TextConverter;
- import flashx.textLayout.edit.EditManager;
- import flashx.textLayout.edit.ISelectionManager;
- import flashx.textLayout.edit.SelectionState;
- import flashx.textLayout.elements.InlineGraphicElement;
- import flashx.textLayout.elements.ParagraphElement;
- import flashx.textLayout.elements.TextFlow;
- import flashx.textLayout.events.SelectionEvent;
- import flashx.textLayout.events.StatusChangeEvent;
- import flashx.textLayout.formats.Direction;
- import flashx.textLayout.formats.TextLayoutFormat;
- import flashx.undo.UndoManager;
+ import org.apache.royale.textLayout.container.ContainerController;
+ import org.apache.royale.textLayout.conversion.ITextImporter;
+ import org.apache.royale.textLayout.conversion.TextConverter;
+ import org.apache.royale.textLayout.edit.EditManager;
+ import org.apache.royale.textLayout.edit.ISelectionManager;
+ import org.apache.royale.textLayout.edit.SelectionState;
+ import org.apache.royale.textLayout.elements.InlineGraphicElement;
+ import org.apache.royale.textLayout.elements.ParagraphElement;
+ import org.apache.royale.textLayout.elements.TextFlow;
+ import org.apache.royale.textLayout.events.SelectionEvent;
+ import org.apache.royale.textLayout.events.StatusChangeEvent;
+ import org.apache.royale.textLayout.formats.Direction;
+ import org.apache.royale.textLayout.formats.TextLayoutFormat;
+ //import flashx.undo.UndoManager;
import mx.collections.ArrayCollection;
import mx.controls.CheckBox;
@@ -59,9 +59,8 @@
]
);
- [Embed(source="assets/ApacheFlexLogo.png")]
[Bindable]
- static public var imgClass:Class;
+ static public var imgClass:String = "assets/ApacheFlexLogo.png";
private var _textContainer:SpriteVisualElement = null;
@@ -98,7 +97,7 @@
_textFlow.addChild(p);
//adding Select/Edit/Copy/Paste/Undo features
- _textFlow.interactionManager = new EditManager(new UndoManager());
+ _textFlow.interactionManager = new EditManager(/*new UndoManager()*/);
// initialize with a selection before the first character
_textFlow.interactionManager.selectRange(0,0);
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/itemRenderers/ItemRenderer1Example.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/itemRenderers/ItemRenderer1Example.mxml
index 6d49691..d2f8c8b 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/itemRenderers/ItemRenderer1Example.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/itemRenderers/ItemRenderer1Example.mxml
@@ -30,8 +30,8 @@
[Bindable]
private var employees:XMLListCollection;
- [Embed(source="data/list.xml", mimeType="application/octet-stream")]
- private var XMLData:Class;
+ [Embed(source="data/list.xml", mimeType="text/plain")]
+ private var XMLData:String;
private function init():void
{
[royale-asjs] 05/05: more errors fixed now that SWF compile reports
more errors
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 7d5e10c1bf26531fec5589c52ff5dc22aadca265
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Sep 10 16:17:46 2018 -0700
more errors fixed now that SWF compile reports more errors
---
.../tourdeflexmodules/src/mx/containers/SimpleControlBarExample.mxml | 2 +-
.../mxroyale/tourdeflexmodules/src/mx/containers/TitleWindowApp.mxml | 5 +++--
.../mxroyale/tourdeflexmodules/src/mx/controls/ButtonExample.mxml | 4 ++--
examples/mxroyale/tourdeflexmodules/src/mx/controls/SimpleAlert.mxml | 5 +++--
examples/mxroyale/tourdeflexmodules/src/mx/controls/SimpleImage.mxml | 2 +-
.../mxroyale/tourdeflexmodules/src/mx/controls/SpacerExample.mxml | 4 ++--
.../mxroyale/tourdeflexmodules/src/mx/effects/GlowEffectExample.mxml | 2 +-
.../mxroyale/tourdeflexmodules/src/mx/effects/MoveEffectExample.mxml | 2 +-
.../tourdeflexmodules/src/mx/effects/ParallelEffectExample.mxml | 2 +-
.../tourdeflexmodules/src/mx/effects/ResizeEffectExample.mxml | 2 +-
.../mxroyale/tourdeflexmodules/src/spark/controls/ButtonExample.mxml | 4 ++--
.../tourdeflexmodules/src/spark/controls/TitleWindowExample.mxml | 5 +++--
.../src/spark/itemRenderers/ItemRenderer2Example.mxml | 4 ++--
13 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/examples/mxroyale/tourdeflexmodules/src/mx/containers/SimpleControlBarExample.mxml b/examples/mxroyale/tourdeflexmodules/src/mx/containers/SimpleControlBarExample.mxml
index 7340395..ea436d3 100755
--- a/examples/mxroyale/tourdeflexmodules/src/mx/containers/SimpleControlBarExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/mx/containers/SimpleControlBarExample.mxml
@@ -27,7 +27,7 @@
<mx:HBox width="100%" height="100%">
<!-- Area for your catalog. -->
- <mx:Image source="@Embed(source='assets/ApacheFlexLogo.png')" width="50%" height="100%"/>
+ <mx:Image source="assets/ApacheFlexLogo.png" width="50%" height="100%"/>
<mx:Text width="50%"
text="The ControlBar container in this example adds a Label, NumericStepper, Spacer, and Button control to the bottom of the Panel container."/>
</mx:HBox>
diff --git a/examples/mxroyale/tourdeflexmodules/src/mx/containers/TitleWindowApp.mxml b/examples/mxroyale/tourdeflexmodules/src/mx/containers/TitleWindowApp.mxml
index 6a02c1b..aa20598 100755
--- a/examples/mxroyale/tourdeflexmodules/src/mx/containers/TitleWindowApp.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/mx/containers/TitleWindowApp.mxml
@@ -26,7 +26,8 @@
import mx.managers.PopUpManager;
import mx.containers.TitleWindow;
- import flash.geom.Point;
+ import org.apache.royale.geom.Point;
+ import org.apache.royale.utils.PointUtils;
private var point1:Point = new Point();
@@ -41,7 +42,7 @@
// Position it 25 pixels down and to the right of the Button control.
point1.x=0;
point1.y=0;
- point1=myButton.localToGlobal(point1);
+ point1=PointUtils.localToGlobal(point1, myButton);
login.x=point1.x+25;
login.y=point1.y+25;
diff --git a/examples/mxroyale/tourdeflexmodules/src/mx/controls/ButtonExample.mxml b/examples/mxroyale/tourdeflexmodules/src/mx/controls/ButtonExample.mxml
index db26951..6a61f22 100755
--- a/examples/mxroyale/tourdeflexmodules/src/mx/controls/ButtonExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/mx/controls/ButtonExample.mxml
@@ -24,11 +24,11 @@
<fx:Script>
<![CDATA[
- import org.apache.royale.events.Event;
+ import org.apache.royale.events.MouseEvent;
// Event handler function to print a message
// describing the selected Button control.
- private function printMessage(event:Event):void {
+ private function printMessage(event:MouseEvent):void {
message.text += event.target.label + " pressed" + "\n";
}
diff --git a/examples/mxroyale/tourdeflexmodules/src/mx/controls/SimpleAlert.mxml b/examples/mxroyale/tourdeflexmodules/src/mx/controls/SimpleAlert.mxml
index 2e66589..97f4801 100755
--- a/examples/mxroyale/tourdeflexmodules/src/mx/controls/SimpleAlert.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/mx/controls/SimpleAlert.mxml
@@ -25,10 +25,11 @@
<![CDATA[
import mx.controls.Alert;
import org.apache.royale.events.CloseEvent;
+ import org.apache.royale.events.MouseEvent;
// Event handler function uses a static method to show
// a pop-up window with the title, message, and requested buttons.
- private function clickHandler(event:Event):void {
+ private function clickHandler(event:MouseEvent):void {
Alert.show("Do you want to save your changes?", "Save Changes", 3, this, alertClickHandler);
}
@@ -43,7 +44,7 @@
// Event handler function changes the default Button labels and sets the
// Button widths. If you later use an Alert with the default Buttons,
// you must reset these values.
- private function secondClickHandler(event:Event):void {
+ private function secondClickHandler(event:MouseEvent):void {
/*
Alert.buttonWidth = 100;
Alert.yesLabel = "Magenta";
diff --git a/examples/mxroyale/tourdeflexmodules/src/mx/controls/SimpleImage.mxml b/examples/mxroyale/tourdeflexmodules/src/mx/controls/SimpleImage.mxml
index 7ccc8c9..0b8d9fd 100755
--- a/examples/mxroyale/tourdeflexmodules/src/mx/controls/SimpleImage.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/mx/controls/SimpleImage.mxml
@@ -26,7 +26,7 @@
height="100%" width="100%">
<mx:Label text="Image embedded in the application."/>
- <mx:Image source="@Embed('assets/ApacheFlexLogo.png')" width="50%" height="50%" />
+ <mx:Image source="assets/ApacheFlexLogo.png" width="50%" height="50%" />
</mx:Panel>
</mx:Module>
diff --git a/examples/mxroyale/tourdeflexmodules/src/mx/controls/SpacerExample.mxml b/examples/mxroyale/tourdeflexmodules/src/mx/controls/SpacerExample.mxml
index 8ccfb78..fb36dfa 100755
--- a/examples/mxroyale/tourdeflexmodules/src/mx/controls/SpacerExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/mx/controls/SpacerExample.mxml
@@ -29,9 +29,9 @@
text="The Spacer control pushes the second image to the right edge of the HBox container." />
<mx:HBox width="100%">
- <mx:Image source="@Embed('assets/ApacheFlexLogo.png')" width="50%" height="50%" />
+ <mx:Image source="assets/ApacheFlexLogo.png" width="50%" height="50%" />
<mx:Spacer width="100%"/>
- <mx:Image source="@Embed('assets/ApacheFlexLogo.png')" width="50%" height="50%" />
+ <mx:Image source="assets/ApacheFlexLogo.png" width="50%" height="50%" />
</mx:HBox>
</mx:Panel>
diff --git a/examples/mxroyale/tourdeflexmodules/src/mx/effects/GlowEffectExample.mxml b/examples/mxroyale/tourdeflexmodules/src/mx/effects/GlowEffectExample.mxml
index 9e1c70c..6877438 100755
--- a/examples/mxroyale/tourdeflexmodules/src/mx/effects/GlowEffectExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/mx/effects/GlowEffectExample.mxml
@@ -41,7 +41,7 @@
<mx:Text width="100%"
text="Click and hold the mouse on the image to see glowImage effect. Release the mouse to see unglowImage effect."/>
- <mx:Image source="@Embed(source='assets/ApacheFlexLogo.png')"
+ <mx:Image source="assets/ApacheFlexLogo.png"
width="50%" height="50%"
mouseDownEffect="{glowImage}"
mouseUpEffect="{unglowImage}"/>
diff --git a/examples/mxroyale/tourdeflexmodules/src/mx/effects/MoveEffectExample.mxml b/examples/mxroyale/tourdeflexmodules/src/mx/effects/MoveEffectExample.mxml
index 3276673..f6a2e1a 100755
--- a/examples/mxroyale/tourdeflexmodules/src/mx/effects/MoveEffectExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/mx/effects/MoveEffectExample.mxml
@@ -45,7 +45,7 @@
<mx:Canvas id="canvas" width="100%" height="100%" mouseDown="moveImage()">
- <mx:Image id="img" source="@Embed(source='assets/ApacheFlexLogo.png')"
+ <mx:Image id="img" source="assets/ApacheFlexLogo.png"
width="50%" height="50%"/>
</mx:Canvas>
diff --git a/examples/mxroyale/tourdeflexmodules/src/mx/effects/ParallelEffectExample.mxml b/examples/mxroyale/tourdeflexmodules/src/mx/effects/ParallelEffectExample.mxml
index 809dbd2..6adda31 100755
--- a/examples/mxroyale/tourdeflexmodules/src/mx/effects/ParallelEffectExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/mx/effects/ParallelEffectExample.mxml
@@ -42,7 +42,7 @@
<mx:Canvas id="canvas" width="100%" height="100%">
<mx:Image id="img" x="20" y="20" width="30" height="60"
- source="@Embed(source='assets/ApacheFlexLogo.png')"/>
+ source="assets/ApacheFlexLogo.png"/>
</mx:Canvas>
<mx:ControlBar>
diff --git a/examples/mxroyale/tourdeflexmodules/src/mx/effects/ResizeEffectExample.mxml b/examples/mxroyale/tourdeflexmodules/src/mx/effects/ResizeEffectExample.mxml
index 3d113ce..c244058 100755
--- a/examples/mxroyale/tourdeflexmodules/src/mx/effects/ResizeEffectExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/mx/effects/ResizeEffectExample.mxml
@@ -34,7 +34,7 @@
text="Use the Button controls to resize the image."/>
<mx:Image id="img" width="30" height="60"
- source="@Embed(source='assets/ApacheFlexLogo.png')"/>
+ source="assets/ApacheFlexLogo.png"/>
<mx:ControlBar>
<mx:Button label="Expand" click="expand.end(); expand.play()"/>
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/controls/ButtonExample.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/controls/ButtonExample.mxml
index a3e254a..d0dc92f 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/controls/ButtonExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/controls/ButtonExample.mxml
@@ -23,9 +23,9 @@
<fx:Script>
<![CDATA[
- import org.apache.royale.events.Event;
+ import org.apache.royale.events.MouseEvent;
- protected function buttonClickHandler(event:Event):void
+ protected function buttonClickHandler(event:MouseEvent):void
{
repeatText.text += event.target.label + " pressed!" + "\n";
}
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/controls/TitleWindowExample.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/controls/TitleWindowExample.mxml
index dee78e3..283cbe9 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/controls/TitleWindowExample.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/controls/TitleWindowExample.mxml
@@ -23,7 +23,8 @@
<fx:Script>
<![CDATA[
- import flash.geom.Point;
+ import org.apache.royale.geom.Point;
+ import org.apache.royale.utils.PointUtils;
import mx.containers.TitleWindow;
import mx.managers.PopUpManager;
@@ -43,7 +44,7 @@
// Calculate position of TitleWindow in Application's coordinates.
point1.x=myButton.x;
point1.y=myButton.y;
- point1=myButton.localToGlobal(point1);
+ point1=PointUtils.localToGlobal(point1, myButton);
login.x=point1.x+25;
login.y=point1.y+25;
diff --git a/examples/mxroyale/tourdeflexmodules/src/spark/itemRenderers/ItemRenderer2Example.mxml b/examples/mxroyale/tourdeflexmodules/src/spark/itemRenderers/ItemRenderer2Example.mxml
index 1d93d4c..a6034de 100644
--- a/examples/mxroyale/tourdeflexmodules/src/spark/itemRenderers/ItemRenderer2Example.mxml
+++ b/examples/mxroyale/tourdeflexmodules/src/spark/itemRenderers/ItemRenderer2Example.mxml
@@ -40,8 +40,8 @@
[Bindable]
private var employees:XMLListCollection;
- [Embed(source="data/list.xml", mimeType="application/octet-stream")]
- private var XMLData:Class;
+ [Embed(source="data/list.xml", mimeType="text/plain")]
+ private var XMLData:String;
private function init():void
{