Merge branch 'keep-polling' into reedsy

config/grunt/dist.coffee

@@ -67,7 +67,7 @@ module.exports = (grunt) ->
       modifier: 'modern'
       include: [
         'difference', 'intersection', 'last'
-        'all', 'each', 'find', 'invoke', 'map', 'reduce'
+        'all', 'each', 'find', 'invoke', 'map', 'reduce', 'partition',
         'bind', 'defer', 'partial'
         'clone', 'extend', 'defaults', 'omit', 'values'
         'isElement', 'isEqual', 'isFunction', 'isNumber', 'isObject', 'isString'

src/core/editor.coffee

@@ -18,19 +18,25 @@ class Editor
     @delta = @doc.toDelta()
     @length = @delta.length()
     @selection = new Selection(@doc, @quill)
-    @timer = setInterval(_.bind(this.checkUpdate, this), @options.pollInterval)
+    @startPolling()
     @savedRange = null;
     @quill.on("selection-change", (range) =>
       @savedRange = range
     )
     this.enable() unless @options.readOnly
 
   destroy: ->
-    clearInterval(@timer)
+    @stopPolling()
 
   disable: ->
     this.enable(false)
 
+  startPolling: ->
+    @timer = setInterval(_.bind(this.checkUpdate, this), @options.pollInterval)
+
+  stopPolling: ->
+    clearInterval(@timer)
+
   enable: (enabled = true) ->
     @root.setAttribute('contenteditable', enabled)
 
@@ -67,7 +73,7 @@ class Editor
       @quill.emit(@quill.constructor.events.TEXT_CHANGE, localDelta, Editor.sources.USER)
 
   checkUpdate: (source = 'user') ->
-    return clearInterval(@timer) unless @root.parentNode?
+    return @stopPolling() unless @root.parentNode?
     delta = this._update()
     if delta
       @delta = @delta.compose(delta)

src/core/line.coffee

@@ -111,7 +111,8 @@ class Line extends LinkedList.Node
     [leaf, leafOffset] = this.findLeafAt(offset)
     node = _.reduce(formats, (node, value, name) =>
       format = @doc.formats[name]
-      node = format.add(node, value) if format?
+      if format? and !format.isType(Format.types.LINE)
+        node = format.add(node, value)
       return node
     , node)
     [prevNode, nextNode] = dom(leaf.node).split(leafOffset)

src/core/selection.coffee

@@ -42,6 +42,20 @@ class Selection
     else
       fn()
 
+  scrollIntoView: () ->
+    return unless @range
+    editor = @emitter.editor
+    startBounds = editor.getBounds(@range.start)
+    endBounds = if @range.isCollapsed() then startBounds else editor.getBounds(@range.end)
+    containerBounds = editor.root.parentNode.getBoundingClientRect()
+    containerHeight = containerBounds.bottom - containerBounds.top
+    if containerHeight < endBounds.top + endBounds.height
+      [line, offset] = editor.doc.findLineAt(@range.end)
+      line.node.scrollIntoView(false)
+    else if startBounds.top < 0
+      [line, offset] = editor.doc.findLineAt(@range.start)
+      line.node.scrollIntoView()
+
   setRange: (range, source) ->
     if range?
       [startNode, startOffset] = this._indexToPosition(range.start)

src/modules/keyboard.coffee

@@ -30,6 +30,19 @@ class Keyboard
       @hotkeys[which].push(hotkey)
     )
 
+  removeHotkeys: (hotkey, callback) ->
+    hotkey = if _.isString(hotkey) then hotkey.toUpperCase() else hotkey
+    hotkey = if Keyboard.hotkeys[hotkey] then Keyboard.hotkeys[hotkey] else hotkey
+    hotkey = if _.isObject(hotkey) then hotkey else { key: hotkey }
+    which = if _.isNumber(hotkey.key) then hotkey.key else hotkey.key.charCodeAt(0)
+    @hotkeys[which] ?= []
+    [removed, kept] = _.partition(@hotkeys[which], (handler) ->
+      _.isEqual(hotkey, _.omit(handler, 'callback')) and
+        (!callback or callback == handler.callback)
+    )
+    @hotkeys[which] = kept
+    return _.map(removed, 'callback')
+
   toggleFormat: (range, format) ->
     if range.isCollapsed()
       delta = @quill.getContents(Math.max(0, range.start-1), range.end)
