X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=inline;f=_source%2Fplugins%2Frichcombo%2Fplugin.js;h=d7895c8b947fc763b1506427d9b765297e022c4c;hb=9afde8772159bd3436f1f5b7862960307710ae5a;hp=710b946ebe99d92caf3a7fbd3a155fbbb6b7a014;hpb=e7789c1ad838194d45eeee6ac2eb6e55f5cf35a1;p=ckeditor.git
diff --git a/_source/plugins/richcombo/plugin.js b/_source/plugins/richcombo/plugin.js
index 710b946..d7895c8 100644
--- a/_source/plugins/richcombo/plugin.js
+++ b/_source/plugins/richcombo/plugin.js
@@ -106,12 +106,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
return;
}
- if ( !_.committed )
- {
- _.list.commit();
- _.committed = 1;
- }
-
+ this.commit();
var value = this.getValue();
if ( value )
_.list.mark( value );
@@ -201,7 +196,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
'' +
'' + this.label + '' +
'' +
- '' + ( CKEDITOR.env.hc ? '▼' : '' ) + '' + // BLACK DOWN-POINTING TRIANGLE
+ '' + ( CKEDITOR.env.hc ? '▼' : CKEDITOR.env.air ? ' ' : '' ) + '' + // BLACK DOWN-POINTING TRIANGLE
'' +
'' +
'' );
@@ -239,16 +234,16 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
me.onOpen();
};
- panel.onHide = function()
+ panel.onHide = function( preventOnClose )
{
if ( me.className )
this.element.getFirst().removeClass( me.className + '_panel' );
- me.setState( CKEDITOR.TRISTATE_OFF );
+ me.setState( me.modes && me.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );
me._.on = 0;
- if ( me.onClose )
+ if ( !preventOnClose && me.onClose )
me.onClose();
};
@@ -349,7 +344,13 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
commit : function()
{
- this._.list.commit();
+ if ( !this._.committed )
+ {
+ this._.list.commit();
+ this._.committed = 1;
+ CKEDITOR.ui.fire( 'ready', this );
+ }
+ this._.committed = 1;
},
setState : function( state )