mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

htmlarea: Fix fullscreen editor on IE6/7 -- MDL-11242

Browse Source 
Only say px if the width is a pure number. Under IE we
get the "100%" for the width of the editor, so blindly
appending "px" results in a JS execution error.

With this patch we only attach px if it's a pure int.

Also tested the sizing of HTMLArea in the messaging
window. So both should be working now.
This commit is contained in:
martinlanghoff 2007-11-12 04:13:24 +00:00
parent 914ea0028a
commit 755a625d95
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/editor/htmlarea/htmlarea.php
View File

@ -807,12 +807,18 @@ HTMLArea.prototype.generate = function () {
var width = (this.config.width == "auto" ? (this._toolbar.offsetWidth) : this.config.width);
// width = Math.max(parseInt(width), 598);
width = String(width);
if (width.match(/^\d+$/)) { // is this a pure int? if so, let it be in px
width=width+"px";
}
if (!HTMLArea.is_ie) {
height -= 2;
width -= 2;
}
iframe.style.width = width + "px";
iframe.style.width = width;
if (this.config.sizeIncludesToolbar) {
// substract toolbar height
height -= this._toolbar.offsetHeight;