X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=_source%2Fplugins%2Frichcombo%2Fplugin.js;h=8974fca06a7e74859d960ae77117a35d4ed70e9d;hb=refs%2Ftags%2Fv3.5.3;hp=d7895c8b947fc763b1506427d9b765297e022c4c;hpb=9afde8772159bd3436f1f5b7862960307710ae5a;p=ckeditor.git
diff --git a/_source/plugins/richcombo/plugin.js b/_source/plugins/richcombo/plugin.js
index d7895c8..8974fca 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
*/
@@ -131,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 );
@@ -196,7 +197,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
'' +
'' + this.label + '' +
'' +
- '' + ( CKEDITOR.env.hc ? '▼' : CKEDITOR.env.air ? ' ' : '' ) + '' + // BLACK DOWN-POINTING TRIANGLE
+ '' + ( CKEDITOR.env.hc ? '▼' : CKEDITOR.env.air ? ' ' : '' ) + '' + // BLACK DOWN-POINTING TRIANGLE
'' +
'' +
'' );
@@ -289,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()