Fix cursor position on reply below the quote in HTML mode (#1490263)

Also other cursor position inconsistency. Additionally fixed
invisible cursor in HTML editor in older Firefox browser versions.
pull/280/head
Aleksander Machniak 9 years ago
parent 39434509cd
commit ce08e08dad

@ -11,6 +11,7 @@ CHANGELOG Roundcube Webmail
- Fix performance of rcube_db_mysql::get_variable()
- Fix missing or not up-to-date CATEGORIES entry in vCard export (#1490277)
- Fix fatal errors on systems without mbstring extension or mb_regex_encoding() function (#1490280)
- Fix cursor position on reply belowe the quote in HTML mode (#1490263)
RELEASE 1.1.0
-------------

@ -153,14 +153,17 @@ function rcube_text_editor(config, id)
window.setTimeout(function() {
window.focus(); // for WebKit (#1486674)
fe.focus();
rcmail.env.compose_focus_elem = null;
}, 10);
}
}
// set tabIndex and set focus to element that was focused before
this.tabindex(fe && fe.id == this.id);
// Trigger resize (needed for proper editor resizing in some browsers)
window.setTimeout(function() { $(window).resize(); }, 100);
window.setTimeout(function() {
// set tabIndex and set focus to element that was focused before
ref.tabindex(fe && fe.id == ref.id);
// Trigger resize (needed for proper editor resizing in some browsers)
$(window).resize();
}, 100);
};
// set tabIndex on tinymce editor
@ -168,20 +171,19 @@ function rcube_text_editor(config, id)
{
if (rcmail.env.task == 'mail' && this.editor) {
var textarea = this.editor.getElement(),
body = this.editor.getBody(),
node = this.editor.getContentAreaContainer().childNodes[0];
if (textarea && node)
node.tabIndex = textarea.tabIndex;
if (focus)
this.editor.getBody().focus();
// find :prev and :next elements to get focus when tabbing away
if (textarea.tabIndex > 0) {
var x = null,
editor = this.editor,
tabfocus_elements = [':prev',':next'],
el = tinymce.DOM.select('*[tabindex='+textarea.tabIndex+']:not(iframe)');
tinymce.each(el, function(e, i) { if (e.id == editor.id) { x = i; return false; } });
tinymce.each(el, function(e, i) { if (e.id == ref.id) { x = i; return false; } });
if (x !== null) {
if (el[x-1] && el[x-1].id) {
tabfocus_elements[0] = el[x-1].id;
@ -189,9 +191,16 @@ function rcube_text_editor(config, id)
if (el[x+1] && el[x+1].id) {
tabfocus_elements[1] = el[x+1].id;
}
editor.settings.tabfocus_elements = tabfocus_elements.join(',');
this.editor.settings.tabfocus_elements = tabfocus_elements.join(',');
}
}
// ContentEditable reset fixes invisible cursor issue in Firefox < 25
if (bw.mz && bw.vendver < 25)
$(body).prop('contenteditable', false).prop('contenteditable', true);
if (focus)
body.focus();
}
};
@ -228,10 +237,13 @@ function rcube_text_editor(config, id)
setTimeout(function() {
if (ref.editor) {
var body = $(ref.editor.getBody());
if (rcmail.env.default_font)
$(ref.editor.getBody()).css('font-family', rcmail.env.default_font);
body.css('font-family', rcmail.env.default_font);
// #1486593
ref.tabindex(true);
// put cursor on start of the compose body
ref.editor.selection.setCursorLocation(body.children().first().get(0));
}
}, 500);
};
@ -271,6 +283,7 @@ function rcube_text_editor(config, id)
data = data.replace(sig_mark, "\n" + signature.text);
input.val(data).focus();
rcmail.set_caret_pos(input.get(0), 0);
};
// convert html to text
@ -446,7 +459,7 @@ function rcube_text_editor(config, id)
// change user signature text
this.change_signature = function(id, show_sig)
{
var cursor_pos, p = -1,
var position_element, cursor_pos, p = -1,
input_message = $('#' + this.id),
message = input_message.val(),
sig = rcmail.env.identity;
@ -461,6 +474,7 @@ function rcube_text_editor(config, id)
if (p >= 0)
message = message.substring(0, p) + message.substring(p+sig.length, message.length);
}
// add the new signature string
if (show_sig && rcmail.env.signatures && rcmail.env.signatures[id]) {
sig = rcmail.env.signatures[id].text;
@ -526,6 +540,7 @@ function rcube_text_editor(config, id)
}
else {
body.appendChild(sigElem);
position_element = $(sigElem).prev();
}
}
@ -533,6 +548,15 @@ function rcube_text_editor(config, id)
sigElem.innerHTML = rcmail.env.signatures[id].html;
}
}
else if (!rcmail.env.top_posting) {
position_element = $(this.editor.getBody()).children().last();
}
// put cursor before signature and scroll the window
if (this.editor && position_element && position_element.length) {
this.editor.selection.setCursorLocation(position_element.get(0));
this.editor.getWin().scroll(0, position_element.offset().top);
}
};
// trigger content save

Loading…
Cancel
Save