You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/05/14 10:47:54 UTC
[1/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-33544 Make
paste to single line field ignore both \r and \n
Updated Branches:
refs/heads/develop 4d747868e -> 4eadcb318
FLEX-33544 Make paste to single line field ignore both \r and \n
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/2937aa87
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/2937aa87
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/2937aa87
Branch: refs/heads/develop
Commit: 2937aa8711348c2cf34168d3b78bdb93d81650f6
Parents: 2afdd25
Author: Justin Mclean <jm...@apache.org>
Authored: Tue May 14 18:45:51 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue May 14 18:45:51 2013 +1000
----------------------------------------------------------------------
.../spark/src/spark/components/RichEditableText.as | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2937aa87/frameworks/projects/spark/src/spark/components/RichEditableText.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/RichEditableText.as b/frameworks/projects/spark/src/spark/components/RichEditableText.as
index 5f4cdcb..e3b8319 100644
--- a/frameworks/projects/spark/src/spark/components/RichEditableText.as
+++ b/frameworks/projects/spark/src/spark/components/RichEditableText.as
@@ -552,7 +552,7 @@ package spark.components
* Regular expression which matches all newlines in the text. Used
* to strip newlines when pasting text when multiline is false.
*/
- private static const ALL_NEWLINES_REGEXP:RegExp = /\n/g;
+ private static const ALL_NEWLINES_REGEXP:RegExp = /[\n\r]/g;
//--------------------------------------------------------------------------
//
@@ -4129,7 +4129,7 @@ package spark.components
// If there are no constraints and no newlines there is nothing
// more to do.
- if (!hasConstraints && pastedText.indexOf("\n") == -1)
+ if (!hasConstraints && pastedText.search(ALL_NEWLINES_REGEXP) == -1)
return;
// Save this in case we modify the pasted text. We need to know
[2/2] 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 jm...@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/4eadcb31
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/4eadcb31
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/4eadcb31
Branch: refs/heads/develop
Commit: 4eadcb31842a1153e5926990759c9ae99c3889b9
Parents: 2937aa8 4d74786
Author: Justin Mclean <jm...@apache.org>
Authored: Tue May 14 18:46:24 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue May 14 18:46:24 2013 +1000
----------------------------------------------------------------------
.../projects/mx/src/mx/controls/NumericStepper.as | 9 +---
.../spark/src/spark/components/NumericStepper.as | 37 ++++++++++----
2 files changed, 28 insertions(+), 18 deletions(-)
----------------------------------------------------------------------