X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fbutton%2Fplugin.js;h=f16e192aac50194667cdfaa9beaf7850c4d1aac5;hb=c9fdde67e6384bd5a66adc2b3bba5c4ce9db56c7;hp=54016fb4518f634c048959ec6319944a7709c2fe;hpb=e7789c1ad838194d45eeee6ac2eb6e55f5cf35a1;p=ckeditor.git
diff --git a/_source/plugins/button/plugin.js b/_source/plugins/button/plugin.js
index 54016fb..f16e192 100644
--- a/_source/plugins/button/plugin.js
+++ b/_source/plugins/button/plugin.js
@@ -134,7 +134,7 @@ CKEDITOR.ui.button.prototype =
'',
'= 10900 && !env.hc ? '' : '" href="javascript:void(\''+ ( this.title || '' ).replace( "'"+ '' )+ '\')"',
+ env.gecko && env.version >= 10900 && !env.hc ? '' : '" href="javascript:void(\''+ ( this.title || '' ).replace( "'", '' )+ '\')"',
' title="', this.title, '"' +
' tabindex="-1"' +
' hidefocus="true"' +
@@ -172,7 +172,7 @@ CKEDITOR.ui.button.prototype =
}
output.push(
- '>' +
+ '> ' +
'', this.label, '' );
if ( this.hasArrow )
@@ -180,7 +180,7 @@ CKEDITOR.ui.button.prototype =
output.push(
''
// BLACK DOWN-POINTING TRIANGLE
- + ( CKEDITOR.env.hc ? '▼' : '' )
+ + ( CKEDITOR.env.hc ? '▼' : ' ' )
+ '' );
}
@@ -270,3 +270,8 @@ CKEDITOR.ui.prototype.addButton = function( name, definition )
{
this.add( name, CKEDITOR.UI_BUTTON, definition );
};
+
+CKEDITOR.on( 'reset', function()
+ {
+ CKEDITOR.ui.button._.instances = [];
+ });