Merge branch 't/12263'

Reinmar · Reinmar · commit 18c6781ea28a · 2014-08-11T17:24:27.000+02:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,14 +5,15 @@ CKEditor 4 Changelog
 
 Fixed Issues:
 
+* [#12268](http://dev.ckeditor.com/ticket/12268): Cleanup of UI Color YUI styles. Thanks to [CasherWest](https://github.com/CasherWest)!
+* [#12263](http://dev.ckeditor.com/ticket/12263): Fixed: Paste from Word filter does not normalize semicolons style text properly. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
 * [#10916](http://dev.ckeditor.com/ticket/10916): Fixed Magicline icon in RTL environments.
 * [#11970](http://dev.ckeditor.com/ticket/11970): Fixed: CKEditor paste event not fired when pasting with SHIFT+INS in IE.
 * [#12111](http://dev.ckeditor.com/ticket/12111): Fixed: Linked image attributes are not read when opening the image dialog by doubleclick.
 * [#10030](http://dev.ckeditor.com/ticket/10030): [IE] Fixed: Prevented "Unspecified Error" thrown in various cases when IE8-9 does not allow access to `document.activeElement`.
 * [#12243](http://dev.ckeditor.com/ticket/12243): Fixed: Text formatting lost while pasting from Word. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
 * [#12273](http://dev.ckeditor.com/ticket/12273): Fixed: Applying block style in description list breaks it.
 * [#12281](http://dev.ckeditor.com/ticket/12281): Fixed: Minor syntax issue in CSS files.
-* [#12268](http://dev.ckeditor.com/ticket/12268): Cleanup of UI Color YUI styles. Thanks to [https://github.com/CasherWest](https://github.com/CasherWest)!
 
 ## CKEditor 4.4.3
 
diff --git a/plugins/pastefromword/filter/default.js b/plugins/pastefromword/filter/default.js
@@ -86,7 +86,7 @@
 
 		styleText = ( isPrepend ? [ addingStyleText, styleText ] : [ styleText, addingStyleText ] ).join( ';' );
 
-		this.attributes.style = styleText.replace( /^;|;(?=;)/, '' );
+		this.attributes.style = styleText.replace( /^;+|;(?=;)/g, '' );
 	};
 
 	// Retrieve a style property value of the element.
diff --git a/tests/tickets/10285/1.js b/tests/tickets/10285/1.js
@@ -1,4 +1,4 @@
-/* bender-tags: editor,unit */
+/* bender-tags: editor,unit,pastefromword */
 /* bender-ckeditor-plugins: pastefromword,font */
 
 bender.editor = {
diff --git a/tests/tickets/11237/1.js b/tests/tickets/11237/1.js
@@ -1,4 +1,4 @@
-/* bender-tags: editor,unit */
+/* bender-tags: editor,unit,pastefromword */
 /* bender-ckeditor-plugins: clipboard,pastefromword,ajax */
 
 ( function() {
diff --git a/tests/tickets/8103/1.js b/tests/tickets/8103/1.js
@@ -1,4 +1,4 @@
-/* bender-tags: editor,unit */
+/* bender-tags: editor,unit,pastefromword */
 /* bender-ckeditor-plugins: clipboard,pastefromword,ajax */
 
 ( function() {
diff --git a/tests/tickets/9330/1.js b/tests/tickets/9330/1.js
@@ -1,4 +1,4 @@
-/* bender-tags: editor,unit */
+/* bender-tags: editor,unit,pastefromword */
 /* bender-ckeditor-plugins: clipboard,pastefromword,ajax */
 
 ( function() {
diff --git a/tests/tickets/9456/1.js b/tests/tickets/9456/1.js
@@ -1,4 +1,4 @@
-/* bender-tags: editor,unit */
+/* bender-tags: editor,unit,pastefromword */
 /* bender-ckeditor-plugins: clipboard,pastefromword,format,ajax */
 
 ( function() {
diff --git a/tests/tickets/9456/2.js b/tests/tickets/9456/2.js
@@ -1,4 +1,4 @@
-/* bender-tags: editor,unit */
+/* bender-tags: editor,unit,pastefromword */
 /* bender-ckeditor-plugins: clipboard,pastefromword,format,ajax,basicstyles */
 
 ( function() {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* bender-tags: editor,unit */`
	`1`	`+/* bender-tags: editor,unit,pastefromword */`
`2`	`2`	`/* bender-ckeditor-plugins: pastefromword,font */`
`3`	`3`
`4`	`4`	`bender.editor = {`