@@ -60,6 +73,7 @@ class Keyboard
         @toolbar.setActive(format, value) if @toolbar?
         return
       )
+      @quill.editor.selection.scrollIntoView()
       return false
     )
 
@@ -78,6 +92,7 @@ class Keyboard
               @quill.deleteText(range.start - 1, range.start, Quill.sources.USER)
           else if range.start < @quill.getLength() - 1
             @quill.deleteText(range.start, range.start + 1, Quill.sources.USER)
+      @quill.editor.selection.scrollIntoView()
       return false
     )
 
@@ -92,7 +107,7 @@ class Keyboard
     )
     _.each(['bold', 'italic', 'underline'], (format) =>
       this.addHotkey(Keyboard.hotkeys[format.toUpperCase()], (range) =>
-        if (@quill.options.formats.indexOf(format) > -1)
+        if (@quill.editor.doc.formats[format])
           this.toggleFormat(range, format)
         return false
       )

src/modules/multi-cursor.coffee

@@ -61,8 +61,12 @@ class MultiCursor extends EventEmitter2
 
   shiftCursors: (index, length, authorId = null) ->
     _.each(@cursors, (cursor, id) =>
-      return unless cursor and (cursor.index > index or cursor.userId == authorId)
-      cursor.index += Math.max(length, index - cursor.index)
+      return unless cursor
+      shift = Math.max(length, index - cursor.index)
+      if cursor.userId == authorId
+        this.moveCursor(authorId, cursor.index + shift)
+      else if cursor.index > index
+        cursor.index += shift
     )
 
   update: ->

src/modules/paste-manager.coffee

@@ -11,6 +11,7 @@ class PasteManager
   constructor: (@quill, options) ->
     @container = @quill.addContainer('ql-paste-manager')
     @container.setAttribute('contenteditable', true)
+    @container.setAttribute('tabindex', '-1')
     dom(@quill.root).on('paste', _.bind(this._paste, this))
     @options = _.defaults(options, PasteManager.DEFAULTS)
     @options.onConvert ?= this._onConvert;
@@ -38,10 +39,7 @@ class PasteManager
         @quill.updateContents(delta, 'user')
       @quill.setSelection(range.start + lengthAdded, range.start + lengthAdded)
       # Make sure bottom of pasted content is visible
-      [line, offset] = @quill.editor.doc.findLineAt(range.start + lengthAdded)
-      lineBottom = line.node.getBoundingClientRect().bottom
-      windowBottom = document.documentElement.clientHeight
-      line.node.scrollIntoView(false) if lineBottom > windowBottom
+      @quill.editor.selection.scrollIntoView()
       @container.innerHTML = ""
     )
 

test/unit/core/line.coffee

