Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-14 20:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed problem with init_resize and plain text with restricted message height, thanks to Richard S

Browse Source 
SVN revision: 2249
This commit is contained in:
Stefan Ritt 2009-08-05 11:36:01 +00:00
parent aeab8c87a6
commit c1dd234192
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/elogd.c
View File

@ -9798,30 +9798,28 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf(" document.form1.submit();\n"); rsprintf(" document.form1.submit();\n");
rsprintf("}\n\n"); rsprintf("}\n\n");
if (enc_selected != 2) { if (enc_selected != 2 && !getcfg(lbs->name, "Message height", str, sizeof(str)) &&
if (!getcfg(lbs->name, "Message height", str, sizeof(str)) && !getcfg(lbs->name, "Message width", str, !getcfg(lbs->name, "Message width", str, sizeof(str))) {
sizeof(str))) { /* javascript for resizing edit box */
/* javascript for resizing edit box */ rsprintf("\nfunction init_resize()\n");
rsprintf("\nfunction init_resize()\n"); rsprintf("{\n");
rsprintf("{\n"); rsprintf(" window.onresize = resize_textarea;\n");
rsprintf(" window.onresize = resize_textarea;\n"); rsprintf(" resize_textarea();\n");
rsprintf(" resize_textarea();\n"); rsprintf("}\n\n");
rsprintf("}\n\n"); rsprintf("function resize_textarea()\n");
rsprintf("function resize_textarea()\n"); rsprintf("{\n");
rsprintf("{\n"); rsprintf(" p = document.form1.Text;\n");
rsprintf(" p = document.form1.Text;\n"); rsprintf(" t = p.offsetTop;\n");
rsprintf(" t = p.offsetTop;\n"); rsprintf(" while (p = p.offsetParent)\n");
rsprintf(" while (p = p.offsetParent)\n"); rsprintf(" t += p.offsetTop;\n");
rsprintf(" t += p.offsetTop;\n"); rsprintf(" if (window.innerHeight) // netscape\n");
rsprintf(" if (window.innerHeight) // netscape\n"); rsprintf(" height = window.innerHeight - t - 135;\n");
rsprintf(" height = window.innerHeight - t - 135;\n"); rsprintf(" else // IE\n");
rsprintf(" else // IE\n"); rsprintf(" height = document.body.offsetHeight - t - 135;\n");
rsprintf(" height = document.body.offsetHeight - t - 135;\n"); rsprintf(" if (height < 300)\n");
rsprintf(" if (height < 300)\n"); rsprintf(" height = 300;\n");
rsprintf(" height = 300;\n"); rsprintf(" document.form1.Text.style.height = height;\n");
rsprintf(" document.form1.Text.style.height = height;\n"); rsprintf("}\n\n");
rsprintf("}\n\n");
}
} }
/* strings for elcode.js */ /* strings for elcode.js */
@ -9911,9 +9909,8 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
strcpy(script_onload, "document.form1.Text.focus();"); strcpy(script_onload, "document.form1.Text.focus();");
if (enc_selected == 0) { if (enc_selected == 0) {
if (!getcfg(lbs->name, "Message height", str, sizeof(str)) && !getcfg(lbs->name, "Message width", str, if (!getcfg(lbs->name, "Message height", str, sizeof(str)) &&
sizeof(str))) { !getcfg(lbs->name, "Message width", str, sizeof(str))) {
strcat(script_onload, "elKeyInit();init_resize();"); strcat(script_onload, "elKeyInit();init_resize();");
strcat(script_onfocus, "elKeyInit();"); strcat(script_onfocus, "elKeyInit();");
} else } else
@ -9921,8 +9918,11 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
strcat(script_onfocus, "elKeyInit();"); strcat(script_onfocus, "elKeyInit();");
} else if (enc_selected == 2 && fckedit_exist) { } else if (enc_selected == 2 && fckedit_exist) {
strcat(script_onload, "initFCKedit();"); strcat(script_onload, "initFCKedit();");
} else } else if (enc_selected == 1) {
strcat(script_onload, "init_resize();"); if (!getcfg(lbs->name, "Message height", str, sizeof(str)) &&
!getcfg(lbs->name, "Message width", str, sizeof(str)))
strcat(script_onload, "init_resize();");
}
script_onunload[0] = 0; script_onunload[0] = 0;
if (getcfg(lbs->name, "Use Lock", str, sizeof(str)) && atoi(str) == 1) if (getcfg(lbs->name, "Use Lock", str, sizeof(str)) && atoi(str) == 1)