Ticket #4521: 4521_4.patch
File 4521_4.patch, 8.3 KB (added by , 14 years ago) |
---|
-
_source/skins/kama/mainui.css
6 6 .cke_skin_kama 7 7 { 8 8 display: block; 9 _display: inline-block;10 9 } 11 10 12 11 /* Main editor only settings. */ -
_source/skins/office2003/skin.js
48 48 // Fix the size of the elements which have flexible lengths. 49 49 var fixSize = function() 50 50 { 51 var content = dialog.parts.contents, 52 body = content.getParent(), 53 innerDialog = body.getParent(); 51 var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ), 52 body = innerDialog.getChild( 0 ); 54 53 55 54 // tc 56 55 var el = innerDialog.getChild( 2 ); -
_source/skins/office2003/dialog.css
15 15 margin-right: 16px; 16 16 margin-top: 2px; 17 17 margin-bottom: 20px; 18 position: relative;19 18 z-index: 1; 19 20 /* 'cke_dialog' element has been fixed positioned in all but IE6, while we 21 need it to be positioned to hold e.g. close button. */ 22 position: relative; 23 _position: static; 20 24 } 21 25 22 26 .cke_skin_office2003 .cke_dialog_tl, -
_source/plugins/dialog/plugin.js
809 809 children : contents.elements, 810 810 expand : !!contents.expand, 811 811 padding : contents.padding, 812 style : contents.style || 'width: 100%; height: 100%;'812 style : contents.style || 'width: 100%;' 813 813 }, pageHtml ); 814 814 815 815 // Create the HTML for the tab and the content block. -
_source/skins/v2/skin.js
48 48 // Fix the size of the elements which have flexible lengths. 49 49 setTimeout( function() 50 50 { 51 var content = dialog.parts.contents, 52 body = content.getParent(), 53 innerDialog = body.getParent(); 51 var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ), 52 body = innerDialog.getChild( 0 ); 54 53 55 54 // tc 56 55 var el = innerDialog.getChild( 2 ); -
_source/skins/kama/skin.js
218 218 return; 219 219 220 220 contents.setStyles( 221 ( CKEDITOR.env.ie || ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 ) ) ? // IE && FF2 222 { 223 width : width + 'px', 224 height : height + 'px' 225 } 226 : 227 { 228 // To avoid having scrollbars in the dialogs, we're 229 // (for now) using the "min-xxx" properties, for 230 // browsers which well support it (#3878). 231 'min-width' : width + 'px', 232 'min-height' : height + 'px' 233 }); 221 { 222 'width' : width + 'px', 223 'height' : height + 'px' 224 } ); 234 225 235 if ( !CKEDITOR.env.ie )236 return;237 238 226 // Fix the size of the elements which have flexible lengths. 239 227 setTimeout( function() 240 228 { 241 var body = contents.getParent(),242 innerDialog = body.getParent();229 var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ), 230 body = innerDialog.getChild( 0 ); 243 231 244 232 // tc 245 233 var el = innerDialog.getChild( 2 ); -
_source/themes/default/theme.js
102 102 '" dir="', editor.lang.dir, '"' + 103 103 ' lang="', editor.langCode, '"' + 104 104 '>' + 105 106 '<div class="cke_dialog', ' ' + CKEDITOR.env.cssClass, 105 '<table class="cke_dialog', ' ' + CKEDITOR.env.cssClass, 107 106 ' cke_', editor.lang.dir, '" style="position:absolute">' + 107 '<tr><td>' + 108 108 '<div class="%body">' + 109 109 '<div id="%title#" class="%title"></div>' + 110 110 '<div id="%close_button#" class="%close_button">' + 111 111 '<span>X</span>' + 112 112 '</div>' + 113 113 '<div id="%tabs#" class="%tabs"></div>' + 114 '<div id="%contents#" class="%contents"></div>' + 114 '<table class="%contents"><tr>' + 115 '<td id="%contents#" class="%contents"></td>' + 116 '</tr></table>' + 115 117 '<div id="%footer#" class="%footer"></div>' + 116 118 '</div>' + 117 119 '<div id="%tl#" class="%tl"></div>' + … … 122 124 '<div id="%bl#" class="%bl"></div>' + 123 125 '<div id="%bc#" class="%bc"></div>' + 124 126 '<div id="%br#" class="%br"></div>' + 125 '</div>', 127 '</td></tr>' + 128 '</table>', 126 129 127 130 //Hide the container when loading skins, later restored by skin css. 128 131 ( CKEDITOR.env.ie ? '' : '<style>.cke_dialog{visibility:hidden;}</style>' ), … … 132 135 .replace( /#/g, '_' + baseIdNumber ) 133 136 .replace( /%/g, 'cke_dialog_' ) ); 134 137 135 var body = element.getChild( [ 0, 0 ] ); 138 var body = element.getChild( [ 0, 0, 0, 0, 0 ] ), 139 title = body.getChild( 0 ), 140 close = body.getChild( 1 ); 136 141 137 142 // Make the Title and Close Button unselectable. 138 body.getChild( 0 ).unselectable();139 body.getChild( 1 ).unselectable();143 title.unselectable(); 144 close.unselectable(); 140 145 141 146 142 147 return { … … 144 149 parts : 145 150 { 146 151 dialog : element.getChild( 0 ), 147 title : body.getChild( 0 ),148 close : body.getChild( 1 ),152 title : title, 153 close : close, 149 154 tabs : body.getChild( 2 ), 150 contents : body.getChild( 3),155 contents : body.getChild( [ 3, 0, 0, 0 ] ), 151 156 footer : body.getChild( 4 ) 152 157 } 153 158 }; -
_source/skins/kama/dialog.css
18 18 -moz-border-radius: 5px; 19 19 -webkit-border-radius: 5px; 20 20 border-radius: 5px; 21 22 /* 'cke_dialog' element has been fixed positioned in all but IE6, while we 23 need it to be positioned to hold e.g. close button. */ 24 position: relative; 25 _position: static; 21 26 } 22 27 23 28 .cke_skin_kama .cke_dialog_tl, -
_source/skins/v2/dialog.css
15 15 margin-right: 16px; 16 16 margin-top: 2px; 17 17 margin-bottom: 20px; 18 position: relative;19 18 z-index: 1; 19 20 /* 'cke_dialog' element has been fixed positioned in all but IE6, while we 21 need it to be positioned to hold e.g. close button. */ 22 position: relative; 23 _position: static; 24 20 25 } 21 26 22 27 .cke_skin_v2 .cke_dialog_tl, -
_source/plugins/image/dialogs/image.js
442 442 443 443 this.getDialog().dontResetSize = true; 444 444 445 // In IE7 the dialog is being rendered improperly when loading 446 // an image with a long URL. So we need to delay it a bit. (#4122) 447 setTimeout( function() 448 { 449 field.setValue( url ); // And call this.onChange() 450 // Manually set the initial value.(#4191) 451 field.setInitValue(); 452 field.focus(); 453 }, 0 ); 445 field.setValue( url ); // And call this.onChange() 446 // Manually set the initial value.(#4191) 447 field.setInitValue(); 448 field.focus(); 454 449 } 455 450 }, 456 451 commit : function( type, element )