UPDATED https://issues.apache.org/jira/browse/FLEX-33350 - updated asdoc for Callout related classes so that they don't appear with AIR icon - updated references to mobile only platform - removed broken image link in Callout asdoc
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/df8e5d1d Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/df8e5d1d Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/df8e5d1d Branch: refs/heads/release4.11.0 Commit: df8e5d1d3dc832c03c253f6eb63429d447740a4b Parents: 086add2 Author: mamsellem <[email protected]> Authored: Tue Oct 8 09:00:33 2013 +0200 Committer: mamsellem <[email protected]> Committed: Tue Oct 8 09:00:33 2013 +0200 ---------------------------------------------------------------------- .../src/spark/components/ArrowDirection.as | 6 +++++ .../spark/src/spark/components/Callout.as | 25 +++++++++++++------- .../spark/src/spark/components/CalloutButton.as | 16 ++++++++++++- .../src/spark/components/CalloutPosition.as | 7 ++++++ .../spark/src/spark/skins/spark/CalloutSkin.as | 1 + .../skins/spark/supportClasses/CalloutArrow.as | 1 + 6 files changed, 46 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/df8e5d1d/frameworks/projects/spark/src/spark/components/ArrowDirection.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/components/ArrowDirection.as b/frameworks/projects/spark/src/spark/components/ArrowDirection.as index 2ef7c4c..771ed3c 100644 --- a/frameworks/projects/spark/src/spark/components/ArrowDirection.as +++ b/frameworks/projects/spark/src/spark/components/ArrowDirection.as @@ -25,6 +25,7 @@ package spark.components * @see spark.components.Callout#arrowDirection * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -40,6 +41,7 @@ public class ArrowDirection * Arrow points right. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -49,6 +51,7 @@ public class ArrowDirection * Arrow points up. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -58,6 +61,7 @@ public class ArrowDirection * Arrow points left. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -67,6 +71,7 @@ public class ArrowDirection * Arrow points down. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -76,6 +81,7 @@ public class ArrowDirection * No arrow direciton. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/df8e5d1d/frameworks/projects/spark/src/spark/components/Callout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/components/Callout.as b/frameworks/projects/spark/src/spark/components/Callout.as index 85593dd..7b0d137 100644 --- a/frameworks/projects/spark/src/spark/components/Callout.as +++ b/frameworks/projects/spark/src/spark/components/Callout.as @@ -59,6 +59,7 @@ use namespace mx_internal; * @default ContentBackgroundAppearance.INSET * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -69,7 +70,7 @@ use namespace mx_internal; * @default 0 * * @langversion 3.0 - * @playerversion Flash 10 + * @playerversion Flash 11 * @playerversion AIR 3.8 * @productversion Flex 4.11 */ @@ -83,7 +84,7 @@ use namespace mx_internal; * @default NaN * * @langversion 3.0 - * @playerversion Flash 10 + * @playerversion Flash 11 * @playerversion AIR 3.8 * @productversion Flex 4.11 */ @@ -101,11 +102,6 @@ use namespace mx_internal; * Callout also adds an optional <code>arrow</code> skin part that visually * displays the direction toward the owner. * - * <p>The following image shows a Callout container labeled 'Settings':</p> - * - * <p> - * <img src="../../images/ca_calloutViewNav_ca.png" alt="Callout container" /> - * </p> * * <p>You can also use the CalloutButton control to open a callout container. * The CalloutButton control encapsulates in a single control the callout container @@ -160,7 +156,9 @@ use namespace mx_internal; * <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> - * <tr><td>Default skin class</td><td>spark.skins.mobile.CalloutSkin</td></tr> + * <tr><td>Default skin class</td> + * <td>spark.skins.mobile.CalloutSkin<br/> + * spark.skins.spark.CalloutSkin on desktops</td></tr> * </table> * * @mxml <p>The <code><s:Callout></code> tag inherits all of the tag @@ -185,7 +183,8 @@ use namespace mx_internal; * @includeExample examples/CalloutExample.mxml -noswf * * @langversion 3.0 - * @playerversion AIR 3 + * @playerversion Flash 11 + * * @playerversion AIR 3 * @productversion Flex 4.6 */ public class Callout extends SkinnablePopUpContainer @@ -209,6 +208,7 @@ public class Callout extends SkinnablePopUpContainer * Constructor. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -231,6 +231,7 @@ public class Callout extends SkinnablePopUpContainer * contentGroup. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -269,6 +270,7 @@ public class Callout extends SkinnablePopUpContainer * @see spark.components.CalloutPosition * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -308,6 +310,7 @@ public class Callout extends SkinnablePopUpContainer * the arrow position in <code>updateSkinDisplayList()</code>.</p> * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -346,6 +349,7 @@ public class Callout extends SkinnablePopUpContainer * @see spark.components.CalloutPosition * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -385,6 +389,7 @@ public class Callout extends SkinnablePopUpContainer * the arrow position in <code>updateSkinDisplayList()</code>.</p> * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -431,6 +436,7 @@ public class Callout extends SkinnablePopUpContainer * @see spark.components.ArrowDirection * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -852,6 +858,7 @@ public class Callout extends SkinnablePopUpContainer * share the same coordinate space.</p> * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/df8e5d1d/frameworks/projects/spark/src/spark/components/CalloutButton.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/components/CalloutButton.as b/frameworks/projects/spark/src/spark/components/CalloutButton.as index 7eec462..9585a3c 100644 --- a/frameworks/projects/spark/src/spark/components/CalloutButton.as +++ b/frameworks/projects/spark/src/spark/components/CalloutButton.as @@ -126,7 +126,8 @@ use namespace mx_internal; * </tr> * <tr> * <td>Default skin class</td> - * <td>spark.skins.mobile.CalloutButtonSkin</td> + * <td>spark.skins.mobile.CalloutButtonSkin on mobile platforms <br/> + * spark.skins.spark.CalloutButtonSkin on desktops</td> * </tr> * </table> * @@ -159,6 +160,7 @@ use namespace mx_internal; * @includeExample examples/CalloutButtonExample.mxml -noswf * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -200,6 +202,7 @@ public class CalloutButton extends Button * Constructor. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -227,6 +230,7 @@ public class CalloutButton extends Button * instance. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -277,6 +281,7 @@ public class CalloutButton extends Button * @see spark.components.Callout * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -313,6 +318,7 @@ public class CalloutButton extends Button * @default BasicLayout * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -346,6 +352,7 @@ public class CalloutButton extends Button * @copy spark.components.Callout#horizontalPosition * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -382,6 +389,7 @@ public class CalloutButton extends Button * @copy spark.components.Callout#verticalPosition * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -433,6 +441,7 @@ public class CalloutButton extends Button * @see #calloutDestructionPolicy * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -472,6 +481,7 @@ public class CalloutButton extends Button * the DropDownController instance is created in the constructor. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -508,6 +518,7 @@ public class CalloutButton extends Button * @copy spark.components.supportClasses.DropDownController#isOpen * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -538,6 +549,7 @@ public class CalloutButton extends Button * @default auto * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -689,6 +701,7 @@ public class CalloutButton extends Button * Initializes the dropDown and changes the skin state to open. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -701,6 +714,7 @@ public class CalloutButton extends Button * Changes the skin state to normal. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/df8e5d1d/frameworks/projects/spark/src/spark/components/CalloutPosition.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/components/CalloutPosition.as b/frameworks/projects/spark/src/spark/components/CalloutPosition.as index a0b6e7d..625f523 100644 --- a/frameworks/projects/spark/src/spark/components/CalloutPosition.as +++ b/frameworks/projects/spark/src/spark/components/CalloutPosition.as @@ -30,6 +30,7 @@ package spark.components * @see spark.components.Callout#verticalPosition * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -40,6 +41,7 @@ public final class CalloutPosition * Position the trailing edge of the callout before the leading edge of the owner. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -49,6 +51,7 @@ public final class CalloutPosition * Position the leading edge of the callout at the leading edge of the owner. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -58,6 +61,7 @@ public final class CalloutPosition * Position the horizontalCenter of the callout to the horizontalCenter of the owner. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -67,6 +71,7 @@ public final class CalloutPosition * Position the trailing edge of the callout at the trailing edge of the owner. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -76,6 +81,7 @@ public final class CalloutPosition * Position the leading edge of the callout after the trailing edge of the owner. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ @@ -86,6 +92,7 @@ public final class CalloutPosition * requires the least amount of resizing to fit. * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/df8e5d1d/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as b/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as index d3b1357..972f464 100644 --- a/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as +++ b/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as @@ -64,6 +64,7 @@ use namespace mx_internal; * @see spark.components.Callout * * @langversion 3.0 + * @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */ http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/df8e5d1d/frameworks/projects/spark/src/spark/skins/spark/supportClasses/CalloutArrow.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/skins/spark/supportClasses/CalloutArrow.as b/frameworks/projects/spark/src/spark/skins/spark/supportClasses/CalloutArrow.as index 825fd1e..9a22c67 100644 --- a/frameworks/projects/spark/src/spark/skins/spark/supportClasses/CalloutArrow.as +++ b/frameworks/projects/spark/src/spark/skins/spark/supportClasses/CalloutArrow.as @@ -46,6 +46,7 @@ use namespace mx_internal; * @see spark.skin.mobile.CalloutSkin * * @langversion 3.0 +* @playerversion Flash 11 * @playerversion AIR 3 * @productversion Flex 4.6 */
