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.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
..
fc66d0a
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-2011, 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
@@
-73,7
+73,7
@@
CKEDITOR.dialog.add( 'select', function( editor )
function removeAllOptions( combo )
\r
{
\r
combo = getSelect( combo );
\r
function removeAllOptions( combo )
\r
{
\r
combo = getSelect( combo );
\r
- while( combo.getChild( 0 ) && combo.getChild( 0 ).remove() )
\r
+ while ( combo.getChild( 0 ) && combo.getChild( 0 ).remove() )
\r
{ /*jsl:pass*/ }
\r
}
\r
// Moves the selected option by a number of steps (also negative).
\r
{ /*jsl:pass*/ }
\r
}
\r
// Moves the selected option by a number of steps (also negative).
\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
+ {
\r
editor.insertElement( element );
\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
@@
-182,11
+193,11
@@
CKEDITOR.dialog.add( 'select', function( editor )
setup : function( name, element )
\r
{
\r
if ( name == 'clear' )
\r
setup : function( name, element )
\r
{
\r
if ( name == 'clear' )
\r
- this.setValue( '' );
\r
+ this.setValue( this[ 'default' ] || '' );
\r
else if ( name == 'select' )
\r
{
\r
this.setValue(
\r
else if ( name == 'select' )
\r
{
\r
this.setValue(
\r
- element.getAttribute( '_cke_saved_name' ) ||
\r
+ element.data( 'cke-saved-name' ) ||
\r
element.getAttribute( 'name' ) ||
\r
'' );
\r
}
\r
element.getAttribute( 'name' ) ||
\r
'' );
\r
}
\r
@@
-194,10
+205,10
@@
CKEDITOR.dialog.add( 'select', function( editor )
commit : function( element )
\r
{
\r
if ( this.getValue() )
\r
commit : function( element )
\r
{
\r
if ( this.getValue() )
\r
- element.setAttribute( '_cke_saved_name', this.getValue() );
\r
+ element.data( 'cke-saved-name', this.getValue() );
\r
else
\r
{
\r
else
\r
{
\r
- element.removeAttribute( '_cke_saved_name' ) ;
\r
+ element.data( 'cke-saved-name', false );
\r
element.removeAttribute( 'name' );
\r
}
\r
}
\r
element.removeAttribute( 'name' );
\r
}
\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