X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fforms%2Fdialogs%2Fselect.js;h=7bd91e56eb2d1cf5af89f14fbf78593472beeea0;hb=refs%2Ftags%2Fv3.4.2;hp=c8b43d39ee0e8f96ec8f79ab3a661e85b7af2024;hpb=8761695d9b70afe75905deaac88f78c1f8aeb32d;p=ckeditor.git diff --git a/_source/plugins/forms/dialogs/select.js b/_source/plugins/forms/dialogs/select.js index c8b43d3..7bd91e5 100644 --- a/_source/plugins/forms/dialogs/select.js +++ b/_source/plugins/forms/dialogs/select.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ CKEDITOR.dialog.add( 'select', function( editor ) @@ -73,7 +73,7 @@ CKEDITOR.dialog.add( 'select', function( editor ) function removeAllOptions( combo ) { combo = getSelect( combo ); - while( combo.getChild( 0 ) && combo.getChild( 0 ).remove() ) + while ( combo.getChild( 0 ) && combo.getChild( 0 ).remove() ) { /*jsl:pass*/ } } // Moves the selected option by a number of steps (also negative). @@ -160,7 +160,18 @@ CKEDITOR.dialog.add( 'select', function( editor ) this.commitContent( element ); if ( isInsertMode ) + { editor.insertElement( element ); + if ( CKEDITOR.env.ie ) + { + var sel = editor.getSelection(), + bms = sel.createBookmarks(); + setTimeout(function() + { + sel.selectBookmarks( bms ); + }, 0 ); + } + } }, contents : [ { @@ -182,7 +193,7 @@ CKEDITOR.dialog.add( 'select', function( editor ) setup : function( name, element ) { if ( name == 'clear' ) - this.setValue( '' ); + this.setValue( this['default'] || '' ); else if ( name == 'select' ) { this.setValue(