webapp/bookstack
webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-02 04:45:01 +03:00
Code

Fixed markdown callout tags and cursor pos

Browse Source 
Closes #470
This commit is contained in:
Dan Brown 2017-09-09 19:41:11 +01:00
parent 9ca2184f09
commit f8c046d182
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/assets/js/directives.js
View File

@ -99,7 +99,7 @@ module.exports = function (ngApp, events) {
extraKeys[`${metaKey}-7`] = function(cm) {wrapSelection('\n```\n', '\n```');}; extraKeys[`${metaKey}-7`] = function(cm) {wrapSelection('\n```\n', '\n```');};
extraKeys[`${metaKey}-8`] = function(cm) {wrapSelection('`', '`');}; extraKeys[`${metaKey}-8`] = function(cm) {wrapSelection('`', '`');};
extraKeys[`Shift-${metaKey}-E`] = function(cm) {wrapSelection('`', '`');}; extraKeys[`Shift-${metaKey}-E`] = function(cm) {wrapSelection('`', '`');};
extraKeys[`${metaKey}-9`] = function(cm) {wrapSelection('<p class="callout info">', '</div>');}; extraKeys[`${metaKey}-9`] = function(cm) {wrapSelection('<p class="callout info">', '</p>');};
cm.setOption('extraKeys', extraKeys); cm.setOption('extraKeys', extraKeys);
// Update data on content change // Update data on content change
@ -193,12 +193,13 @@ module.exports = function (ngApp, events) {
} }
cm.replaceRange(newLineContent, {line: cursor.line, ch: 0}, {line: cursor.line, ch: lineLen}); cm.replaceRange(newLineContent, {line: cursor.line, ch: 0}, {line: cursor.line, ch: lineLen});
cm.setCursor({line: cursor.line, ch: cursor.ch + (newLineContent.length - lineLen)}); cm.setCursor({line: cursor.line, ch: cursor.ch + start.length});
} }
function wrapSelection(start, end) { function wrapSelection(start, end) {
let selection = cm.getSelection(); let selection = cm.getSelection();
if (selection === '') return wrapLine(start, end); if (selection === '') return wrapLine(start, end);
let newSelection = selection; let newSelection = selection;
let frontDiff = 0; let frontDiff = 0;
let endDiff = 0; let endDiff = 0;