chore(trim): use consistent whitespaces

Author: gabrielhase

spec/selection.spec.js

@@ -406,6 +406,17 @@ describe('Selection', function () {
       const html = getHtml(underlineTags[0])
       expect(html).to.equal('<u class="bar"> foobar </u>')
     })
+
+    it('trims a range with special whitespaces', function () {
+      // at the beginning we have U+2002, U+2005 and U+2006 in the end a normal whitespace
+      const wordWithSpecialWhitespaces = createElement('<div>   bar </div>')
+      const range = rangy.createRange()
+      range.selectNodeContents(wordWithSpecialWhitespaces.firstChild)
+      const selection = new Selection(wordWithSpecialWhitespaces, range)
+      selection.trimRange()
+      expect(selection.range.startOffset).to.equal(3)
+      expect(selection.range.endOffset).to.equal(6)
+    })
   })
 
   describe('inherits form Cursor', function () {

src/selection.js

@@ -87,16 +87,17 @@ export default class Selection extends Cursor {
         link.setAttribute(key, value)
       }
     }
-    if (config.linkMarkup.trim) this.trimRangeWhitespaces()
+    if (config.linkMarkup.trim) this.trimRange()
 
     this.forceWrap(link)
   }
 
   // trims whitespaces on the left and right of a selection, i.e. what you want in case of links
-  trimRangeWhitespaces () {
+  trimRange () {
     const textToLink = this.range.toString()
     const whitespacesOnTheLeft = textToLink.search(/\S|$/)
-    const whitespacesOnTheRight = textToLink.length - whitespacesOnTheLeft - textToLink.trim().length
+    const lastNonWhitespace = textToLink.search(/\S[\s]+$/)
+    const whitespacesOnTheRight = lastNonWhitespace === -1 ? 0 : textToLink.length - (lastNonWhitespace + 1)
     this.range.setStart(this.range.startContainer, this.range.startOffset + whitespacesOnTheLeft)
     this.range.setEnd(this.range.endContainer, this.range.endOffset - whitespacesOnTheRight)
   }
@@ -160,37 +161,37 @@ export default class Selection extends Cursor {
 
   makeBold () {
     const bold = this.createElement(config.boldMarkup.name, config.boldMarkup.attribs)
-    if (config.boldMarkup.trim) this.trimRangeWhitespaces()
+    if (config.boldMarkup.trim) this.trimRange()
     this.forceWrap(bold)
   }
 
   toggleBold () {
     const bold = this.createElement(config.boldMarkup.name, config.boldMarkup.attribs)
-    if (config.boldMarkup.trim) this.trimRangeWhitespaces()
+    if (config.boldMarkup.trim) this.trimRange()
     this.toggle(bold)
   }
 
   giveEmphasis () {
     const em = this.createElement(config.italicMarkup.name, config.italicMarkup.attribs)
-    if (config.italicMarkup.trim) this.trimRangeWhitespaces()
+    if (config.italicMarkup.trim) this.trimRange()
     this.forceWrap(em)
   }
 
   toggleEmphasis () {
     const em = this.createElement(config.italicMarkup.name, config.italicMarkup.attribs)
-    if (config.italicMarkup.trim) this.trimRangeWhitespaces()
+    if (config.italicMarkup.trim) this.trimRange()
     this.toggle(em)
   }
 
   makeUnderline () {
     const u = this.createElement(config.underlineMarkup.name, config.underlineMarkup.attribs)
-    if (config.underlineMarkup.trim) this.trimRangeWhitespaces()
+    if (config.underlineMarkup.trim) this.trimRange()
     this.forceWrap(u)
   }
 
   toggleUnderline () {
     const u = this.createElement(config.underlineMarkup.name, config.underlineMarkup.attribs)
-    if (config.underlineMarkup.trim) this.trimRangeWhitespaces()
+    if (config.underlineMarkup.trim) this.trimRange()
     this.toggle(u)
   }