Ticket #3174: 3174_4.patch
File 3174_4.patch, 3.1 KB (added by , 15 years ago) |
---|
-
_source/plugins/floatpanel/plugin.js
173 173 } 174 174 175 175 if ( !CKEDITOR.env.gecko || panel.isLoaded ) 176 setHeight(); 176 { 177 // IE7 needs some time (setting the delay to 0ms won't work) to refresh 178 // the scrollHeight. (#3174) 179 if ( CKEDITOR.env.ie && CKEDITOR.env.version >= 7 ) 180 setTimeout( setHeight, 50 ); 181 else 182 setHeight(); 183 } 177 184 else 178 185 panel.onLoad = setHeight; 179 186 } -
_source/plugins/panel/plugin.js
131 131 className = parentDiv.getParent().getAttribute( 'class' ), 132 132 doc = iframe.getFrameDocument(); 133 133 134 var win = doc.getWindow(); 135 136 win.on( 'load', function( ev ) 137 { 138 if( CKEDITOR.env.ff2 ) 139 { 140 for ( var i = 0 ; i < this.css.length ; i++ ) 141 doc.appendStyleSheet( this.css[ i ] ); 142 } 143 144 // TODO: Examine stylesheet ready state instead of hard-coded timeout. 145 CKEDITOR.tools.setTimeout( function() 146 { 147 this.isLoaded = true; 148 if ( this.onLoad ) 149 this.onLoad(); 150 }, CKEDITOR.env.ff2 ? 100 : 0, this ); 151 }, 152 this ); 153 134 154 // Initialize the IFRAME document body. 135 155 doc.$.open(); 136 156 … … 142 162 '<!DOCTYPE html>' + 143 163 '<html dir="' + dir + '" class="' + className + '_container">' + 144 164 '<head>' + 145 '<link type="text/css" rel=stylesheet href="' + this.css.join( '"><link type="text/css" rel="stylesheet" href="' ) + '">' + 165 // Styles loading come later for Firefox 2 166 ( !CKEDITOR.env.ff2 ? '<link type="text/css" rel=stylesheet href="' 167 + this.css.join( '"><link type="text/css" rel="stylesheet" href="' ) + '">' : '' )+ 146 168 '<style>.' + className + '_container{visibility:hidden}</style>' + 147 169 '</head>' + 148 170 '<body class="cke_' + dir + ' cke_panel_frame" style="margin:0;padding:0">' + 149 171 '</body>' + 150 172 '<\/html>' ); 151 173 doc.$.close(); 152 153 var win = doc.getWindow(); 154 174 155 175 // Register the CKEDITOR global. 156 176 win.$.CKEDITOR = CKEDITOR; 157 177 158 win.on( 'load', function( ev )159 {160 this.isLoaded = true;161 if ( this.onLoad )162 this.onLoad();163 },164 this);165 166 178 doc.on( 'keydown', function( evt ) 167 179 { 168 180 var keystroke = evt.data.getKeystroke(); -
_source/core/env.js
115 115 geckoRelease = geckoRelease[1].split( '.' ); 116 116 version = geckoRelease[0] * 10000 + ( geckoRelease[1] || 0 ) * 100 + ( geckoRelease[2] || 0 ) * 1; 117 117 } 118 119 env.ff2 = version < 109000; 118 120 } 119 121 120 122 // Opera 9.50+