Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.5.1
[ckeditor.git]
/
_source
/
plugins
/
pastefromword
/
plugin.js
diff --git
a/_source/plugins/pastefromword/plugin.js
b/_source/plugins/pastefromword/plugin.js
index
d50b3f0
..
a5a90d5
100644
(file)
--- a/
_source/plugins/pastefromword/plugin.js
+++ b/
_source/plugins/pastefromword/plugin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
(function()
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
(function()
\r
@@
-47,6
+47,11
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
command : 'pastefromword'
\r
});
\r
\r
command : 'pastefromword'
\r
});
\r
\r
+ editor.on( 'pasteState', function( evt )
\r
+ {
\r
+ editor.getCommand( 'pastefromword' ).setState( evt.data );
\r
+ });
\r
+
\r
editor.on( 'paste', function( evt )
\r
{
\r
var data = evt.data,
\r
editor.on( 'paste', function( evt )
\r
{
\r
var data = evt.data,
\r
@@
-89,11
+94,13
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
|| ( this.path + 'filter/default.js' ) );
\r
\r
// Load with busy indicator.
\r
|| ( this.path + 'filter/default.js' ) );
\r
\r
// Load with busy indicator.
\r
- CKEDITOR.scriptLoader.load( filterFilePath, callback, null, false, true );
\r
+ CKEDITOR.scriptLoader.load( filterFilePath, callback, null, true );
\r
}
\r
\r
return !isLoaded;
\r
}
\r
\r
return !isLoaded;
\r
- }
\r
+ },
\r
+
\r
+ requires : [ 'clipboard' ]
\r
});
\r
})();
\r
\r
});
\r
})();
\r
\r