You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ma...@apache.org on 2014/03/16 19:59:47 UTC
[1/3] git commit: [flex-sdk] [refs/heads/develop] - FIXED -
FLEX-34141 softkeyboardActivate events are not dispatched in Flex 4.12 on iOS
Repository: flex-sdk
Updated Branches:
refs/heads/develop f2de68eb4 -> 1da2381b2
FIXED - FLEX-34141 softkeyboardActivate events are not dispatched in Flex 4.12 on iOS
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b1714f8c
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b1714f8c
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b1714f8c
Branch: refs/heads/develop
Commit: b1714f8c473613dad219ea15521a940a654252fc
Parents: 8138af1
Author: mamsellem <ma...@systar.com>
Authored: Sat Mar 15 12:06:35 2014 +0100
Committer: mamsellem <ma...@systar.com>
Committed: Sat Mar 15 12:06:35 2014 +0100
----------------------------------------------------------------------
.../supportClasses/ScrollableStageText.as | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b1714f8c/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as b/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as
index 9822b65..c03ef69 100644
--- a/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as
+++ b/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as
@@ -30,7 +30,6 @@ import flash.events.SoftKeyboardEvent;
import flash.geom.Matrix;
import flash.geom.Point;
import flash.geom.Rectangle;
-import flash.system.Capabilities;
import flash.text.AutoCapitalize;
import flash.text.ReturnKeyLabel;
import flash.text.SoftKeyboardType;
@@ -47,7 +46,6 @@ import mx.core.UIComponent;
import mx.core.mx_internal;
import mx.events.FlexEvent;
import mx.managers.SystemManager;
-import mx.utils.MatrixUtil;
import mx.utils.Platform;
import spark.components.Application;
@@ -1753,8 +1751,9 @@ public class ScrollableStageText extends UIComponent implements IStyleableEdita
stageText.addEventListener(Event.CHANGE, stageText_changeHandler);
stageText.addEventListener(FocusEvent.FOCUS_IN, stageText_focusInHandler);
stageText.addEventListener(FocusEvent.FOCUS_OUT, stageText_focusOutHandler);
+ stageText.addEventListener(SoftKeyboardEvent.SOFT_KEYBOARD_ACTIVATING, stageText_softKeyboardHandler);
stageText.addEventListener(SoftKeyboardEvent.SOFT_KEYBOARD_ACTIVATE, stageText_softKeyboardActivateHandler);
- stageText.addEventListener(SoftKeyboardEvent.SOFT_KEYBOARD_DEACTIVATE, stageText_softKeyboardDeactivateHandler);
+ stageText.addEventListener(SoftKeyboardEvent.SOFT_KEYBOARD_DEACTIVATE, stageText_softKeyboardHandler);
stageText.addEventListener(KeyboardEvent.KEY_DOWN, stageText_keyDownHandler);
stageText.addEventListener(KeyboardEvent.KEY_UP, stageText_keyUpHandler);
}
@@ -1777,8 +1776,9 @@ public class ScrollableStageText extends UIComponent implements IStyleableEdita
stageText.removeEventListener(Event.COMPLETE, stageText_completeHandler);
stageText.removeEventListener(FocusEvent.FOCUS_IN, stageText_focusInHandler);
stageText.removeEventListener(FocusEvent.FOCUS_OUT, stageText_focusOutHandler);
+ stageText.removeEventListener(SoftKeyboardEvent.SOFT_KEYBOARD_ACTIVATING, stageText_softKeyboardHandler);
stageText.removeEventListener(SoftKeyboardEvent.SOFT_KEYBOARD_ACTIVATE, stageText_softKeyboardActivateHandler);
- stageText.removeEventListener(SoftKeyboardEvent.SOFT_KEYBOARD_DEACTIVATE, stageText_softKeyboardDeactivateHandler);
+ stageText.removeEventListener(SoftKeyboardEvent.SOFT_KEYBOARD_DEACTIVATE, stageText_softKeyboardHandler);
stageText.removeEventListener(KeyboardEvent.KEY_DOWN, stageText_keyDownHandler);
stageText.removeEventListener(KeyboardEvent.KEY_UP, stageText_keyUpHandler);
@@ -1886,18 +1886,20 @@ public class ScrollableStageText extends UIComponent implements IStyleableEdita
}
}
+
+ /* start edition and bubbles up the event */
private function stageText_softKeyboardActivateHandler(event:SoftKeyboardEvent):void
{
- if ( startTextEdit()) {
- dispatchEvent(new SoftKeyboardEvent(event.type,
+ startTextEdit();
+ dispatchEvent(new SoftKeyboardEvent(event.type,
true, event.cancelable, this, event.triggerType));
- }
}
- private function stageText_softKeyboardDeactivateHandler(event:SoftKeyboardEvent):void
+ /* just bubbles up the event */
+ private function stageText_softKeyboardHandler(event:SoftKeyboardEvent):void
{
- dispatchEvent(new SoftKeyboardEvent(event.type,
+ dispatchEvent(new SoftKeyboardEvent(event.type,
true, event.cancelable, this, event.triggerType));
}
[2/3] git commit: [flex-sdk] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by ma...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/351e1c5f
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/351e1c5f
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/351e1c5f
Branch: refs/heads/develop
Commit: 351e1c5faa2583315312d3eccdb7a505360f2a25
Parents: b1714f8 f2de68e
Author: mamsellem <ma...@systar.com>
Authored: Sun Mar 16 19:54:53 2014 +0100
Committer: mamsellem <ma...@systar.com>
Committed: Sun Mar 16 19:54:53 2014 +0100
----------------------------------------------------------------------
build/deploy_release.sh | 83 ++++++++++++++++++++++++++++++++++++++++++++
installer.xml | 32 ++---------------
2 files changed, 85 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
[3/3] git commit: [flex-sdk] [refs/heads/develop] - Added AIR-SDK
directories to .gitignore, so that flex-sdk can be used as SDK in IDE
Posted by ma...@apache.org.
Added AIR-SDK directories to .gitignore, so that flex-sdk can be used as SDK in IDE
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/1da2381b
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/1da2381b
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/1da2381b
Branch: refs/heads/develop
Commit: 1da2381b289838d7e527bcb151bf5c0ef8747845
Parents: 351e1c5
Author: mamsellem <ma...@systar.com>
Authored: Sun Mar 16 19:58:15 2014 +0100
Committer: mamsellem <ma...@systar.com>
Committed: Sun Mar 16 19:58:15 2014 +0100
----------------------------------------------------------------------
.gitignore | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1da2381b/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 1de4b3f..45b0af1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,3 +117,20 @@ _ReSharper*/
*.reply
mailbody.txt
gitstatus.txt
+
+#AIR SDK
+frameworks/projects/air/
+runtimes/
+templates/air/
+samples/badge/
+samples/icons/
+templates/air/
+templates/extensions/
+templates/sdk/
+install/android
+AIR SDK Readme.txt
+AIR SDK license.pdf
+air-sdk-description.xml
+samples/descriptor-sample.xml
+include/FlashRuntimeExtensions.h
+