Merge branch 't/9907b' into major

ckeditor · Feb 20, 2013 · 3e347c8 · 3e347c8
2 parents 1645260 + 2c212d7
commit 3e347c8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/plugins/preview/plugin.js b/plugins/preview/plugin.js
@@ -57,7 +57,10 @@
 				iLeft = Math.round( screen.width * 0.1 );
 			} catch ( e ) {}
 
-			editor.fire( 'contentPreview', eventData = { dataValue: sHTML } );
+			// (#9907) Allow data manipulation before preview is displayed.
+			// Also don't open the preview window when event cancelled.
+			if ( !editor.fire( 'contentPreview', eventData = { dataValue: sHTML } ) )
+				return false;
 
 			var sOpenUrl = '';
 			if ( isCustomDomain ) {