You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2016/01/22 01:59:53 UTC
[20/20] allura git commit: [#8035] ESLINT FIX: no-else-return
[#8035] ESLINT FIX: no-else-return
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/3ea90725
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/3ea90725
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/3ea90725
Branch: refs/heads/hs/8035
Commit: 3ea90725e0d6365f7b2044cc31499d5d1a2a9cc2
Parents: ef59321
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 19:52:56 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:15 2016 -0500
----------------------------------------------------------------------
Allura/allura/public/nf/js/navbar.es6.js | 40 +++++++++++++--------------
1 file changed, 19 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/3ea90725/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 44e2caf..ffaa371 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -531,35 +531,33 @@ var Main = React.createClass({
render: function() {
var _this = this;
var navBarSwitch = showAdmin => {
+ var navbar;
if (showAdmin) {
- return (
- <AdminNav
- tools={ _this.state.data.menu }
+ navbar = <AdminNav
+ tools={ _this.state.data.menu }
+ installableTools={ _this.state.data.installable_tools }
+ data={ _this.state.data }
+ onToolReorder={ _this.onToolReorder }
+ onToolDragStart={ _this.onToolDragStart }
+ editMode={ _this.state.visible }
+ currentOptionMenu={ _this.state.currentOptionMenu }
+ onOptionClick={ _this.handleShowOptionMenu }
+ currentToolOptions={this.state.currentToolOptions}
+ />;
+ } else {
+ navbar = <div>
+ <NormalNavBar
+ items={ _this.state.data.menu }
installableTools={ _this.state.data.installable_tools }
- data={ _this.state.data }
- onToolReorder={ _this.onToolReorder }
- onToolDragStart={ _this.onToolDragStart }
- editMode={ _this.state.visible }
- currentOptionMenu={ _this.state.currentOptionMenu }
- onOptionClick={ _this.handleShowOptionMenu }
- currentToolOptions={this.state.currentToolOptions}
/>
- );
- } else {
- return (
- <div>
- <NormalNavBar
- items={ _this.state.data.menu }
- installableTools={ _this.state.data.installable_tools }
- />
- </div>
- );
+ </div>;
}
+ return navbar;
};
var navBar = navBarSwitch(this.state.visible);
var max_tool_count = _.chain(this.state.data.menu)
- .map((item) => {
+ .map(item => {
return item.children ? _.pluck(item.children, 'tool_name') : item.tool_name;
})
.flatten()