You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pi...@apache.org on 2014/03/22 22:24:53 UTC
[1/2] git commit: [flex-sdk] [refs/heads/develop] - - Fix: FLEX-34057
- RTE on pasting empty data after Excel operation - Removed unused imports
Repository: flex-sdk
Updated Branches:
refs/heads/develop ce9e3b00d -> cbb989b21
- Fix: FLEX-34057 - RTE on pasting empty data after Excel operation
- Removed unused imports
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/eb510bf5
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/eb510bf5
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/eb510bf5
Branch: refs/heads/develop
Commit: eb510bf5bf34481ce9e1ae5db88f6d36546e0ab0
Parents: e7611cb
Author: piotrz <pi...@gmail.com>
Authored: Sat Mar 22 22:18:21 2014 +0100
Committer: piotrz <pi...@gmail.com>
Committed: Sat Mar 22 22:18:21 2014 +0100
----------------------------------------------------------------------
.../projects/spark/src/spark/components/RichEditableText.as | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/eb510bf5/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 5746175..9226971 100644
--- a/frameworks/projects/spark/src/spark/components/RichEditableText.as
+++ b/frameworks/projects/spark/src/spark/components/RichEditableText.as
@@ -80,11 +80,9 @@ package spark.components
import mx.core.IIMESupport;
import mx.core.ISystemCursorClient;
import mx.core.UIComponent;
- import mx.core.mx_internal;
import mx.events.FlexEvent;
import mx.managers.IFocusManager;
import mx.managers.IFocusManagerComponent;
- import mx.resources.ResourceManager;
import mx.utils.StringUtil;
import spark.components.supportClasses.RichEditableTextContainerManager;
@@ -4749,7 +4747,11 @@ package spark.components
if (!multiline)
{
var po:PasteOperation = PasteOperation(op);
-
+
+ // Make sure the clipboard has something to paste.
+ if (po.textScrap == null || po.textScrap.textFlow == null)
+ return;
+
// If copied/cut from displayAsPassword field the pastedText
// is '*' characters but this is correct.
var pastedText:String = staticPlainTextExporter.export(
[2/2] git commit: [flex-sdk] [refs/heads/develop] - Merge
remote-tracking branch 'origin/develop' into develop
Posted by pi...@apache.org.
Merge remote-tracking branch 'origin/develop' 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/cbb989b2
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/cbb989b2
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/cbb989b2
Branch: refs/heads/develop
Commit: cbb989b21a66e8ddb1036439582aaf54258d173f
Parents: eb510bf ce9e3b0
Author: piotrz <pi...@gmail.com>
Authored: Sat Mar 22 22:24:17 2014 +0100
Committer: piotrz <pi...@gmail.com>
Committed: Sat Mar 22 22:24:17 2014 +0100
----------------------------------------------------------------------
.gitignore | 1 +
CONTRIBUTING | 105 +++++++++++++++++++
README | 4 +-
RELEASE_NOTES | 13 ++-
build.xml | 1 +
flex-sdk-description.xml | 6 +-
.../AdvancedDataGridBase.as | 26 +++--
.../AdvancedDataGridColumn.as | 11 +-
.../AdvancedDataGridColumnGroup.as | 2 +-
.../controls/dataGridClasses/DataGridColumn.as | 11 +-
frameworks/projects/spark/defaults.css | 3 -
frameworks/themes/Spark/spark.css | 5 +
ide/flashbuilder/config/air-config.xml | 20 ++--
ide/flashbuilder/config/flex-config.xml | 50 ++++-----
14 files changed, 191 insertions(+), 67 deletions(-)
----------------------------------------------------------------------