Fixes #286

slab · Feb 22, 2015 · d8bbbb0 · d8bbbb0
1 parent 1b19500
commit d8bbbb0
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/modules/keyboard.coffee b/src/modules/keyboard.coffee
@@ -45,12 +45,19 @@ class Keyboard
 
   _initDeletes: ->
     this.addHotkey([dom.KEYS.DELETE, dom.KEYS.BACKSPACE], (range, hotkey) =>
-      if range? and @quill.getLength() > 1
+      if range? and @quill.getLength() > 0
         if range.start != range.end
           @quill.deleteText(range.start, range.end, Quill.sources.USER)
         else
-          start = if (hotkey.key == dom.KEYS.BACKSPACE) then range.start - 1 else range.start
-          @quill.deleteText(start, start + 1, Quill.sources.USER) if start >= 0
+          if hotkey.key == dom.KEYS.BACKSPACE
+            [line, offset] = @quill.editor.doc.findLineAt(range.start)
+            if offset == 0 and (line.formats.bullet or line.formats.list)
+              format = if line.format.bullet then 'bullet' else 'list'
+              @quill.formatLine(range.start, range.start, format, false)
+            else if range.start > 0
+              @quill.deleteText(range.start - 1, range.start, Quill.sources.USER)
+          else if range.start < @quill.getLength()
+            @quill.deleteText(range.start, range.start + 1, Quill.sources.USER)
       return false
     )