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/27 21:22:39 UTC
[25/50] allura git commit: [#8035] ESLINT FIX: max-len
[#8035] ESLINT FIX: max-len
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/8ad36858
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/8ad36858
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/8ad36858
Branch: refs/heads/hs/8035
Commit: 8ad36858fc517d8279fb3785dcd62592750ffa4f
Parents: a865796
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 17:37:38 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Wed Jan 27 15:21:27 2016 -0500
----------------------------------------------------------------------
.eslintrc | 6 ++----
Allura/allura/public/nf/js/navbar.es6.js | 17 ++++++++++++++---
2 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/8ad36858/.eslintrc
----------------------------------------------------------------------
diff --git a/.eslintrc b/.eslintrc
index f3fb796..a66f2fa 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,9 +1,7 @@
{
"rules": {
- "indent": [
- 2,
- 4
- ]
+ "max-len": [1, 119, 4],
+ "indent": [2, 4]
},
"globals": {
"ReactDOM": true,
http://git-wip-us.apache.org/repos/asf/allura/blob/8ad36858/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 ed8aa6d..b1a0eb3 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -142,7 +142,11 @@ var GroupingThreshold = React.createClass({
<label htmlFor='threshold-input'>Grouping Threshold</label>
<ToolTip targetSelector="#threshold-input" position="top" contentAsHTML={true}/>
<input type='number' name='threshold-input' id="threshold-input"
- title='When you have multiple tools of the same type, <u>this number</u> determines if they will fit in the navigation bar or be grouped into a dropdown.'
+
+ title='When you have multiple tools of the same type,\
+ <u>this number</u> determines if they will fit in the navigation \
+ bar or be grouped into a dropdown.'
+
value={ this.state.value }
onChange={ this.handleChange }
min='1' max='50'/>
@@ -317,8 +321,15 @@ var AdminNav = React.createClass({
options={ item.admin_options }
/>;
if (subMenu) {
- childOptionsOpen = _.contains(_.pluck(item.children, 'mount_point'), this.props.currentOptionMenu.tool);
- tool_list.push(<NavBarItemWithSubMenu key={_.uniqueId()} tool={core_item} subMenu={subMenu} childOptionsOpen={childOptionsOpen}/>);
+ childOptionsOpen = _.contains(_.pluck(item.children, 'mount_point'),
+ this.props.currentOptionMenu.tool);
+
+ tool_list.push(<NavBarItemWithSubMenu
+ key={_.uniqueId()}
+ tool={core_item}
+ subMenu={subMenu}
+ childOptionsOpen={childOptionsOpen}
+ />);
} else {
tool_list.push(core_item);
}