You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/02/05 21:42:08 UTC
[13/30] allura git commit: [#8035] ESLINT FIX: operator-linebreak
[#8035] ESLINT FIX: operator-linebreak
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/3a39d151
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/3a39d151
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/3a39d151
Branch: refs/heads/master
Commit: 3a39d1518ae78baf37dd770b20dc439b70fe2fec
Parents: 5e25e86
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 18:33:22 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Feb 5 14:37:19 2016 -0500
----------------------------------------------------------------------
.eslintrc | 3 ++-
Allura/allura/public/nf/js/navbar.es6.js | 12 ++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/3a39d151/.eslintrc
----------------------------------------------------------------------
diff --git a/.eslintrc b/.eslintrc
index b42eb66..ff25e9d 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -3,7 +3,8 @@
"max-len": [1, 119, 4],
"indent": [2, 4],
"jsx-quotes": [0],
- "quotes": [0]
+ "quotes": [0],
+ "operator-linebreak": [2, "before", { "overrides": { "?": "after", "&&": "after" } }]
},
"globals": {
"ReactDOM": true,
http://git-wip-us.apache.org/repos/asf/allura/blob/3a39d151/Allura/allura/public/nf/js/navbar.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/navbar.es6.js b/Allura/allura/public/nf/js/navbar.es6.js
index 1055d43..818bb3e 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -98,13 +98,13 @@ var NavBarItem = React.createClass({
{this.props.name}
</span>
</a>
- {this.props.currentOptionMenu.tool
- && this.props.currentOptionMenu.tool === this.props.mount_point
- && <ContextMenu
+ {this.props.currentOptionMenu.tool &&
+ this.props.currentOptionMenu.tool === this.props.mount_point &&
+ <ContextMenu
{...this.props}
- items={this.props.options}
- onOptionClick={this.props.onOptionClick}
- /> }
+ items={this.props.options}
+ onOptionClick={this.props.onOptionClick}
+ /> }
</div>
);
},