mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-10 10:24:46 +02:00
Code Issues Releases Wiki Activity

Fix SubscriptionMenu button title

Browse Source
This commit is contained in:
Toby Zerner
2016-04-08 13:47:22 +09:30
parent 60e6cfdbbd
commit a0779cbdef
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/subscriptions/js/forum/dist/extension.js vendored
View File

@@ -214,8 +214,8 @@ System.register('flarum/subscriptions/components/NewPostNotification', ['flarum/
});; });;
'use strict'; 'use strict';
System.register('flarum/subscriptions/components/SubscriptionMenu', ['flarum/components/Dropdown', 'flarum/components/Button', 'flarum/helpers/icon', 'flarum/subscriptions/components/SubscriptionMenuItem'], function (_export, _context) { System.register('flarum/subscriptions/components/SubscriptionMenu', ['flarum/components/Dropdown', 'flarum/components/Button', 'flarum/helpers/icon', 'flarum/utils/extractText', 'flarum/subscriptions/components/SubscriptionMenuItem'], function (_export, _context) {
var Dropdown, Button, icon, SubscriptionMenuItem, SubscriptionMenu; var Dropdown, Button, icon, extractText, SubscriptionMenuItem, SubscriptionMenu;
return { return {
setters: [function (_flarumComponentsDropdown) { setters: [function (_flarumComponentsDropdown) {
Dropdown = _flarumComponentsDropdown.default; Dropdown = _flarumComponentsDropdown.default;
@@ -223,6 +223,8 @@ System.register('flarum/subscriptions/components/SubscriptionMenu', ['flarum/com
Button = _flarumComponentsButton.default; Button = _flarumComponentsButton.default;
}, function (_flarumHelpersIcon) { }, function (_flarumHelpersIcon) {
icon = _flarumHelpersIcon.default; icon = _flarumHelpersIcon.default;
}, function (_flarumUtilsExtractText) {
extractText = _flarumUtilsExtractText.default;
}, function (_flarumSubscriptionsComponentsSubscriptionMenuItem) { }, function (_flarumSubscriptionsComponentsSubscriptionMenuItem) {
SubscriptionMenuItem = _flarumSubscriptionsComponentsSubscriptionMenuItem.default; SubscriptionMenuItem = _flarumSubscriptionsComponentsSubscriptionMenuItem.default;
}], }],
@@ -282,24 +284,26 @@ System.register('flarum/subscriptions/components/SubscriptionMenu', ['flarum/com
// no default // no default
} }
var preferences = app.session.user.preferences();
var notifyEmail = preferences['notify_newPost_email'];
var notifyAlert = preferences['notify_newPost_alert'];
var title = extractText(app.translator.trans(notifyEmail ? 'flarum-subscriptions.forum.sub_controls.notify_email_tooltip' : 'flarum-subscriptions.forum.sub_controls.notify_alert_tooltip'));
var buttonProps = { var buttonProps = {
className: 'Button SubscriptionMenu-button ' + buttonClass, className: 'Button SubscriptionMenu-button ' + buttonClass,
icon: buttonIcon, icon: buttonIcon,
children: buttonLabel, children: buttonLabel,
onclick: this.saveSubscription.bind(this, discussion, ['follow', 'ignore'].indexOf(subscription) !== -1 ? false : 'follow') onclick: this.saveSubscription.bind(this, discussion, ['follow', 'ignore'].indexOf(subscription) !== -1 ? false : 'follow'),
title: title
}; };
var preferences = app.session.user.preferences();
var notifyEmail = preferences['notify_newPost_email'];
var notifyAlert = preferences['notify_newPost_alert'];
if ((notifyEmail || notifyAlert) && subscription === false) { if ((notifyEmail || notifyAlert) && subscription === false) {
buttonProps.config = function (element) { buttonProps.config = function (element) {
$(element).tooltip({ $(element).tooltip({
container: '.SubscriptionMenu', container: '.SubscriptionMenu',
placement: 'bottom', placement: 'bottom',
delay: 250, delay: 250,
title: app.translator.trans(notifyEmail ? 'flarum-subscriptions.forum.sub_controls.notify_email_tooltip' : 'flarum-subscriptions.forum.sub_controls.notify_alert_tooltip') title: title
}); });
}; };
} else { } else {

19
extensions/subscriptions/js/forum/src/components/SubscriptionMenu.js
View File

@@ -1,6 +1,7 @@
import Dropdown from 'flarum/components/Dropdown'; import Dropdown from 'flarum/components/Dropdown';
import Button from 'flarum/components/Button'; import Button from 'flarum/components/Button';
import icon from 'flarum/helpers/icon'; import icon from 'flarum/helpers/icon';
import extractText from 'flarum/utils/extractText';
import SubscriptionMenuItem from 'flarum/subscriptions/components/SubscriptionMenuItem'; import SubscriptionMenuItem from 'flarum/subscriptions/components/SubscriptionMenuItem';
@@ -51,26 +52,28 @@ export default class SubscriptionMenu extends Dropdown {
// no default // no default
} }
const preferences = app.session.user.preferences();
const notifyEmail = preferences['notify_newPost_email'];
const notifyAlert = preferences['notify_newPost_alert'];
const title = extractText(app.translator.trans(notifyEmail
? 'flarum-subscriptions.forum.sub_controls.notify_email_tooltip'
: 'flarum-subscriptions.forum.sub_controls.notify_alert_tooltip'));
const buttonProps = { const buttonProps = {
className: 'Button SubscriptionMenu-button ' + buttonClass, className: 'Button SubscriptionMenu-button ' + buttonClass,
icon: buttonIcon, icon: buttonIcon,
children: buttonLabel, children: buttonLabel,
onclick: this.saveSubscription.bind(this, discussion, ['follow', 'ignore'].indexOf(subscription) !== -1 ? false : 'follow') onclick: this.saveSubscription.bind(this, discussion, ['follow', 'ignore'].indexOf(subscription) !== -1 ? false : 'follow'),
title: title
}; };
const preferences = app.session.user.preferences();
const notifyEmail = preferences['notify_newPost_email'];
const notifyAlert = preferences['notify_newPost_alert'];
if ((notifyEmail || notifyAlert) && subscription === false) { if ((notifyEmail || notifyAlert) && subscription === false) {
buttonProps.config = element => { buttonProps.config = element => {
$(element).tooltip({ $(element).tooltip({
container: '.SubscriptionMenu', container: '.SubscriptionMenu',
placement: 'bottom', placement: 'bottom',
delay: 250, delay: 250,
title: app.translator.trans(notifyEmail title
? 'flarum-subscriptions.forum.sub_controls.notify_email_tooltip'
: 'flarum-subscriptions.forum.sub_controls.notify_alert_tooltip')
}); });
} }
} else { } else {