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.1
[ckeditor.git]
/
_source
/
plugins
/
forms
/
dialogs
/
select.js
diff --git
a/_source/plugins/forms/dialogs/select.js
b/_source/plugins/forms/dialogs/select.js
index
645a1ba
..
8ec81c4
100644
(file)
--- a/
_source/plugins/forms/dialogs/select.js
+++ b/
_source/plugins/forms/dialogs/select.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
CKEDITOR.dialog.add( 'select', function( editor )
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
CKEDITOR.dialog.add( 'select', function( editor )
\r
@@
-160,7
+160,18
@@
CKEDITOR.dialog.add( 'select', function( editor )
this.commitContent( element );
\r
\r
if ( isInsertMode )
\r
this.commitContent( element );
\r
\r
if ( isInsertMode )
\r
- editor.insertElement( element );
\r
+ {
\r
+ editor.insertElement(element);
\r
+ if( CKEDITOR.env.ie )
\r
+ {
\r
+ var sel = editor.getSelection(),
\r
+ bms = sel.createBookmarks();
\r
+ setTimeout(function ()
\r
+ {
\r
+ sel.selectBookmarks( bms );
\r
+ }, 0 );
\r
+ }
\r
+ }
\r
},
\r
contents : [
\r
{
\r
},
\r
contents : [
\r
{
\r
@@
-247,6
+258,8
@@
CKEDITOR.dialog.add( 'select', function( editor )
{
\r
if ( name == 'select' )
\r
this.setValue( element.getAttribute( 'size' ) || '' );
\r
{
\r
if ( name == 'select' )
\r
this.setValue( element.getAttribute( 'size' ) || '' );
\r
+ if ( CKEDITOR.env.webkit )
\r
+ this.getInputElement().setStyle( 'width', '86px' );
\r
},
\r
commit : function( element )
\r
{
\r
},
\r
commit : function( element )
\r
{
\r
@@
-523,6
+536,8
@@
CKEDITOR.dialog.add( 'select', function( editor )
{
\r
if ( name == 'select' )
\r
this.setValue( element.getAttribute( 'multiple' ) );
\r
{
\r
if ( name == 'select' )
\r
this.setValue( element.getAttribute( 'multiple' ) );
\r
+ if ( CKEDITOR.env.webkit )
\r
+ this.getElement().getParent().setStyle( 'vertical-align', 'middle' );
\r
},
\r
commit : function( element )
\r
{
\r
},
\r
commit : function( element )
\r
{
\r