X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=_source%2Fplugins%2Frichcombo%2Fplugin.js;h=7978abeb085dee6eb8f247db8ec5f2f0559bf008;hb=48b1db88210b4160dce439c6e3e32e14af8c106b;hp=76523bc1ca692037567fa06fd52535ff8d89f5b5;hpb=614511639979907ceb0da3614122a4d8eb963ad4;p=ckeditor.git
diff --git a/_source/plugins/richcombo/plugin.js b/_source/plugins/richcombo/plugin.js
index 76523bc..7978abe 100644
--- a/_source/plugins/richcombo/plugin.js
+++ b/_source/plugins/richcombo/plugin.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -106,8 +106,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
return;
}
- !_.committed && this.commit();
-
+ this.commit();
var value = this.getValue();
if ( value )
_.list.mark( value );
@@ -132,6 +131,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
editor.on( 'mode', function()
{
this.setState( this.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );
+ this.setValue( '' );
},
this );
@@ -197,7 +197,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
'' +
'' +
'' );
@@ -290,16 +290,18 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
this._.value = value;
var textElement = this.document.getById( 'cke_' + this.id + '_text' );
-
- if ( !( value || text ) )
+ if ( textElement )
{
- text = this.label;
- textElement.addClass( 'cke_inline_label' );
- }
- else
- textElement.removeClass( 'cke_inline_label' );
+ if ( !( value || text ) )
+ {
+ text = this.label;
+ textElement.addClass( 'cke_inline_label' );
+ }
+ else
+ textElement.removeClass( 'cke_inline_label' );
- textElement.setHtml( typeof text != 'undefined' ? text : value );
+ textElement.setHtml( typeof text != 'undefined' ? text : value );
+ }
},
getValue : function()
@@ -345,7 +347,12 @@ 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;
},