Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.5
[ckeditor.git]
/
_source
/
plugins
/
richcombo
/
plugin.js
diff --git
a/_source/plugins/richcombo/plugin.js
b/_source/plugins/richcombo/plugin.js
index
bcc5777
..
d7895c8
100644
(file)
--- a/
_source/plugins/richcombo/plugin.js
+++ b/
_source/plugins/richcombo/plugin.js
@@
-106,12
+106,7
@@
CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
return;
\r
}
\r
\r
return;
\r
}
\r
\r
- if ( !_.committed )
\r
- {
\r
- _.list.commit();
\r
- _.committed = 1;
\r
- }
\r
-
\r
+ this.commit();
\r
var value = this.getValue();
\r
if ( value )
\r
_.list.mark( value );
\r
var value = this.getValue();
\r
if ( value )
\r
_.list.mark( value );
\r
@@
-201,7
+196,7
@@
CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
'<span>' +
\r
'<span id="' + id + '_text" class="cke_text cke_inline_label">' + this.label + '</span>' +
\r
'</span>' +
\r
'<span>' +
\r
'<span id="' + id + '_text" class="cke_text cke_inline_label">' + this.label + '</span>' +
\r
'</span>' +
\r
- '<span class=cke_openbutton>' + ( CKEDITOR.env.hc ? '<span>▼</span>' : '' ) + '</span>' + // BLACK DOWN-POINTING TRIANGLE
\r
+ '<span class=cke_openbutton>' + ( CKEDITOR.env.hc ? '<span>▼</span>' : CKEDITOR.env.air ? ' ' : '' ) + '</span>' + // BLACK DOWN-POINTING TRIANGLE
\r
'</a>' +
\r
'</span>' +
\r
'</span>' );
\r
'</a>' +
\r
'</span>' +
\r
'</span>' );
\r
@@
-244,7
+239,7
@@
CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
if ( me.className )
\r
this.element.getFirst().removeClass( me.className + '_panel' );
\r
\r
if ( me.className )
\r
this.element.getFirst().removeClass( me.className + '_panel' );
\r
\r
- me.setState( CKEDITOR.TRISTATE_OFF );
\r
+ me.setState( me.modes && me.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );
\r
\r
me._.on = 0;
\r
\r
\r
me._.on = 0;
\r
\r
@@
-349,7
+344,13
@@
CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
\r
commit : function()
\r
{
\r
\r
commit : function()
\r
{
\r
- this._.list.commit();
\r
+ if ( !this._.committed )
\r
+ {
\r
+ this._.list.commit();
\r
+ this._.committed = 1;
\r
+ CKEDITOR.ui.fire( 'ready', this );
\r
+ }
\r
+ this._.committed = 1;
\r
},
\r
\r
setState : function( state )
\r
},
\r
\r
setState : function( state )
\r