Ticket #3545: 3545.patch
File 3545.patch, 5.5 KB (added by , 15 years ago) |
---|
-
_source/skins/office2003/menu.css
5 5 6 6 .cke_skin_office2003 .cke_contextmenu 7 7 { 8 8 padding: 2px; 9 9 } 10 10 11 11 .cke_skin_office2003 .cke_menuitem a … … 71 71 margin-left: 28px; 72 72 background-color: #fff; 73 73 _overflow: hidden; 74 _width: 8 6px;74 _width: 80px; 75 75 } 76 76 77 77 .cke_rtl .cke_skin_office2003 .cke_menuitem .cke_label -
_source/plugins/menu/plugin.js
153 153 element = this._.element = block.element; 154 154 element.addClass( editor.skinClass ); 155 155 element.getDocument().getBody().setStyle( 'overflow', 'hidden' ); 156 element.getDocument().getElementsByTag('html').getItem(0).setStyle( 'overflow', 'hidden' ); 156 157 157 158 this._.itemOverFn = CKEDITOR.tools.addFunction( function( index ) 158 159 { -
_source/skins/v2/menu.css
5 5 6 6 .cke_skin_v2 .cke_contextmenu 7 7 { 8 8 padding: 2px; 9 9 } 10 10 11 11 .cke_skin_v2 .cke_menuitem a … … 71 71 margin-left: 28px; 72 72 background-color: #fff; 73 73 _overflow: hidden; 74 _width: 8 6px;74 _width: 80px; 75 75 } 76 76 77 77 .cke_rtl .cke_skin_v2 .cke_menuitem .cke_label -
_source/plugins/floatpanel/plugin.js
211 211 iframe.setAttribute( 'title', ' ' ); 212 212 } 213 213 } 214 iframe.$.contentWindow.focus(); 214 if ( CKEDITOR.env.ie && CKEDITOR.env.quirks ) 215 iframe.$.focus(); 216 else 217 iframe.$.contentWindow.focus(); 215 218 }, 0); 216 219 }, 0); 217 220 -
_source/core/dom/element.js
1 /*1 /* 2 2 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. 3 3 For licensing, see LICENSE.html or http://ckeditor.com/license 4 4 */ … … 1088 1088 1089 1089 getDocumentPosition : function( refDocument ) 1090 1090 { 1091 var x = 0, y = 0, current = this, previous = null; 1092 while ( current && !( current.getName() == 'body' || current.getName() == 'html' ) ) 1093 { 1094 x += current.$.offsetLeft - current.$.scrollLeft; 1095 y += current.$.offsetTop - current.$.scrollTop; 1091 var x = 0, y = 0, 1092 body = this.getDocument().getBody(); 1093 if ( document.documentElement["getBoundingClientRect"] ) { 1094 var box = this.$.getBoundingClientRect(), 1095 doc = this.getDocument().$, 1096 docElem = doc.documentElement, 1097 clientTop = docElem.clientTop || body.$.clientTop || 0, 1098 clientLeft = docElem.clientLeft || body.$.clientLeft || 0; 1099 1100 x = box.left + (!CKEDITOR.env.quirks && docElem.scrollLeft || body.$.scrollLeft); 1101 x -= clientLeft; 1102 y = box.top + (!CKEDITOR.env.quirks && docElem.scrollTop || body.$.scrollTop ); 1103 y -= clientTop; 1104 } 1105 else 1106 { 1107 var current = this, previous = null; 1108 while ( current && !( current.getName() == 'body' || current.getName() == 'html' ) ) 1109 { 1110 x += current.$.offsetLeft - current.$.scrollLeft; 1111 y += current.$.offsetTop - current.$.scrollTop; 1096 1112 1097 if ( !CKEDITOR.env.opera )1098 {1099 // Opera includes clientTop|Left into offsetTop|Left.1100 if ( !current.equals( this ) )1101 {1102 x += ( current.$.clientLeft || 0 );1103 y += ( current.$.clientTop || 0 );1104 }1113 if ( !CKEDITOR.env.opera ) 1114 { 1115 // Opera includes clientTop|Left into offsetTop|Left. 1116 if ( !current.equals( this ) ) 1117 { 1118 x += ( current.$.clientLeft || 0 ); 1119 y += ( current.$.clientTop || 0 ); 1120 } 1105 1121 1106 var scrollElement = previous;1107 while ( scrollElement && !scrollElement.equals( current ) )1108 {1109 x -= scrollElement.$.scrollLeft;1110 y -= scrollElement.$.scrollTop;1111 scrollElement = scrollElement.getParent();1112 }1113 }1122 var scrollElement = previous; 1123 while ( scrollElement && !scrollElement.equals( current ) ) 1124 { 1125 x -= scrollElement.$.scrollLeft; 1126 y -= scrollElement.$.scrollTop; 1127 scrollElement = scrollElement.getParent(); 1128 } 1129 } 1114 1130 1115 previous = current; 1116 current = new CKEDITOR.dom.element( current.$.offsetParent ); 1117 } 1131 previous = current; 1132 current = new CKEDITOR.dom.element( current.$.offsetParent ); 1133 } 1134 } 1118 1135 1119 1136 if ( refDocument ) 1120 1137 { 1121 var currentWindow = current.getWindow(),1138 var currentWindow = this.getWindow(), 1122 1139 refWindow = refDocument.getWindow(); 1123 1140 1124 1141 if ( !currentWindow.equals( refWindow ) && currentWindow.$.frameElement ) … … 1130 1147 } 1131 1148 } 1132 1149 1133 var body = this.getDocument().getBody();1134 1135 1150 // document.body is a special case when it comes to offsetTop and offsetLeft 1136 1151 // values. 1137 1152 // 1. It does not matter if we're in IE Quirks mode - in this case body is