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.6.5
[ckeditor.git]
/
_source
/
skins
/
v2
/
skin.js
diff --git
a/_source/skins/v2/skin.js
b/_source/skins/v2/skin.js
index
2abbbcf
..
769e53e
100644
(file)
--- a/
_source/skins/v2/skin.js
+++ b/
_source/skins/v2/skin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
@@
-8,6
+8,7
@@
CKEDITOR.skins.add( 'v2', (function()
return {
\r
editor : { css : [ 'editor.css' ] },
\r
dialog : { css : [ 'dialog.css' ] },
\r
return {
\r
editor : { css : [ 'editor.css' ] },
\r
dialog : { css : [ 'dialog.css' ] },
\r
+ separator : { canGroup: false },
\r
templates : { css : [ 'templates.css' ] },
\r
margins : [ 0, 14, 18, 14 ]
\r
};
\r
templates : { css : [ 'templates.css' ] },
\r
margins : [ 0, 14, 18, 14 ]
\r
};
\r
@@
-36,30
+37,32
@@
CKEDITOR.skins.add( 'v2', (function()
height : height + 'px'
\r
});
\r
\r
height : height + 'px'
\r
});
\r
\r
- if ( !CKEDITOR.env.ie )
\r
+ if ( !CKEDITOR.env.ie || CKEDITOR.env.ie9Compat )
\r
return;
\r
\r
// Fix the size of the elements which have flexible lengths.
\r
setTimeout( function()
\r
{
\r
var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ),
\r
return;
\r
\r
// Fix the size of the elements which have flexible lengths.
\r
setTimeout( function()
\r
{
\r
var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ),
\r
- body = innerDialog.getChild( 0 );
\r
+ body = innerDialog.getChild( 0 ),
\r
+ bodyWidth = body.getSize( 'width' );
\r
+ height += body.getChild( 0 ).getSize( 'height' ) + 1;
\r
\r
// tc
\r
var el = innerDialog.getChild( 2 );
\r
\r
// tc
\r
var el = innerDialog.getChild( 2 );
\r
- el.setStyle( 'width', ( body.$.offsetWidth ) + 'px' );
\r
+ el.setSize( 'width', bodyWidth );
\r
\r
// bc
\r
el = innerDialog.getChild( 7 );
\r
\r
// bc
\r
el = innerDialog.getChild( 7 );
\r
- el.setStyle( 'width', ( body.$.offsetWidth - 28 ) + 'px' );
\r
+ el.setSize( 'width', bodyWidth - 28 );
\r
\r
// ml
\r
el = innerDialog.getChild( 4 );
\r
\r
// ml
\r
el = innerDialog.getChild( 4 );
\r
- el.setStyle( 'height', ( height + body.getChild(0).$.offsetHeight ) + 'px' );
\r
+ el.setSize( 'height', height );
\r
\r
// mr
\r
el = innerDialog.getChild( 5 );
\r
\r
// mr
\r
el = innerDialog.getChild( 5 );
\r
- el.setStyle( 'height', ( height + body.getChild(0).$.offsetHeight ) + 'px' );
\r
+ el.setSize( 'height', height );
\r
},
\r
100 );
\r
});
\r
},
\r
100 );
\r
});
\r