Merge pull request #9 from github/ol-selection

OrderedList fixes

Author: muan

index.js

@@ -480,16 +480,31 @@ function multilineStyle(textarea: HTMLTextAreaElement, arg: StyleArgs) {
 
 function orderedList(textarea: HTMLTextAreaElement): SelectionRange {
   const orderedListRegex = /^\d+\.\s+/
+  const noInitialSelection = textarea.selectionStart === textarea.selectionEnd
   let selectionEnd
   let selectionStart
   let text = textarea.value.slice(textarea.selectionStart, textarea.selectionEnd)
+  let textToUnstyle = text
   let lines = text.split('\n')
-
-  const undoStyling = lines.every(line => orderedListRegex.test(line))
+  let startOfLine, endOfLine
+  if (noInitialSelection) {
+    const linesBefore = textarea.value.slice(0, textarea.selectionStart).split(/\n/)
+    startOfLine = textarea.selectionStart - linesBefore[linesBefore.length - 1].length
+    endOfLine = wordSelectionEnd(textarea.value, textarea.selectionStart, true)
+    textToUnstyle = textarea.value.slice(startOfLine, endOfLine)
+  }
+  const linesToUnstyle = textToUnstyle.split('\n')
+  const undoStyling = linesToUnstyle.every(line => orderedListRegex.test(line))
 
   if (undoStyling) {
-    lines = lines.map(line => line.replace(orderedListRegex, ''))
+    lines = linesToUnstyle.map(line => line.replace(orderedListRegex, ''))
     text = lines.join('\n')
+    if (noInitialSelection && startOfLine && endOfLine) {
+      const lengthDiff = linesToUnstyle[0].length - lines[0].length
+      selectionStart = selectionEnd = textarea.selectionStart - lengthDiff
+      textarea.selectionStart = startOfLine
+      textarea.selectionEnd = endOfLine
+    }
   } else {
     lines = (function() {
       let i
@@ -506,6 +521,7 @@ function orderedList(textarea: HTMLTextAreaElement): SelectionRange {
     const {newlinesToAppend, newlinesToPrepend} = newlinesToSurroundSelectedText(textarea)
     selectionStart = textarea.selectionStart + newlinesToAppend.length
     selectionEnd = selectionStart + text.length
+    if (noInitialSelection) selectionStart = selectionEnd
     text = newlinesToAppend + text + newlinesToPrepend
   }
 

test/test.js

@@ -398,7 +398,19 @@ describe('markdown-toolbbar-element', function() {
       it('creates ordered list without selection', function() {
         setVisualValue('apple\n|pear\nbanana\n')
         clickToolbar('md-ordered-list')
-        assert.equal('apple\n\n|1. |\n\npear\nbanana\n', visualValue())
+        assert.equal('apple\n\n1. |\n\npear\nbanana\n', visualValue())
+      })
+
+      it('undo an ordered list without selection', function() {
+        setVisualValue('apple\n1. |pear\nbanana\n')
+        clickToolbar('md-ordered-list')
+        assert.equal('apple\n|pear\nbanana\n', visualValue())
+      })
+
+      it('undo an ordered list without selection and puts cursor at the right position', function() {
+        setVisualValue('apple\n1. pea|r\nbanana\n')
+        clickToolbar('md-ordered-list')
+        assert.equal('apple\npea|r\nbanana\n', visualValue())
       })
 
       it('creates ordered list by selecting one line', function() {