Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Refactor property names in inAppAnnouncements to be easy to understand

Browse Source 
[MAILPOET-1525]
This commit is contained in:
Rostislav Wolny
2018-09-20 15:08:01 +02:00
parent fdd1bce566
commit 41eeae2d14
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
assets/js/src/in_app_announcements/in_app_announcement.jsx
View File

@@ -32,8 +32,8 @@ class InAppAnnouncement extends React.Component {
}
render() {
if (this.props.newUser !== null &&
window.mailpoet_is_new_user !== this.props.newUser
if (this.props.showToNewUser !== null &&
window.mailpoet_is_new_user !== this.props.showToNewUser
) {
return null;
}
@@ -42,8 +42,8 @@ class InAppAnnouncement extends React.Component {
return null;
}
if (this.props.premiumUser !== null &&
window.mailpoet_premium_active !== this.props.premiumUser
if (this.props.showToPremiumUser !== null &&
window.mailpoet_premium_active !== this.props.showToPremiumUser
) {
return null;
}
@@ -89,10 +89,10 @@ InAppAnnouncement.propTypes = {
className: React.PropTypes.string,
children: React.PropTypes.element.isRequired,
validUntil: React.PropTypes.number,
newUser: (props, propName, componentName) => (
showToNewUser: (props, propName, componentName) => (
validateBooleanWithWindowDependency(props, propName, componentName, 'mailpoet_is_new_user')
),
premiumUser: (props, propName, componentName) => (
showToPremiumUser: (props, propName, componentName) => (
validateBooleanWithWindowDependency(props, propName, componentName, 'mailpoet_premium_active')
),
showOnlyOnceSlug: (props, propName, componentName) => {
@@ -119,8 +119,8 @@ InAppAnnouncement.defaultProps = {
height: '600px',
className: null,
validUntil: null,
newUser: null,
premiumUser: null,
showToNewUser: null,
showToPremiumUser: null,
showOnlyOnceSlug: null,
};

4
assets/js/src/newsletters/listings/heading.jsx
View File

@@ -20,8 +20,8 @@ const ListingHeading = () => (
</Link>
<InAppAnnoucement
className="mailpoet_in_app_announcement_free_welcome_emails_dot"
newUser={false}
premiumUser={false}
showToNewUser={false}
showToPremiumUser={false}
showOnlyOnceSlug="free_welcome_emails"
height="650px"
validUntil={new Date('2018-10-31').getTime() / 1000}