Merge remote-tracking branch 'origin/develop' into develop

apache · Jun 4, 2015 · 9a20994 · 9a20994
2 parents f4a26bd + e86e835
commit 9a20994
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/textLayout/src/flashx/textLayout/edit/TextClipboard.as b/textLayout/src/flashx/textLayout/edit/TextClipboard.as
@@ -102,7 +102,10 @@ package flashx.textLayout.edit
 				var descriptor:FormatDescriptor = TextConverter.getFormatDescriptorAt(i);
 				textOnClipboard = importFunctor(descriptor.clipboardFormat);
 				if (textOnClipboard && (textOnClipboard != ""))
+				{
+					textOnClipboard = textOnClipboard.replace(/\u000B/g,"\u2028");
 					textScrap = importToScrap(textOnClipboard, descriptor.format);
+				}
 			}
 			return textScrap;
 		}