Skip to content
Permalink
Browse files

Merge branch 't/11101'

  • Loading branch information...
mlewand committed Dec 3, 2013
2 parents ed52709 + e9547e7 commit 6aca6feebb9b11718b929dedf5275467b14a9771
Showing with 7 additions and 3 deletions.
  1. +7 −3 plugins/listblock/plugin.js
@@ -17,7 +17,11 @@ CKEDITOR.plugins.add( 'listblock', {
'{text}' +
'</a>' +
'</li>' ),
listGroup = CKEDITOR.addTemplate( 'panel-list-group', '<h1 id="{id}" class="cke_panel_grouptitle" role="presentation" >{label}</h1>' );
listGroup = CKEDITOR.addTemplate( 'panel-list-group', '<h1 id="{id}" class="cke_panel_grouptitle" role="presentation" >{label}</h1>' ),
reSingleQuote = /\'/g,
escapeSingleQuotes = function( str ) {
return str.replace( reSingleQuote, '\\\'' );
};

CKEDITOR.ui.panel.prototype.addListBlock = function( name, definition ) {
return this.addBlock( name, new CKEDITOR.ui.listBlock( this.getHolderElement(), definition ) );
@@ -89,10 +93,10 @@ CKEDITOR.plugins.add( 'listblock', {

var data = {
id: id,
val: value,
val: escapeSingleQuotes( CKEDITOR.tools.htmlEncodeAttr( value ) ),
onclick: CKEDITOR.env.ie ? 'onclick="return false;" onmouseup' : 'onclick',
clickFn: this._.getClick(),
title: title || value,
title: CKEDITOR.tools.htmlEncodeAttr( title || value ),
text: html || value
};

0 comments on commit 6aca6fe

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