From c2df5d4e13e9ab63e8f152d638eec35284efdf2f Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 09 Mar 2015 09:24:05 -0400
Subject: [PATCH] Unified request* event arguments handling, added support for _unlock and _action parameters
---
program/js/editor.js | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index 3dac5f3..829373a 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -36,12 +36,13 @@
function rcube_text_editor(config, id)
{
var ref = this,
+ abs_url = location.href.replace(/[?#].*$/, '').replace(/\/$/, ''),
conf = {
selector: '#' + ($('#' + id).is('.mce_editor') ? id : 'fake-editor-id'),
cache_suffix: 's=4010700',
theme: 'modern',
language: config.lang,
- content_css: 'program/js/tinymce/roundcube/content.css',
+ content_css: rcmail.assets_path('program/js/tinymce/roundcube/content.css'),
menubar: false,
statusbar: false,
toolbar_items_size: 'small',
@@ -83,7 +84,7 @@
toolbar: 'bold italic underline | alignleft aligncenter alignright alignjustify'
+ ' | bullist numlist outdent indent ltr rtl blockquote | forecolor backcolor | fontselect fontsizeselect'
+ ' | link unlink table | emoticons charmap image media | code searchreplace undo redo',
- spellchecker_rpc_url: '../../../../../?_task=utils&_action=spell_html&_remote=1',
+ spellchecker_rpc_url: abs_url + '/?_task=utils&_action=spell_html&_remote=1',
spellchecker_language: rcmail.env.spell_lang,
accessibility_focus: false,
file_browser_callback: function(name, url, type, win) { ref.file_browser_callback(name, url, type); },
@@ -152,14 +153,17 @@
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
@@ -167,20 +171,19 @@
{
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;
@@ -188,9 +191,16 @@
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();
}
};
@@ -212,8 +222,10 @@
content = input.val();
// replace current text signature with temp mark
- if (is_sig)
- content = content.replace(signature.text, sig_mark);
+ if (is_sig) {
+ content = content.replace(/\r\n/, "\n");
+ content = content.replace(signature.text.replace(/\r\n/, "\n"), sig_mark);
+ }
var init_editor = function(data) {
// replace signature mark with html version of the signature
@@ -225,10 +237,13 @@
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);
};
@@ -268,6 +283,7 @@
data = data.replace(sig_mark, "\n" + signature.text);
input.val(data).focus();
+ rcmail.set_caret_pos(input.get(0), 0);
};
// convert html to text
@@ -443,7 +459,7 @@
// 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;
@@ -458,6 +474,7 @@
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;
@@ -523,6 +540,7 @@
}
else {
body.appendChild(sigElem);
+ position_element = $(sigElem).prev();
}
}
@@ -530,6 +548,15 @@
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
--
Gitblit v1.9.1