Skip to content

fix(composer): make toolbar formatting undoable with Ctrl+Z #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
palmoni5 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(composer): make toolbar formatting undoable with Ctrl+Z #178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 48 additions & 27 deletions static/lib/composer/controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,36 @@
define('composer/controls', ['composer/preview'], function (preview) {
const controls = {};

// Replaces the text between `start` and `end` with `text`. Prefers the
// browser's native insertion command so that the change is recorded in the
// textarea's undo history (Ctrl/Cmd+Z), and falls back to a direct value
// update when that is unavailable.
function replaceRange(textarea, start, end, text) {
textarea.focus();
textarea.setSelectionRange(start, end);

if (text && typeof document.execCommand === 'function') {
let inserted;
try {
inserted = document.execCommand('insertText', false, text);
} catch (e) {
inserted = false;
}
if (inserted && textarea.value.slice(start, start + text.length) === text) {
return;
}
// the command may have been ignored; make sure the selection was not changed
textarea.setSelectionRange(start, end);
}

if (typeof textarea.setRangeText === 'function') {
textarea.setRangeText(text, start, end, 'end');
} else {
const currentVal = textarea.value;
textarea.value = currentVal.slice(0, start) + text + currentVal.slice(end);
}
}

/** ********************************************** */
/* Rich Textarea Controls */
/** ********************************************** */
Expand All @@ -19,14 +49,13 @@ define('composer/controls', ['composer/preview'], function (preview) {
return;
}

const $textarea = $(payload.textarea);
const currentVal = $textarea.val();
const postContainer = $textarea.parents('[component="composer"]');
const postContainer = $(payload.textarea).parents('[component="composer"]');

$textarea.val(
currentVal.slice(0, payload.textarea.selectionStart) +
payload.value +
currentVal.slice(payload.textarea.selectionStart)
replaceRange(
payload.textarea,
payload.textarea.selectionStart,
payload.textarea.selectionStart,
payload.value
);

preview.render(postContainer);
Expand All @@ -45,14 +74,13 @@ define('composer/controls', ['composer/preview'], function (preview) {
return;
}

const $textarea = $(payload.textarea);
const currentVal = $textarea.val();
const postContainer = $textarea.parents('[component="composer"]');
const postContainer = $(payload.textarea).parents('[component="composer"]');

$textarea.val(
currentVal.slice(0, payload.textarea.selectionStart) +
payload.value +
currentVal.slice(payload.textarea.selectionEnd)
replaceRange(
payload.textarea,
payload.textarea.selectionStart,
payload.textarea.selectionEnd,
payload.value
);

preview.render(postContainer);
Expand All @@ -76,25 +104,18 @@ define('composer/controls', ['composer/preview'], function (preview) {
trailing = leading;
}

const $textarea = $(textarea);
const currentVal = $textarea.val();
const start = textarea.selectionStart;
const end = textarea.selectionEnd;
const selection = textarea.value.slice(start, end);

let matches = /^(\s*)([\s\S]*?)(\s*)$/.exec(currentVal.slice(textarea.selectionStart, textarea.selectionEnd));
let matches = /^(\s*)([\s\S]*?)(\s*)$/.exec(selection);

if (!matches[2]) {
// selection is entirely whitespace
matches = [null, '', currentVal.slice(textarea.selectionStart, textarea.selectionEnd), ''];
matches = [null, '', selection, ''];
}

$textarea.val(
currentVal.slice(0, textarea.selectionStart) +
matches[1] +
leading +
matches[2] +
trailing +
matches[3] +
currentVal.slice(textarea.selectionEnd)
);
replaceRange(textarea, start, end, matches[1] + leading + matches[2] + trailing + matches[3]);

return [matches[1].length, matches[3].length];
};
Expand Down