X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fpastefromword%2Fplugin.js;h=a5a90d51074e1e386a44db3ae7a5d0b259cb3d9d;hb=48b1db88210b4160dce439c6e3e32e14af8c106b;hp=a5d389665e8533b1f27f9cf687562fabbb9aff3e;hpb=c6e377a02b54abc07129d72b632763c727476a15;p=ckeditor.git

diff --git a/_source/plugins/pastefromword/plugin.js b/_source/plugins/pastefromword/plugin.js
index a5d3896..a5a90d5 100644
--- a/_source/plugins/pastefromword/plugin.js
+++ b/_source/plugins/pastefromword/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 (function()
@@ -35,6 +35,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								resetFromWord();
 							});
 					}
+					else
+						resetFromWord();
 				}
 			});
 
@@ -45,6 +47,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					command : 'pastefromword'
 				});
 
+			editor.on( 'pasteState', function( evt )
+				{
+					editor.getCommand( 'pastefromword' ).setState( evt.data );
+				});
+
 			editor.on( 'paste', function( evt )
 			{
 				var data = evt.data,
@@ -87,11 +94,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						|| ( this.path + 'filter/default.js' ) );
 
 				// Load with busy indicator.
-				CKEDITOR.scriptLoader.load( filterFilePath, callback, null, false, true );
+				CKEDITOR.scriptLoader.load( filterFilePath, callback, null, true );
 			}
 
 			return !isLoaded;
-		}
+		},
+
+		requires : [ 'clipboard' ]
 	});
 })();