@@ -345,6 +345,10 @@ describe('Line', ->
         initial: '<b>01</b>'
         expected: '<b>0</b><img src="http://quilljs.com/images/cloud.png"><b>1</b>'
         offset: 1, formats: { image: 'http://quilljs.com/images/cloud.png' }
+      'line formats ignored':
+        initial: 'ab'
+        expected: 'a<b>|</b>b'
+        offset: 1, formats: { list: true, bold: true }
 
     _.each(tests, (test, name) ->
       it(name, ->

test/unit/core/selection.coffee

@@ -324,4 +324,49 @@ describe('Selection', ->
       )
     )
   )
+
+  describe('scrollIntoView()', ->
+    beforeEach( ->
+      @container.innerHTML = '<div><span style="font-size: 36px;">a<br>b<br>c<br>d</span></div>'
+      @quill = new Quill(@container.firstChild)
+      @editor = @quill.editor
+      @selection = @editor.selection
+      @height = 80
+      @editor.root.parentNode.style.height = @height.toString() + "px"
+      @editor.root.parentNode.style.overflow = "auto"
+    )
+
+    it('scrolls down when cursor too low', ->
+      @selection.setRange(new Quill.Lib.Range(7, 7))
+      bounds = @editor.getBounds(7)
+      expect(bounds.top).toBeGreaterThan(@height)
+      @selection.scrollIntoView()
+      bounds = @editor.getBounds(7)
+      expect(bounds.top).not.toBeLessThan(0)
+      expect(bounds.top + bounds.height).not.toBeGreaterThan(@height)
+    )
+
+    it('scrolls up when cursor too high', ->
+      @selection.setRange(new Quill.Lib.Range(1, 1))
+      @editor.root.parentNode.scrollTop = 100
+      bounds = @editor.getBounds(1)
+      expect(bounds.top + bounds.height).toBeLessThan(0)
+      @selection.scrollIntoView()
+      bounds = @editor.getBounds(1)
+      expect(bounds.top).not.toBeLessThan(0)
+      expect(bounds.top + bounds.height).not.toBeGreaterThan(@height)
+    )
+
+    it('does not scroll if cursor in view', ->
+      @selection.setRange(new Quill.Lib.Range(1, 1))
+      bounds = @editor.getBounds(1)
+      expect(bounds.top).not.toBeLessThan(0)
+      expect(bounds.top + bounds.height).not.toBeGreaterThan(@height)
+      @selection.scrollIntoView()
+      newBounds = @editor.getBounds(1)
+      expect(bounds.top).toBeApproximately(newBounds.top, 1)
+      expect(bounds.height).toBeApproximately(newBounds.height, 1)
+      expect(bounds.left).toBeApproximately(newBounds.left, 1)
+    )
+  )
 )

test/unit/modules/keyboard.coffee

@@ -80,5 +80,43 @@ describe('Keyboard', ->
       expect(dom($('.ql-bold').get(0)).hasClass('ql-active')).toBe(true)
       expect(dom($('.ql-size').get(0)).value()).toBe(size)
     )
+
+    it('removeHotkeys by name', ->
+      counter = 0
+      fn = -> counter += 1
+      keyboard = @quill.getModule('keyboard')
+      keyboard.addHotkey('S', fn)
+      dom(@quill.root).trigger('keydown', { key: 'S' })
+      expect(counter).toBe(1)
+      result = keyboard.removeHotkeys('S', fn)
+      expect(result.length).toBe(1)
+      expect(result[0]).toBe(fn);
+      dom(@quill.root).trigger('keydown', { key: 'S' })
+      expect(counter).toBe(1)
+    )
+
+    it('removeHotkeys by object', ->
+      counter = 0
+      fn = -> counter += 1
+      keyboard = @quill.getModule('keyboard')
+      keyboard.addHotkey({ key: 'S', metaKey: true }, fn)
+      dom(@quill.root).trigger('keydown', { key: 'S', metaKey: true })
+      result = keyboard.removeHotkeys({ key: 'S', metaKey: true })
+      expect(result.length).toBe(1)
+      expect(result[0]).toBe(fn)
+      dom(@quill.root).trigger('keydown', { key: 'S', metaKey: true })
+      expect(counter).toBe(1)
+    )
+
+    it('removeHotKeys only the specified callback', ->
+      fn = ->
+      anotherFn = ->
+      keyboard = @quill.getModule('keyboard')
+      keyboard.addHotkey({ key: 'S', metaKey: true }, fn)
+      keyboard.addHotkey({ key: 'S', metaKey: true }, anotherFn)
+      result = keyboard.removeHotkeys({ key: 'S', metaKey: true }, fn)
+      expect(result.length).toBe(1)
+      expect(result[0]).toBe(fn)
+    )
   )
 )