From cdd3140fa4f7a84897d67a3aaae8ae0f85c1565f Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Tue, 3 Apr 2007 10:55:39 +0000 Subject: [PATCH] Made keyboard shortcuts (somehow) work with IE SVN revision: 1819 --- scripts/elcode.js | 33 +++++++++++++++++++++++---------- src/elogd.c | 2 +- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/scripts/elcode.js b/scripts/elcode.js index c0f209e6..e80b77c1 100755 --- a/scripts/elcode.js +++ b/scripts/elcode.js @@ -116,47 +116,60 @@ function elKeyInit() function elKeyPress(evt) { evt = (evt) ? evt : window.event; + var unicode = evt.charCode ? evt.charCode : evt.keyCode; + var actualkey = String.fromCharCode(unicode); + alert('unicode: '+ unicode); if (evt.ctrlKey && !evt.shiftKey && !evt.altKey) { - if (String.fromCharCode(evt.charCode) == "b") { + + if (browser == 'MSIE') { + if (unicode == 10) + unicode = 13; + else + unicode += 96; + actualkey = String.fromCharCode(unicode); + } + + if (actualkey == "b") { elcode(document.form1.Text, 'B',''); return false; } - if (String.fromCharCode(evt.charCode) == "i") { + if (actualkey == "i") { elcode(document.form1.Text, 'I',''); return false; } - if (String.fromCharCode(evt.charCode) == "u") { + if (actualkey == "u") { elcode(document.form1.Text, 'U',''); return false; } - if (String.fromCharCode(evt.charCode) == "c") { + if (actualkey == "o") { elcode(document.form1.Text, 'CODE',''); return false; } - if (String.fromCharCode(evt.charCode) == "t") { + if (actualkey == "t") { elcode(document.form1.Text, 'TABLE',''); return false; } - if (String.fromCharCode(evt.charCode) == "l") { + if (actualkey == "l") { elcode(document.form1.Text, 'LIST',''); return false; } - if (String.fromCharCode(evt.charCode) == "h") { + if (actualkey == "h") { queryHeading(document.form1.Text); return false; } - if (String.fromCharCode(evt.charCode) == "m") { + if (actualkey == "m") { window.open('upload.html','','top=280,left=350,width=500,height=120,dependent=yes,menubar=no,status=no,scrollbars=no,location=no,resizable=yes'); return false; } - if (String.fromCharCode(evt.charCode) == "p") { + if (actualkey == "p") { document.form1.jcmd.value = "Preview"; chkform(); cond_submit(); return false; } - if (String.fromCharCode(evt.charCode) == "s") { + + if (unicode == 13) { // return document.form1.jcmd.value = "Submit"; chkform(); cond_submit(); diff --git a/src/elogd.c b/src/elogd.c index c97f420e..19094244 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -9858,7 +9858,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL ricon("heading", loc("Insert heading CTRL+H"), "queryHeading(document.form1.Text)"); rsprintf(" "); - ricon("code", loc("Insert code CTRL+C"), "elcode(document.form1.Text, 'CODE','')"); + ricon("code", loc("Insert code CTRL+O"), "elcode(document.form1.Text, 'CODE','')"); if (show_smileys) rsprintf