From 66a39bbbf54354794c35ccf47e705a4b4d6760d1 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 8 Apr 2016 13:38:50 +0930 Subject: [PATCH] Fix buttons being given incorrect title --- js/admin/dist/app.js | 2 +- js/forum/dist/app.js | 2 +- js/lib/components/Button.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/admin/dist/app.js b/js/admin/dist/app.js index c51d28004..37e2f47a6 100644 --- a/js/admin/dist/app.js +++ b/js/admin/dist/app.js @@ -17873,7 +17873,7 @@ System.register('flarum/components/Button', ['flarum/Component', 'flarum/helpers // If nothing else is provided, we use the textual button content as tooltip if (!attrs.title && this.props.children) { - attrs.title = extractText(attrs.title); + attrs.title = extractText(this.props.children); } var iconName = extract(attrs, 'icon'); diff --git a/js/forum/dist/app.js b/js/forum/dist/app.js index d9bff75d4..59581b663 100644 --- a/js/forum/dist/app.js +++ b/js/forum/dist/app.js @@ -19196,7 +19196,7 @@ System.register('flarum/components/Button', ['flarum/Component', 'flarum/helpers // If nothing else is provided, we use the textual button content as tooltip if (!attrs.title && this.props.children) { - attrs.title = extractText(attrs.title); + attrs.title = extractText(this.props.children); } var iconName = extract(attrs, 'icon'); diff --git a/js/lib/components/Button.js b/js/lib/components/Button.js index 2e492b18a..a95619cfc 100644 --- a/js/lib/components/Button.js +++ b/js/lib/components/Button.js @@ -31,7 +31,7 @@ export default class Button extends Component { // If nothing else is provided, we use the textual button content as tooltip if (!attrs.title && this.props.children) { - attrs.title = extractText(attrs.title); + attrs.title = extractText(this.props.children); } const iconName = extract(attrs, 'icon');