Merge branch 't/12506'

ckeditor · Oct 1, 2014 · b3182c3 · b3182c3
2 parents 3574029 + a9dd8b3
commit b3182c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -9,6 +9,7 @@ New Features:
 
 Fixed Issues:
 
+* [#12506](http://dev.ckeditor.com/ticket/12506): [Safari] Fixed: Can't paste into inline editor if page has `user-select: none` style. Thanks to [shaohua](https://github.com/shaohua)!
 * [#12489](http://dev.ckeditor.com/ticket/12423) and [#12491](http://dev.ckeditor.com/ticket/12423): Fixed: Various issues related to restoring selection after making operations on filler char. See the [fixed cases](http://dev.ckeditor.com/ticket/12491#comment:4).
 
 ## CKEditor 4.4.5

diff --git a/plugins/clipboard/plugin.js b/plugins/clipboard/plugin.js
@@ -739,6 +739,10 @@
 				padding: 0
 			} );
 
+			// Paste fails in Safari when the body tag has 'user-select: none'. (#12506)
+			if ( CKEDITOR.env.safari )
+				pastebin.setStyles( CKEDITOR.tools.cssVendorPrefix( 'user-select', 'text' ) );
+
 			// Check if the paste bin now establishes new editing host.
 			var isEditingHost = pastebin.getParent().isReadOnly();