Paste replacement

plugins/pastefromwordimage/plugin.js

@@ -9,57 +9,53 @@
 	CKEDITOR.plugins.add( 'pastefromwordimage', {
 		requires: 'pastefromword',
 		init: function( editor ) {
-			if ( !CKEDITOR.plugins.clipboard.isCustomDataTypesSupported ) {
+			if ( CKEDITOR.env.ie || CKEDITOR.env.iOS ) {
 				return;
 			}
 
 			// Register a proper filter, so that images are not stripped out.
 			editor.filter.allow( 'img[src]' );
 
-			editor.on( 'afterPasteFromWord', this.pasteListener, this );
-		},
+			editor.on( 'afterPasteFromWord', pasteListener );
+		}
+	} );
 
-		pasteListener: function( evt ) {
-			var pfwi = CKEDITOR.plugins.pastefromwordimage,
-				imgTags,
-				hexImages,
-				newSrcValues = [],
-				i;
 
-			imgTags = pfwi.extractImgTagsFromHtml( evt.data.dataValue );
-			if ( imgTags.length === 0 ) {
-				return;
-			}
+	function pasteListener( evt ) {
+		var pfwi = CKEDITOR.plugins.pastefromwordimage,
+			imgTags,
+			hexImages,
+			newSrcValues = [],
+			i;
 
-			hexImages = pfwi.extractImagesFromRtf( evt.data.dataTransfer[ 'text/rtf' ] );
-			if ( hexImages.length === 0 ) {
-				return;
-			}
+		imgTags = pfwi.extractImgTagsFromHtml( evt.data.dataValue );
+		if ( imgTags.length === 0 ) {
+			return;
+		}
 
-			CKEDITOR.tools.array.forEach( hexImages, function( img ) {
-				newSrcValues.push( this.createSrcWithBase64( img ) );
-			}, this );
+		hexImages = pfwi.extractImagesFromRtf( evt.data.dataTransfer[ 'text/rtf' ] );
+		if ( hexImages.length === 0 ) {
+			return;
+		}
 
-			// Assumption there is equal amount of Images in RTF and HTML source, so we can match them accordingly to existing order.
-			if ( imgTags.length === newSrcValues.length ) {
-				for ( i = 0; i < imgTags.length; i++ ) {
-					// Replace only `file` urls of images ( shapes get newSrcValue with null ).
-					if ( ( imgTags[ i ].indexOf( 'file://' ) === 0 ) && newSrcValues[ i ] ) {
-						evt.data.dataValue = evt.data.dataValue.replace( imgTags[ i ], newSrcValues[ i ] );
-					}
+		CKEDITOR.tools.array.forEach( hexImages, function( img ) {
+			newSrcValues.push( createSrcWithBase64( img ) );
+		}, this );
+
+		// Assumption there is equal amount of Images in RTF and HTML source, so we can match them accordingly to existing order.
+		if ( imgTags.length === newSrcValues.length ) {
+			for ( i = 0; i < imgTags.length; i++ ) {
+				// Replace only `file` urls of images ( shapes get newSrcValue with null ).
+				if ( ( imgTags[ i ].indexOf( 'file://' ) === 0 ) && newSrcValues[ i ] ) {
+					evt.data.dataValue = evt.data.dataValue.replace( imgTags[ i ], newSrcValues[ i ] );
 				}
 			}
-		},
-
-		createSrcWithBase64: function( img ) {
-			return img.type ? 'data:' + img.type + ';base64,' + this.hexToBase64( img.hex ) : null;
-		},
-
-		hexToBase64: function( hexString ) {
-			return CKEDITOR.tools.convertBytesToBase64( CKEDITOR.tools.convertHexStringToBytes( hexString ) );
 		}
+	}
 
-	} );
+	function createSrcWithBase64( img ) {
+		return img.type ? 'data:' + img.type + ';base64,' + CKEDITOR.tools.convertBytesToBase64( CKEDITOR.tools.convertHexStringToBytes( img.hex ) ) : null;
+	}
 
 	/**
 	 * Help methods used by paste from word image plugin.

tests/plugins/pastefromword/generated/_helpers/createTestCase.js

@@ -42,7 +42,6 @@ function createTestCase( options ) {
 				load( outputPath + deCasher ),
 				load( specialCasePath + deCasher )
 			];
-
 		if ( options.includeRTF ) {
 			loadQueue.push( load( inputPathRtf + deCasher ) );
 		}
@@ -63,7 +62,7 @@ function createTestCase( options ) {
 				return;
 			}
 			// Single null when RTF is avaialble means that one of 2 required files is missing.
-			else if ( inputFixtureHtml === null || inputFixtureRtf === null ) {
+			else if ( options.includeRTF && ( inputFixtureHtml === null || inputFixtureRtf === null ) ) {
 				resume( function() {
 					assert.isNotNull( inputFixtureHtml, '"' + inputPathHtml + '" file is missing' );
 					assert.isNotNull( inputFixtureRtf, '"' + inputPathRtf + '" file is missing' );

tests/plugins/pastefromwordimage/manual/pastewordwithimage.html

@@ -1,4 +1,7 @@
 <textarea id="editor" cols="30" rows="10"></textarea>
 <script>
+	if ( !CKEDITOR.plugins.clipboard.isCustomDataTypesSupported ) {
+		bender.ignore();
+	}
 	CKEDITOR.replace( 'editor' );
 </script>

tests/plugins/pastefromwordimage/manual/pastewordwithimage.md

@@ -1,13 +1,15 @@
 @bender-tags: bug, 4.8.0, 662, pastefromwordimage
 @bender-ui: collapsed
-@bender-ckeditor-plugins: wysiwygarea, toolbar, undo, pastefromwordimage, sourcearea, elementspath, newpage
+@bender-ckeditor-plugins: wysiwygarea, toolbar, undo, pastefromwordimage, sourcearea, elementspath, newpage, resize
 
 ----
 
-1. Using Microsoft Word open a document with images [Offline img](../generated/_fixtures/SimpleImages/SimpleImages.docx).
-1. Select the whole document content.
-1. Paste it into CKEditor instance.
-1. Clear editor with `New page` and repeat above steps for next two files:
+1. Open document and copy whole content.
+1. Clear editor content.
+1. Paste copied content into CKEditor.
+
+### Perform above steps for all files:
+  * [Offline img](../generated/_fixtures/SimpleImages/SimpleImages.docx).
   * [Online and offline img](../generated/_fixtures/MixedOnline/Mixed_drawings_and_online.docx),
   * [Document with shape](../generated/_fixtures/MixedOnlineAndShapes/Mixed_drawings_and_online_and_shapes.docx). _Please notice that shape should be ignored while pasting._