Skip to content
Permalink
Browse files

Merge branch 't/9709'

  • Loading branch information...
Reinmar committed Dec 12, 2012
2 parents ce53ee3 + e5f4193 commit cac827d1134a6f53ad0f9e6befc8e30647435d97
Showing with 8 additions and 8 deletions.
  1. +7 −7 plugins/pastefromword/filter/default.js
  2. +1 −1 plugins/pastefromword/plugin.js
@@ -573,23 +573,23 @@
},

// Migrate the element by decorate styles on it.
// @param styleDefiniton
// @param styleDefinition
// @param variables
elementMigrateFilter: function( styleDefiniton, variables ) {
return function( element ) {
var styleDef = variables ? new CKEDITOR.style( styleDefiniton, variables )._.definition : styleDefiniton;
elementMigrateFilter: function( styleDefinition, variables ) {
return styleDefinition ? function( element ) {
var styleDef = variables ? new CKEDITOR.style( styleDefinition, variables )._.definition : styleDefinition;
element.name = styleDef.element;
CKEDITOR.tools.extend( element.attributes, CKEDITOR.tools.clone( styleDef.attributes ) );
element.addStyle( CKEDITOR.style.getStyleText( styleDef ) );
};
} : function(){};
},

// Migrate styles by creating a new nested stylish element.
// @param styleDefinition
styleMigrateFilter: function( styleDefinition, variableName ) {

var elementMigrateFilter = this.elementMigrateFilter;
return function( value, element ) {
return styleDefinition ? function( value, element ) {
// Build an stylish element first.
var styleElement = new CKEDITOR.htmlParser.element( null ),
variables = {};
@@ -599,7 +599,7 @@
// Place the new element inside the existing span.
styleElement.children = element.children;
element.children = [ styleElement ];
};
} : function(){};
},

// A filter which remove cke-namespaced-attribute on
@@ -5,7 +5,7 @@

(function() {
CKEDITOR.plugins.add( 'pastefromword', {
requires: 'clipboard,format',
requires: 'clipboard',
lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en-au,en-ca,en-gb,en,eo,es,et,eu,fa,fi,fo,fr-ca,fr,gl,gu,he,hi,hr,hu,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt-br,pt,ro,ru,sk,sl,sr-latn,sr,sv,th,tr,ug,uk,vi,zh-cn,zh', // %REMOVE_LINE_CORE%
icons: 'pastefromword,pastefromword-rtl', // %REMOVE_LINE_CORE%
init: function( editor ) {

0 comments on commit cac827d

Please sign in to comment.
You can’t perform that action at this time.