Skip to content
Permalink
Browse files

Merge branch 'hotfix-10.10.66' into stable

  • Loading branch information...
sebduggan committed May 15, 2019
2 parents 6df41ad + 5ddfb0f commit 42a1c54f4462178fa60dcf3c5d8d44dd40ec2681
@@ -50,6 +50,21 @@ PresideRichEditor = ( function( $ ){
}
config.autoParagraph = autoParagraph;
config.widgetCategories = widgetCategories;
config.on = {
afterPasteFromWord: function( event ) {
var filter = event.editor.filter.clone(),
fragment = CKEDITOR.htmlParser.fragment.fromHtml( event.data.dataValue ),
writer = new CKEDITOR.htmlParser.basicWriter();

filter.disallow( 'span' ); // Strip all span elements
filter.disallow( '*(*)' ); // Strip all classes
filter.disallow( '*{*}' ); // Strip all inline-styles

filter.applyTo( fragment );
fragment.writeHtml( writer );
event.data.dataValue = writer.getHtml();
}
};

CKEDITOR.on( "instanceReady", function( event ) {
event.editor.initialdata = event.editor.getData();
@@ -40,15 +40,14 @@ component {
}

/**
* Sets some sensible defaults for background threads. Sets
* cfoutputonly to true, turns off debug output and sets
* the request timeout to 100 years.
* Sets some sensible defaults for background threads. Turns
* off debug output and sets the request timeout to 100 years.
*
* @autodoc true
*
*/
public void function setThreadRequestDefaults() {
setting enablecfoutputonly=true showdebugoutput=false requesttimeout=oneHundredYears;
setting showdebugoutput=false requesttimeout=oneHundredYears;
}

/**

0 comments on commit 42a1c54

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