Index: CKEditor/trunk/CHANGES.html
===================================================================
--- CKEditor/trunk/CHANGES.html (revision 6344)
+++ CKEditor/trunk/CHANGES.html (revision 6345)
@@ -91,14 +91,15 @@
#5500 : [IE] 'value' attribute of text input dialog field was missing.
#6665 : [IE] "name" field of link dialog was missing.
- #6639 : Line-breaks inside pasted list item from MS-Word breaks list structure.
- #6909 : [IE] GIF icons of toolbar button from custom plugins are not diplayed in zoom level 100%.
- #6860 : [FF] double click on placeholder to open dialog throws JavaScript error.
- #6630 : Empty pre output variants among browsers.
- #6615 : [IE7] tableresize usability enhancement.
- #6568 : Insert table row/column doesn't work with spanning.
- #6735 : Inaccurate read-only selection detection.
- #6728 : [BIDI] Change direction doesn't work with list nested inside blockquote.
- #6432 : Insert table over fully selected list result in JavaScript error.
- #6438 : [IE] Performance enhancement when typing inside an element with many child nodes.
+ #6639 : Line-breaks inside pasted list item from MS-Word breaks list structure.
+ #6909 : [IE] GIF icons of toolbar button from custom plugins are not diplayed in zoom level 100%.
+ #6860 : [FF] double click on placeholder to open dialog throws JavaScript error.
+ #6630 : Empty pre output variants among browsers.
+ #6615 : [IE7] tableresize usability enhancement.
+ #6568 : Insert table row/column doesn't work with spanning.
+ #6735 : Inaccurate read-only selection detection.
+ #6728 : [BIDI] Change direction doesn't work with list nested inside blockquote.
+ #6432 : Insert table over fully selected list result in JavaScript error.
+ #6438 : [IE] Performance enhancement when typing inside an element with many child nodes.
+ #6970 : [IE] Dialog shadows were inaccurately presented.
Updated the following language files:
- #6981 : English (GB);
Index: CKEditor/trunk/_source/plugins/find/dialogs/find.js
===================================================================
--- CKEditor/trunk/_source/plugins/find/dialogs/find.js (revision 6344)
+++ CKEditor/trunk/_source/plugins/find/dialogs/find.js (revision 6345)
@@ -605,5 +605,5 @@
resizable : CKEDITOR.DIALOG_RESIZE_NONE,
minWidth : 350,
- minHeight : 165,
+ minHeight : 170,
buttons : [ CKEDITOR.dialog.cancelButton ], // Cancel button only.
contents : [
Index: CKEditor/trunk/_source/plugins/image/dialogs/image.js
===================================================================
--- CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 6344)
+++ CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 6345)
@@ -263,7 +263,7 @@
return {
- title : ( dialogType == 'image' ) ? editor.lang.image.title : editor.lang.image.titleButton,
+ title : editor.lang.image[ dialogType == 'image' ? 'title' : 'titleButton' ],
minWidth : 420,
- minHeight : CKEDITOR.env.ie && CKEDITOR.env.quirks? 360: 310,
+ minHeight : 360,
onShow : function()
{
Index: CKEditor/trunk/_source/skins/kama/skin.js
===================================================================
--- CKEditor/trunk/_source/skins/kama/skin.js (revision 6344)
+++ CKEditor/trunk/_source/skins/kama/skin.js (revision 6345)
@@ -217,28 +217,4 @@
height : height + 'px'
});
-
- // Fix the size of the elements which have flexible lengths.
- setTimeout( function()
- {
- var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ),
- body = innerDialog.getChild( 0 );
-
- // tc
- var el = innerDialog.getChild( 2 );
- el.setStyle( 'width', ( body.$.offsetWidth ) + 'px' );
-
- // bc
- el = innerDialog.getChild( 7 );
- el.setStyle( 'width', ( body.$.offsetWidth - 28 ) + 'px' );
-
- // ml
- el = innerDialog.getChild( 4 );
- el.setStyle( 'height', ( height + body.getChild(0).$.offsetHeight ) + 'px' );
-
- // mr
- el = innerDialog.getChild( 5 );
- el.setStyle( 'height', ( height + body.getChild(0).$.offsetHeight ) + 'px' );
- },
- 100 );
});
}
Index: CKEditor/trunk/_source/skins/office2003/skin.js
===================================================================
--- CKEditor/trunk/_source/skins/office2003/skin.js (revision 6344)
+++ CKEditor/trunk/_source/skins/office2003/skin.js (revision 6345)
@@ -44,21 +44,23 @@
{
var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ),
- body = innerDialog.getChild( 0 );
+ body = innerDialog.getChild( 0 ),
+ bodyWidth = body.getSize( 'width' );
+ height += body.getChild( 0 ).getSize( 'height' ) + 1;
// tc
var el = innerDialog.getChild( 2 );
- el.setStyle( 'width', ( body.$.offsetWidth ) + 'px' );
+ el.setSize( 'width', bodyWidth );
// bc
el = innerDialog.getChild( 7 );
- el.setStyle( 'width', ( body.$.offsetWidth - 28 ) + 'px' );
+ el.setSize( 'width', bodyWidth - 28 );
// ml
el = innerDialog.getChild( 4 );
- el.setStyle( 'height', ( height + body.getChild(0).$.offsetHeight ) + 'px' );
+ el.setSize( 'height', height );
// mr
el = innerDialog.getChild( 5 );
- el.setStyle( 'height', ( height + body.getChild(0).$.offsetHeight ) + 'px' );
+ el.setSize( 'height', height );
};
setTimeout( fixSize, 100 );
Index: CKEditor/trunk/_source/skins/v2/skin.js
===================================================================
--- CKEditor/trunk/_source/skins/v2/skin.js (revision 6344)
+++ CKEditor/trunk/_source/skins/v2/skin.js (revision 6345)
@@ -44,21 +44,23 @@
{
var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ),
- body = innerDialog.getChild( 0 );
+ body = innerDialog.getChild( 0 ),
+ bodyWidth = body.getSize( 'width' );
+ height += body.getChild( 0 ).getSize( 'height' ) + 1;
// tc
var el = innerDialog.getChild( 2 );
- el.setStyle( 'width', ( body.$.offsetWidth ) + 'px' );
+ el.setSize( 'width', bodyWidth );
// bc
el = innerDialog.getChild( 7 );
- el.setStyle( 'width', ( body.$.offsetWidth - 28 ) + 'px' );
+ el.setSize( 'width', bodyWidth - 28 );
// ml
el = innerDialog.getChild( 4 );
- el.setStyle( 'height', ( height + body.getChild(0).$.offsetHeight ) + 'px' );
+ el.setSize( 'height', height );
// mr
el = innerDialog.getChild( 5 );
- el.setStyle( 'height', ( height + body.getChild(0).$.offsetHeight ) + 'px' );
+ el.setSize( 'height', height );
},
100 );