Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4560 from tgxworld/optional_title_for_emoji_widget 

Make title attribute on emoji widget optional.
This commit is contained in:
Guo Xiang Tan 2016-11-21 06:17:44 +01:00 committed by GitHub
parent 3909f342f6 3f54730c2d
commit 6397d935ce
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/lib/plugin-api.js.es6
View File

@ -92,7 +92,11 @@ class PluginApi {
if (result.icon) { if (result.icon) {
iconBody = iconNode(result.icon); iconBody = iconNode(result.icon);
} else if (result.emoji) { } else if (result.emoji) {
iconBody = result.emoji.split('|').map(name => dec.attach('emoji', { name })); iconBody = result.emoji.split('|').map(name => {
let widgetAttrs = { name };
if (result.title) widgetAttrs.title = true;
dec.attach('emoji', widgetAttrs);
});
} }
if (result.text) { if (result.text) {

4
app/assets/javascripts/discourse/widgets/emoji.js.es6
View File

@ -11,6 +11,8 @@ export default createWidget('emoji', {
tagName: 'img.emoji', tagName: 'img.emoji',
buildAttributes(attrs) { buildAttributes(attrs) {
return { src: emojiUrlFor(attrs.name), title: attrs.name, alt: `:${attrs.name}:` }; let result = { src: emojiUrlFor(attrs.name), alt: `:${attrs.name}:` };
if (attrs.title) result.title = attrs.name;
return result;
}, },
}); });