Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update NPM Dependencies #405

Merged
merged 5 commits into from Jul 2, 2019
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

fix formatting of if statements after lint auto-fix

  • Loading branch information
christophertino committed Jul 1, 2019
commit 7f6e42e9e4b44fba875d8875960bf3fc7a9d29f7
@@ -57,7 +57,8 @@ function _renderBottomItem(item, disableNav) {
</a>
</div>
);
} if (item.id === 'logout') {
}
if (item.id === 'logout') {
return (
<div key={`bottom-item-${item.id}`} className="SideNavigation__item SideNavigation__bottomItem flex-container align-middle">
<div className={logoutClassNames} onClick={item.clickHandler}>
@@ -148,7 +148,8 @@ export function resetTrustRestrictPause(state) {

if (isTrusted) {
return handleTrustButtonClick({ state });
} if (isRestricted) {
}
if (isRestricted) {
return handleRestrictButtonClick({ state });
}

@@ -250,7 +250,8 @@ class DonutGraph extends React.Component {
.style('fill', (d, i) => {
if (renderGreyscale) {
return this.colors.greyscale(this.getTone(categoryCount, i));
} if (renderRedscale) {
}
if (renderRedscale) {
return this.colors.redscale(this.getTone(categoryCount, i));
}
return this.colors.regular(d.data.id);
@@ -164,21 +164,24 @@ class Panel extends React.Component {
)}
</span>
);
} if (needsReload) {
}
if (needsReload) {
return (
<span>
<span key="0">{t('panel_needs_reload')}</span>
<span key="1" className="needs-reload-link" onClick={this.clickReloadBanner}>{ t('alert_reload') }</span>
</span>
);
} if (this.props.notificationFilter === 'slow') {
}
if (this.props.notificationFilter === 'slow') {
return (
<span>
<span key="0" className="filter-link slow-insecure" onClick={this.filterTrackers} dangerouslySetInnerHTML={{ __html: this.props.notificationText }} />
<span key="1">{ t('panel_tracker_slow_non_secure_end') }</span>
</span>
);
} if (this.props.notificationFilter === 'compatibility') {
}
if (this.props.notificationFilter === 'compatibility') {
return (
<span>
<span key="0" className="filter-link compatibility" onClick={this.filterTrackers} dangerouslySetInnerHTML={{ __html: this.props.notificationText }} />
@@ -228,21 +228,24 @@ class Rewards extends React.Component {
</div>
</div>
);
} if (enable_offers && !rewardsArray) {
}
if (enable_offers && !rewardsArray) {
return (
<div className="RewardsPanel__info">
{ this.renderRewardSvg() }
<div>{ t('panel_detail_rewards_loading') }</div>
</div>
);
} if (enable_offers && rewardsArray.length === 0) {
}
if (enable_offers && rewardsArray.length === 0) {
return (
<div className="RewardsPanel__info">
{ this.renderRewardSvg() }
<div>{ t('panel_detail_rewards_none_found') }</div>
</div>
);
} if (!enable_offers && (!rewardsArray || rewardsArray.length === 0)) {
}
if (!enable_offers && (!rewardsArray || rewardsArray.length === 0)) {
return (
<div className="RewardsPanel__info">
{ this.renderRewardSvg() }
@@ -45,7 +45,7 @@
"base64-js": "^1.2.1",
"browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/7.37.3/browser-core-7.37.3.tgz",
"classnames": "^2.2.5",
"d3": "^5.9.5",
"d3": "^5.9.7",
"foundation-sites": "^6.4.4-rc1",
"history": "^4.9.0",
"json-api-normalizer": "^0.4.15",
@@ -86,9 +86,9 @@
"eslint-config-airbnb": "^17.1.0",
"eslint-loader": "^2.1.2",
"eslint-plugin-import": "^2.17.3",
"eslint-plugin-jsx-a11y": "^6.1.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.13.0",
"fs-extra": "^8.0.1",
"fs-extra": "^8.1.0",
"jest": "^24.8.0",
"jsdoc": "^3.6.2",
"jsonfile": "^5.0.0",
@@ -105,11 +105,11 @@
"sinon": "^7.3.2",
"sinon-chrome": "^3.0.1",
"style-loader": "^0.23.1",
"svg-url-loader": "^2.3.3",
"svg-url-loader": "^3.0.0",
"underscore-template-loader": "^1.0.0",
"url-loader": "^2.0.0",
"vendor-copy": "^2.0.0",
"webpack": "^4.35.0",
"webpack": "^4.35.2",
"webpack-cli": "^3.3.4",
"webpack-shell-plugin": "^0.5.0"
}
ProTip! Use n and p to navigate between commits in a pull request.