Merge branch 'kmoe-superscript-subscript' into reedsy

reedsy · Aug 12, 2015 · e66135e · e66135e
2 parents d529eea + ae8caf4
commit e66135e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/examples/index.jade b/examples/index.jade
@@ -45,6 +45,8 @@ html
           button.ql-format-button.ql-italic(title='Italic') Italic
           button.ql-format-button.ql-underline(title='Underline') Under
           button.ql-format-button.ql-strike(title='Strikethrough') Strike
+          button.ql-format-button.ql-superscript(title='Superscript') Super
+          button.ql-format-button.ql-subscript(title='Subscript') Sub
           button.ql-format-button.ql-link(title='Link') Link
           button.ql-format-button.ql-image(title='Image') Image
           button.ql-format-button.ql-bullet(title='Bullet') Bullet

diff --git a/src/core/format.coffee b/src/core/format.coffee
@@ -24,6 +24,14 @@ class Format
       tag: 'S'
       prepare: 'strikeThrough'
 
+    superscript:
+      tag: 'SUP'
+      prepare: 'superscript'
+
+    subscript:
+      tag: 'SUB'
+      prepare: 'subscript'
+
     color:
       style: 'color'
       default: 'rgb(0, 0, 0)'

diff --git a/src/modules/keyboard.coffee b/src/modules/keyboard.coffee
@@ -92,7 +92,8 @@ class Keyboard
     )
     _.each(['bold', 'italic', 'underline'], (format) =>
       this.addHotkey(Keyboard.hotkeys[format.toUpperCase()], (range) =>
-        this.toggleFormat(range, format)
+        if (@quill.options.formats.indexOf(format) > -1)
+          this.toggleFormat(range, format)
         return false
       )
     )

diff --git a/src/modules/toolbar.coffee b/src/modules/toolbar.coffee
@@ -11,7 +11,7 @@ class Toolbar
   @formats:
     LINE    : { 'align', 'bullet', 'list', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'quote' }
     SELECT  : { 'align', 'background', 'color', 'font', 'size' }
-    TOGGLE  : { 'bold', 'bullet', 'image', 'italic', 'link', 'list', 'strike', 'underline', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'quote' }
+    TOGGLE  : { 'bold', 'bullet', 'image', 'italic', 'link', 'list', 'strike', 'underline', 'superscript', 'subscript', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'quote' }
     TOOLTIP : { 'image', 'link' }
 
   constructor: (@quill, @options) ->

diff --git a/src/modules/undo-manager.coffee b/src/modules/undo-manager.coffee
@@ -26,7 +26,10 @@ class UndoManager
         this.undo()
         return false
       )
-      keyboard.addHotkey(UndoManager.hotkeys.REDO, =>
+      redoKey = [UndoManager.hotkeys.REDO]
+      if (navigator.platform.indexOf('Win') > -1)
+        redoKey.push({ key: 'Y', metaKey: true })
+      keyboard.addHotkey(redoKey, =>
         @quill.editor.checkUpdate()
         this.redo()
         return false

diff --git a/src/quill.coffee b/src/quill.coffee
@@ -18,7 +18,7 @@ class Quill extends EventEmitter2
   @themes: []
 
   @DEFAULTS:
-    formats: ['align', 'bold', 'italic', 'strike', 'underline', 'color', 'background', 'font', 'size', 'link', 'image', 'bullet', 'list', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'quote']
+    formats: ['align', 'bold', 'italic', 'strike', 'underline', 'superscript', 'subscript', 'color', 'background', 'font', 'size', 'link', 'image', 'bullet', 'list', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'quote']
     modules:
       'keyboard': true
       'paste-manager': true