From cc7e94afe5334d11bd4b85d978a88de2d820cc4c Mon Sep 17 00:00:00 2001 From: Denis K Date: Sun, 9 Nov 2014 18:17:55 +0300 Subject: [PATCH 1/2] Add support for display icon titles --- src/intro.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/intro.js b/src/intro.js index c001077..1758695 100644 --- a/src/intro.js +++ b/src/intro.js @@ -32,16 +32,24 @@ function createIcon(name, options) { options = options || {}; var el = document.createElement('a'); + var title = ''; + + if (options.title) { + title = options.title; + } + var shortcut = options.shortcut || shortcuts[name]; if (shortcut) { shortcut = fixShortcut(shortcut); - el.title = shortcut; - el.title = el.title.replace('Cmd', '⌘'); + shortcut = shortcut.replace('Cmd', '⌘'); if (isMac) { - el.title = el.title.replace('Alt', '⌥'); + shortcut = shortcut.replace('Alt', '⌥'); } + + title += (title == '') ? shortcut : ' (' + shortcut + ')'; } + el.title = title; el.className = options.className || 'icon-' + name; return el; } From deb55520627790bd27a3393a66b565e448fea74c Mon Sep 17 00:00:00 2001 From: Denis K Date: Sun, 9 Nov 2014 18:18:41 +0300 Subject: [PATCH 2/2] Add titles for default toolbar --- src/editor.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/editor.js b/src/editor.js index 76da894..3691641 100644 --- a/src/editor.js +++ b/src/editor.js @@ -1,20 +1,20 @@ var toolbar = [ - {name: 'bold', action: toggleBold}, - {name: 'italic', action: toggleItalic}, + {name: 'bold', action: toggleBold, title: 'Bold'}, + {name: 'italic', action: toggleItalic, title: 'Italics'}, '|', - {name: 'quote', action: toggleBlockquote}, - {name: 'unordered-list', action: toggleUnOrderedList}, - {name: 'ordered-list', action: toggleOrderedList}, + {name: 'quote', action: toggleBlockquote, title: 'Quote'}, + {name: 'unordered-list', action: toggleUnOrderedList, title: 'Unordered List'}, + {name: 'ordered-list', action: toggleOrderedList, title: 'Ordered List'}, '|', - {name: 'link', action: drawLink}, - {name: 'image', action: drawImage}, + {name: 'link', action: drawLink, title: 'Link'}, + {name: 'image', action: drawImage, title: 'Image'}, '|', - {name: 'info', action: 'http://lab.lepture.com/editor/markdown'}, - {name: 'preview', action: togglePreview}, - {name: 'fullscreen', action: toggleFullScreen} + {name: 'info', action: 'http://lab.lepture.com/editor/markdown', title: 'Info'}, + {name: 'preview', action: togglePreview, title: 'Preview'}, + {name: 'fullscreen', action: toggleFullScreen, title: 'Fullscreen'} ]; /**