Changeset 4517

Timestamp:

11/23/09 07:58:35 (3 years ago)

Author:

garry.yao

Message:

Fixing #4686 : regression of [4497].

File:

• CKEditor/trunk/_source/plugins/richcombo/plugin.js (modified) (2 diffs)

CKEditor/trunk/_source/plugins/richcombo/plugin.js

@@ -278 +278 @@
                 },
 
-                setValue : function( value, emptyLabel )
+                setValue : function( value, text )
                 {
                         this._.value = value;
@@ -284 +284 @@
                         var textElement = this.document.getById( 'cke_' + this.id + '_text' );
 
-                        if ( !value )
-                        {
-                                value = emptyLabel || this.label;
+                        if ( !( value || text ) )
+                        {
+                                text = this.label;
                                 textElement.addClass( 'cke_inline_label' );
                         }
                         else
                                 textElement.removeClass( 'cke_inline_label' );
-
-                        textElement.setHtml( value );
+                        textElement.setHtml( typeof text != 'undefined' ? text : value );
                 },