Ticket #2127: 2127_2.patch
| File 2127_2.patch, 2.3 KB (added by martinkou, 22 months ago) |
|---|
-
_whatsnew.html
120 120 when FCKeditor is installed to a different domain.</li> 121 121 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2066">#2066</a>] Added a workaround for a Mac 122 122 Safari 3.1 browser bug which caused the Fit Window button to give a blank screen.</li> 123 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2127">#2127</a>] Window scrollbars are now 124 disabled when floating dialogs are being displayed.</li> 123 125 </ul> 124 126 <h3> 125 127 Version 2.6</h3> -
editor/_source/internals/fckdialog.js
26 26 var topDialog ; 27 27 var baseZIndex ; 28 28 var cover ; 29 var previousOverflow ; 30 var scrollElement ; 29 31 30 32 // The document that holds the dialog. 31 33 var topWindow = window.parent ; … … 181 183 } ) ; 182 184 FCKDomTools.SetOpacity( cover, FCKConfig.BackgroundBlockerOpacity ) ; 183 185 186 // Hide the scrollbar of the top window. 187 if ( !( FCKBrowserInfo.IsGecko || FCKBrowserInfo.IsSafari ) ) 188 { 189 scrollElement = FCKTools.IsStrictMode( topDocument ) ? topDocument.documentElement : topDocument.body ; 190 previousOverflow = scrollElement.style.overflow ; 191 var previousScroll = FCKTools.GetScrollPosition( topWindow ) ; 192 scrollElement.style.overflow = 'hidden' ; 193 scrollElement.scrollLeft = previousScroll.X ; 194 scrollElement.scrollTop = previousScroll.Y ; 195 } 196 184 197 // For IE6-, we need to fill the cover with a transparent IFRAME, 185 198 // to properly block <select> fields. 186 199 if ( FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsIE7 ) … … 226 239 var el = FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'frameElement' ) ; 227 240 el.tabIndex = el._fck_originalTabIndex ; 228 241 FCKDomTools.ClearElementJSProperty( el, '_fck_originalTabIndex' ) ; 242 243 // Restore the scrollbar of the top window to its previous state. 244 if ( !( FCKBrowserInfo.IsGecko || FCKBrowserInfo.IsSafari ) ) 245 scrollElement.style.overflow = previousOverflow ; 229 246 }, 230 247 231 248 GetCover : function()