Merge branch 't/13495'

ckeditor · Jul 8, 2015 · 9966124 · 9966124
2 parents d841e85 + ccb91a4
commit 9966124
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,7 @@ Fixed Issues:
 * [#13468](http://dev.ckeditor.com/ticket/13468): [IE] Fixed: Binding drag&drop `dataTransfer` does not work if `text` data was set in the meantime.
 * [#13419](http://dev.ckeditor.com/ticket/13419): Fixed: [Auto Link](http://ckeditor.com/addon/autolink) plugin does not encode double quotes in URLs.
 * [#13460](http://dev.ckeditor.com/ticket/13460): [IE8] Fixed: Copying inline widgets is broken when the Advanced Content Filter is disabled.
+* [#13495](http://dev.ckeditor.com/ticket/13495): [Firefox,IE] Fixed: Text is not word-wrapped in the Paste dialog.
 
 ## CKEditor 4.5.1
 

diff --git a/plugins/clipboard/dialogs/paste.js b/plugins/clipboard/dialogs/paste.js
@@ -124,7 +124,7 @@ CKEDITOR.dialog.add( 'paste', function( editor ) {
 						var dialog = this.getDialog();
 						var htmlToLoad = '<html dir="' + editor.config.contentsLangDirection + '"' +
 							' lang="' + ( editor.config.contentsLanguage || editor.langCode ) + '">' +
-							'<head><style>body{margin:3px;height:95%}</style></head><body>' +
+							'<head><style>body{margin:3px;height:95%;word-break:break-all;}</style></head><body>' +
 							'<script id="cke_actscrpt" type="text/javascript">' +
 							'window.parent.CKEDITOR.tools.callFunction(' + CKEDITOR.tools.addFunction( onPasteFrameLoad, dialog ) + ',this);' +
 							'</script></body>' +

diff --git a/tests/plugins/clipboard/manual/pastedialogwordbreak.html b/tests/plugins/clipboard/manual/pastedialogwordbreak.html
@@ -0,0 +1,8 @@
+<textarea cols="80" id="classic" name="classic" rows="10">
+</textarea>
+
+<script>
+	var editor = CKEDITOR.replace( 'classic', {
+		allowedContent: true
+	} );
+</script>
diff --git a/tests/plugins/clipboard/manual/pastedialogwordbreak.md b/tests/plugins/clipboard/manual/pastedialogwordbreak.md
@@ -0,0 +1,10 @@
+@bender-tags: tc, 4.5.2, 13495
+@bender-ui: collapsed
+@bender-ckeditor-plugins: wysiwygarea, toolbar, clipboard, floatingspace, htmlwriter,
+
+1. Click paste button on the toolbar.
+1. If the browser will ask for clipboard access permission - chose option that will **not allow** it.
+1. In the paste dialog, put word longer than text area's width.
+
+#### Expected result:
+Long words should be broken into separate lines and no horizontal scroll bar should be visible.