github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-17 02:02:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#317: Better reply insertion intelligence

Browse Source
This commit is contained in:
Franz Liedke 2016-01-20 20:18:55 +01:00
parent 48c398df98
commit 5fa9d58062
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
extensions/mentions/js/forum/dist/extension.js vendored
View File

@ -48,9 +48,20 @@ var properties = [
]; ];
var isFirefox = window.mozInnerScreenX != null; var isBrowser = (typeof window !== 'undefined');
var isFirefox = (isBrowser && window.mozInnerScreenX != null);
function getCaretCoordinates(element, position, options) {
if(!isBrowser) {
throw new Error('textarea-caret-position#getCaretCoordinates should only be called in a browser');
}
var debug = options && options.debug || false;
if (debug) {
var el = document.querySelector('#input-textarea-caret-position-mirror-div');
if ( el ) { el.parentNode.removeChild(el); }
}
function getCaretCoordinates(element, position) {
// mirrored div // mirrored div
var div = document.createElement('div'); var div = document.createElement('div');
div.id = 'input-textarea-caret-position-mirror-div'; div.id = 'input-textarea-caret-position-mirror-div';
@ -66,7 +77,8 @@ function getCaretCoordinates(element, position) {
// position off-screen // position off-screen
style.position = 'absolute'; // required to return coordinates properly style.position = 'absolute'; // required to return coordinates properly
style.visibility = 'hidden'; // not 'display: none' because we want rendering if (!debug)
style.visibility = 'hidden'; // not 'display: none' because we want rendering
// transfer the element's properties to the div // transfer the element's properties to the div
properties.forEach(function (prop) { properties.forEach(function (prop) {
@ -84,7 +96,7 @@ function getCaretCoordinates(element, position) {
div.textContent = element.value.substring(0, position); div.textContent = element.value.substring(0, position);
// the second special handling for input type="text" vs textarea: spaces need to be replaced with non-breaking spaces - http://stackoverflow.com/a/13402035/1269037 // the second special handling for input type="text" vs textarea: spaces need to be replaced with non-breaking spaces - http://stackoverflow.com/a/13402035/1269037
if (element.nodeName === 'INPUT') if (element.nodeName === 'INPUT')
div.textContent = div.textContent.replace(/\s/g, "\u00a0"); div.textContent = div.textContent.replace(/\s/g, '\u00a0');
var span = document.createElement('span'); var span = document.createElement('span');
// Wrapping must be replicated *exactly*, including when a long word gets // Wrapping must be replicated *exactly*, including when a long word gets
@ -100,14 +112,18 @@ function getCaretCoordinates(element, position) {
left: span.offsetLeft + parseInt(computed['borderLeftWidth']) left: span.offsetLeft + parseInt(computed['borderLeftWidth'])
}; };
document.body.removeChild(div); if (debug) {
span.style.backgroundColor = '#aaa';
} else {
document.body.removeChild(div);
}
return coordinates; return coordinates;
} }
if (typeof module != "undefined" && typeof module.exports != "undefined") { if (typeof module != 'undefined' && typeof module.exports != 'undefined') {
module.exports = getCaretCoordinates; module.exports = getCaretCoordinates;
} else { } else if(isBrowser){
window.getCaretCoordinates = getCaretCoordinates; window.getCaretCoordinates = getCaretCoordinates;
} }
@ -633,7 +649,12 @@ System.register('flarum/mentions/addPostReplyAction', ['flarum/extend', 'flarum/
component.props.originalContent = mention; component.props.originalContent = mention;
} }
component.editor.insertAtCursor((component.editor.getSelectionRange()[0] > 0 ? '\n\n' : '') + (quote ? '> ' + mention + quote.trim().replace(/\n/g, '\n> ') + '\n\n' : mention)); var cursorPosition = component.editor.getSelectionRange()[0];
var precedingContent = component.editor.value().slice(0, cursorPosition);
var trailingNewlines = precedingContent.match(/(\n{0,2})$/)[0].length;
component.editor.insertAtCursor(Array(3 - trailingNewlines).join('\n') + ( // Insert up to two newlines, depending on preceding whitespace
quote ? '> ' + mention + quote.trim().replace(/\n/g, '\n> ') + '\n\n' : mention));
} }
items.add('reply', Button.component({ items.add('reply', Button.component({

6
extensions/mentions/js/forum/src/addPostReplyAction.js
View File

@ -20,8 +20,12 @@ export default function() {
component.props.originalContent = mention; component.props.originalContent = mention;
} }
const cursorPosition = component.editor.getSelectionRange()[0];
const precedingContent = component.editor.value().slice(0, cursorPosition);
const trailingNewlines = precedingContent.match(/(\n{0,2})$/)[0].length;
component.editor.insertAtCursor( component.editor.insertAtCursor(
(component.editor.getSelectionRange()[0] > 0 ? '\n\n' : '') + Array(3 - trailingNewlines).join('\n') + // Insert up to two newlines, depending on preceding whitespace
(quote (quote
? '> ' + mention + quote.trim().replace(/\n/g, '\n> ') + '\n\n' ? '> ' + mention + quote.trim().replace(/\n/g, '\n> ') + '\n\n'
: mention) : mention)