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:34 UTC
[01/20] allura git commit: [#8035] Add eslint deps
Repository: allura
Updated Branches:
refs/heads/hs/8035 [created] e0a565d02
[#8035] Add eslint deps
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/07e6ae46
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/07e6ae46
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/07e6ae46
Branch: refs/heads/hs/8035
Commit: 07e6ae4621beb70b32e7590304aea2e295fadc89
Parents: 35f84fc
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 15:44:22 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:12 2016 -0500
----------------------------------------------------------------------
package.json | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/07e6ae46/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 3b27d67..1f12ff5 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,9 @@
"test": "echo \"Error: no test specified\" && exit 1",
"build": "rm -rf Allura/allura/public/nf/js/build/; broccoli build Allura/allura/public/nf/js/build/",
"watch": "broccoli-timepiece Allura/allura/public/nf/js/build/",
- "eslint": "eslint"
+ "env": "env",
+ "eslint": "eslint",
+ "lint": "eslint Allura/allura/public/nf/js/*.es6.js || true"
},
"repository": {
"type": "git",
@@ -17,6 +19,7 @@
"license": "Apache-2.0",
"//": "When broccoli-babel-transpiler moves to babel 6, we'll need to add babel-plugin-transform-class-properties to our deps",
"devDependencies": {
+ "babel-eslint": "^5.0.0-beta6",
"broccoli": "^0.16.8",
"broccoli-babel-transpiler": "^5.4.5",
"broccoli-cli": "^1.0.0",
@@ -26,7 +29,9 @@
"broccoli-timepiece": "^0.3.0",
"broccoli-uglify-js": "^0.1.3",
"eslint": "^1.10.3",
+ "eslint-config-google": "^0.3.0",
"eslint-plugin-html": "^1.2.0",
+ "eslint-plugin-react": "^3.15.0",
"esprima-fb": "^15001.1001.0-dev-harmony-fb"
}
}
[17/20] allura git commit: [#8035] ESLINT FIX: arrow-parens
Posted by he...@apache.org.
[#8035] ESLINT FIX: arrow-parens
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/ef593211
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/ef593211
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/ef593211
Branch: refs/heads/hs/8035
Commit: ef593211c1878605985e9fb1920f2d627d8aa170
Parents: d51ada7
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 19:47:24 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/ef593211/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 52493bc..44e2caf 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -530,7 +530,7 @@ var Main = React.createClass({
render: function() {
var _this = this;
- var navBarSwitch = (showAdmin) => {
+ var navBarSwitch = showAdmin => {
if (showAdmin) {
return (
<AdminNav
[13/20] allura git commit: [#8035] ESLINT FIX: block-spacing,
no-inline-comments
Posted by he...@apache.org.
[#8035] ESLINT FIX: block-spacing, no-inline-comments
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/5d757792
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/5d757792
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/5d757792
Branch: refs/heads/hs/8035
Commit: 5d757792a125302c708e66a7fbdc1bd07e480d63
Parents: 10b886f
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 19:25:59 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:14 2016 -0500
----------------------------------------------------------------------
.eslintrc | 5 +++--
Allura/allura/public/nf/js/context-menu.es6.js | 1 -
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/5d757792/.eslintrc
----------------------------------------------------------------------
diff --git a/.eslintrc b/.eslintrc
index 835cf29..e58bfe1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -9,8 +9,9 @@
"FunctionDeclaration": true,
"MethodDefinition": false,
"ClassDeclaration": false
- }
- }]
+ }
+ }],
+ "no-inline-comments": 0
},
"globals": {
"ReactDOM": true,
http://git-wip-us.apache.org/repos/asf/allura/blob/5d757792/Allura/allura/public/nf/js/context-menu.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/context-menu.es6.js b/Allura/allura/public/nf/js/context-menu.es6.js
index 1762ffb..4c2958d 100644
--- a/Allura/allura/public/nf/js/context-menu.es6.js
+++ b/Allura/allura/public/nf/js/context-menu.es6.js
@@ -41,7 +41,6 @@ class ContextMenu extends React.Component {
/* the :not filter should've worked as a 2nd param to .on() instead of this,
but clicks in the page gutter were being delayed for some reason */
if ($(evt.target).is(':not(.contextMenu)')) {
-
/* if clicking directly onto another gear, set it directly.
this is necessary since sometimes our jquery events seem to interfere with the react event
that is supposed to handle this kind of thing */
[06/20] allura git commit: [#8035] ESLINT FIX:
space-before-function-paren
Posted by he...@apache.org.
[#8035] ESLINT FIX: space-before-function-paren
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/48e7f4f1
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/48e7f4f1
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/48e7f4f1
Branch: refs/heads/hs/8035
Commit: 48e7f4f16851131c7bd09fb35866198425201dc9
Parents: 2d3a10e
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 18:21:09 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:13 2016 -0500
----------------------------------------------------------------------
Allura/allura/public/nf/js/context-menu.es6.js | 4 ++--
Allura/allura/public/nf/js/navbar.es6.js | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/48e7f4f1/Allura/allura/public/nf/js/context-menu.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/context-menu.es6.js b/Allura/allura/public/nf/js/context-menu.es6.js
index 710387d..58d213d 100644
--- a/Allura/allura/public/nf/js/context-menu.es6.js
+++ b/Allura/allura/public/nf/js/context-menu.es6.js
@@ -38,7 +38,7 @@ class ContextMenu extends React.Component {
componentWillMount() {
let _this = this;
var mount_point;
- $('body').on('click.contextMenu', function (evt) {
+ $('body').on('click.contextMenu', function(evt) {
/* the :not filter should've worked as a 2nd param to .on() instead of this,
but clicks in the page gutter were being delayed for some reason */
if ($(evt.target).is(':not(.contextMenu)')) {
@@ -67,7 +67,7 @@ class ContextMenu extends React.Component {
<div className="contextMenu">
<ToolTip targetSelector='#top_nav_admin .contextMenu a'/>
<ul>{
- this.props.items.map(function (o, i) {
+ this.props.items.map(function(o, i) {
return (<li key={i}>
<a href={o.href}
className={_this.props.classes.concat([o.className]).join(' ')}
http://git-wip-us.apache.org/repos/asf/allura/blob/48e7f4f1/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 0ea3cb5..1055d43 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -209,7 +209,7 @@ var ToggleAddNewTool = React.createClass({
visible: !this.state.visible
});
},
- render: function () {
+ render: function() {
return (
<div>
<a onClick={ this.handleToggle } className="add-tool-toggle">
@@ -286,7 +286,7 @@ var AdminNav = React.createClass({
onOptionClick: React.PropTypes.func.isRequired
},
- buildMenu: function (items, isSubMenu=false) {
+ buildMenu: function(items, isSubMenu=false) {
var _this = this;
var [tools, anchoredTools, endTools] = [[], [], []];
var subMenu;
@@ -358,14 +358,14 @@ var AdminNav = React.createClass({
);
},
- render: function () {
+ render: function() {
var tools = this.buildMenu(this.props.tools);
return <div>{tools}</div>;
}
});
var NavBarItemWithSubMenu = React.createClass({
- render: function () {
+ render: function() {
return (
<div className={"tb-item-container" + (this.props.childOptionsOpen ? " child-options-open" : "")}>
{ this.props.tool }
@@ -385,7 +385,7 @@ var NavBarItemWithSubMenu = React.createClass({
* @constructor
*/
var AdminItemGroup = React.createClass({
- render: function () {
+ render: function() {
return (
<div className="tb-item-grouper">
{this.props.children}
@@ -459,7 +459,7 @@ var Main = React.createClass({
});
},
- handleShowOptionMenu: function (mount_point) {
+ handleShowOptionMenu: function(mount_point) {
this.setState({
currentOptionMenu: {
tool: mount_point
@@ -504,7 +504,7 @@ var Main = React.createClass({
type: 'POST',
url: url,
data: params,
- success: function () {
+ success: function() {
$('#messages').notify('Tool order updated',
{
status: 'confirm',
[19/20] allura git commit: [#8035] ESLINT FIX: radix
Posted by he...@apache.org.
[#8035] ESLINT FIX: radix
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/e0a565d0
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e0a565d0
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e0a565d0
Branch: refs/heads/hs/8035
Commit: e0a565d02b6d17ed421697860b7e056ba7ab5a26
Parents: 3ea9072
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 19:56:18 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/e0a565d0/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 ffaa371..f82ee97 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -575,7 +575,7 @@ var Main = React.createClass({
<GroupingThreshold
onUpdateThreshold={ this.onUpdateThreshold }
isHidden={ this.state.visible }
- initialValue={ parseInt(this.state.data.grouping_threshold) }/> }
+ initialValue={ parseInt(this.state.data.grouping_threshold, 10) }/> }
</div>
<ToggleAdminButton
handleButtonPush={ this.handleToggleAdmin }
[09/20] allura git commit: [#8035] ESLINT FIX: no-undef
Posted by he...@apache.org.
[#8035] ESLINT FIX: no-undef
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/079a7541
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/079a7541
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/079a7541
Branch: refs/heads/hs/8035
Commit: 079a754131c8b2b8141dc5d0dd01c859d58eb657
Parents: d30a521
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 17:23:37 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:13 2016 -0500
----------------------------------------------------------------------
.eslintrc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/079a7541/.eslintrc
----------------------------------------------------------------------
diff --git a/.eslintrc b/.eslintrc
index 2ba7869..f3fb796 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -7,6 +7,7 @@
},
"globals": {
"ReactDOM": true,
+ "React": true,
"$": true,
"window": true,
"_": true,
[20/20] allura git commit: [#8035] ESLINT FIX: no-else-return
Posted by he...@apache.org.
[#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()
[11/20] allura git commit: [#8035] ESLINT FIX: no-multiple-empty-lines
Posted by he...@apache.org.
[#8035] ESLINT FIX: no-multiple-empty-lines
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/04962e8b
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/04962e8b
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/04962e8b
Branch: refs/heads/hs/8035
Commit: 04962e8b4bf00d9ef59e54ee100661217bffd208
Parents: 6abcb9c
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 18:35:56 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:14 2016 -0500
----------------------------------------------------------------------
Allura/allura/public/nf/js/context-menu.es6.js | 1 -
Allura/allura/public/nf/js/navbar.es6.js | 1 -
Allura/allura/public/nf/js/tooltip.es6.js | 1 -
3 files changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/04962e8b/Allura/allura/public/nf/js/context-menu.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/context-menu.es6.js b/Allura/allura/public/nf/js/context-menu.es6.js
index 58d213d..ec5b68d 100644
--- a/Allura/allura/public/nf/js/context-menu.es6.js
+++ b/Allura/allura/public/nf/js/context-menu.es6.js
@@ -19,7 +19,6 @@
/* eslint camelcase: 0 */
'use strict';
-
class ContextMenu extends React.Component {
constructor(props) {
super(props);
http://git-wip-us.apache.org/repos/asf/allura/blob/04962e8b/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 a7266ae..585d004 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -379,7 +379,6 @@ var NavBarItemWithSubMenu = React.createClass({
}
});
-
/**
* The NavBar when in "Admin" mode.
* @constructor
http://git-wip-us.apache.org/repos/asf/allura/blob/04962e8b/Allura/allura/public/nf/js/tooltip.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/tooltip.es6.js b/Allura/allura/public/nf/js/tooltip.es6.js
index 87a865d..95f7188 100644
--- a/Allura/allura/public/nf/js/tooltip.es6.js
+++ b/Allura/allura/public/nf/js/tooltip.es6.js
@@ -54,7 +54,6 @@ class ToolTip extends React.Component {
theme: 'tooltipster-light'
};
-
componentDidMount() {
var _this = this;
$(this.props.targetSelector).tooltipster({
[02/20] allura git commit: [#8035] ESLINT FIX: semi
Posted by he...@apache.org.
[#8035] ESLINT FIX: semi
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/2d3a10e6
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/2d3a10e6
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/2d3a10e6
Branch: refs/heads/hs/8035
Commit: 2d3a10e6ab2f44a6f13c88a883c1b17c1a2f145e
Parents: 0f4e3b0
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 18:16:58 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:13 2016 -0500
----------------------------------------------------------------------
Allura/allura/public/nf/js/context-menu.es6.js | 4 ++--
Allura/allura/public/nf/js/navbar.es6.js | 4 ++--
Allura/allura/public/nf/js/tooltip.es6.js | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/2d3a10e6/Allura/allura/public/nf/js/context-menu.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/context-menu.es6.js b/Allura/allura/public/nf/js/context-menu.es6.js
index 96ab2e1..710387d 100644
--- a/Allura/allura/public/nf/js/context-menu.es6.js
+++ b/Allura/allura/public/nf/js/context-menu.es6.js
@@ -72,10 +72,10 @@ class ContextMenu extends React.Component {
<a href={o.href}
className={_this.props.classes.concat([o.className]).join(' ')}
title={o.tooltip}>{o.text}</a>
- </li>)
+ </li>);
})}
</ul>
</div>
- )
+ );
}
}
http://git-wip-us.apache.org/repos/asf/allura/blob/2d3a10e6/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 4570872..0ea3cb5 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -223,7 +223,7 @@ var ToggleAddNewTool = React.createClass({
items={this.props.installableTools} />
}
</div>
- )
+ );
}
});
@@ -563,7 +563,7 @@ var Main = React.createClass({
var max_tool_count = _.chain(this.state.data.menu)
.map((item) => {
- return item.children ? _.pluck(item.children, 'tool_name') : item.tool_name
+ return item.children ? _.pluck(item.children, 'tool_name') : item.tool_name;
})
.flatten()
.countBy()
http://git-wip-us.apache.org/repos/asf/allura/blob/2d3a10e6/Allura/allura/public/nf/js/tooltip.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/tooltip.es6.js b/Allura/allura/public/nf/js/tooltip.es6.js
index fea6471..87a865d 100644
--- a/Allura/allura/public/nf/js/tooltip.es6.js
+++ b/Allura/allura/public/nf/js/tooltip.es6.js
@@ -68,7 +68,7 @@ class ToolTip extends React.Component {
multiple: _this.props.multiple,
iconCloning: false,
maxWidth: _this.props.maxWidth
- })
+ });
}
render() {
[16/20] allura git commit: [#8035] ESLINT FIX: no-unused-var
Posted by he...@apache.org.
[#8035] ESLINT FIX: no-unused-var
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/b26d6db5
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/b26d6db5
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/b26d6db5
Branch: refs/heads/hs/8035
Commit: b26d6db520fda379a2f5180af93df3fbe86f9bda
Parents: 04962e8
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 18:43:29 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:14 2016 -0500
----------------------------------------------------------------------
Allura/allura/public/nf/js/context-menu.es6.js | 2 ++
Allura/allura/public/nf/js/navbar.es6.js | 7 +++++--
Allura/allura/public/nf/js/tooltip.es6.js | 2 ++
3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/b26d6db5/Allura/allura/public/nf/js/context-menu.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/context-menu.es6.js b/Allura/allura/public/nf/js/context-menu.es6.js
index ec5b68d..1762ffb 100644
--- a/Allura/allura/public/nf/js/context-menu.es6.js
+++ b/Allura/allura/public/nf/js/context-menu.es6.js
@@ -78,3 +78,5 @@ class ContextMenu extends React.Component {
);
}
}
+
+module.exports(ContextMenu);
http://git-wip-us.apache.org/repos/asf/allura/blob/b26d6db5/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 585d004..2d0201e 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -17,6 +17,7 @@
under the License.
*/
/* eslint camelcase: 0 */
+/* exported Main */
'use strict';
/**
@@ -109,7 +110,7 @@ var NavBarItem = React.createClass({
);
},
- handleOptionClick: function(event) {
+ handleOptionClick: function() {
this.props.onOptionClick(this.props.mount_point);
}
});
@@ -244,7 +245,7 @@ var NormalNavBar = React.createClass({
).isRequired
},
- buildMenu: function(item, i) {
+ buildMenu: function(item) {
let classes = window.location.pathname.startsWith(item.url) ? 'active-nav-link' : '';
var subMenu;
@@ -588,3 +589,5 @@ var Main = React.createClass({
);
}
});
+
+module.exports(Main);
http://git-wip-us.apache.org/repos/asf/allura/blob/b26d6db5/Allura/allura/public/nf/js/tooltip.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/tooltip.es6.js b/Allura/allura/public/nf/js/tooltip.es6.js
index 95f7188..f24fc16 100644
--- a/Allura/allura/public/nf/js/tooltip.es6.js
+++ b/Allura/allura/public/nf/js/tooltip.es6.js
@@ -75,3 +75,5 @@ class ToolTip extends React.Component {
}
}
+module.exports(ToolTip);
+
[10/20] allura git commit: [#8035] ESLINT FIX: require-jsdoc,
valid-jsdoc
Posted by he...@apache.org.
[#8035] ESLINT FIX: require-jsdoc, valid-jsdoc
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/10b886f5
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/10b886f5
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/10b886f5
Branch: refs/heads/hs/8035
Commit: 10b886f557dec866ea81cb2e76a79d2e29e1c87e
Parents: b26d6db
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 19:18:12 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:14 2016 -0500
----------------------------------------------------------------------
.eslintrc | 8 +++++++-
Allura/allura/public/nf/js/navbar.es6.js | 27 ++++++++++++---------------
2 files changed, 19 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/10b886f5/.eslintrc
----------------------------------------------------------------------
diff --git a/.eslintrc b/.eslintrc
index ff25e9d..835cf29 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,7 +4,13 @@
"indent": [2, 4],
"jsx-quotes": [0],
"quotes": [0],
- "operator-linebreak": [2, "before", { "overrides": { "?": "after", "&&": "after" } }]
+ "operator-linebreak": [2, "before", { "overrides": { "?": "after", "&&": "after" } }],
+ "require-jsdoc": [2, {"require": {
+ "FunctionDeclaration": true,
+ "MethodDefinition": false,
+ "ClassDeclaration": false
+ }
+ }]
},
"globals": {
"ReactDOM": true,
http://git-wip-us.apache.org/repos/asf/allura/blob/10b886f5/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 2d0201e..d83f1f0 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -21,18 +21,17 @@
'use strict';
/**
- * Gets the current project url.
-
- * @constructor
- * @param {bool} rest - Return a "rest" version of the url.
- * @returns {string}
- */
-function _getProjectUrl(rest = true) {
+* Gets the current project url.
+* @param {boolean} rest - Return a "rest" version of the url.
+* @returns {string} - Project Url
+*/
+var _getProjectUrl = function(rest = true) {
var nbhd;
var proj;
var nbhd_proj;
- var ident_classes = document.getElementById('page-body').className.split(' ');
- for (var cls of ident_classes) {
+ var identClasses = document.getElementById('page-body').className.split(' ');
+ var basePath = rest ? '/rest/' : '/';
+ for (var cls of identClasses) {
if (cls.indexOf('project-') === 0) {
proj = cls.slice('project-'.length);
}
@@ -43,8 +42,8 @@ function _getProjectUrl(rest = true) {
} else {
nbhd_proj = `${nbhd}/${proj}`;
}
- return (rest ? '/rest/' : '/') + nbhd_proj;
-}
+ return basePath + nbhd_proj;
+};
const ToolsPropType = React.PropTypes.shape({
mount_point: React.PropTypes.string,
@@ -469,8 +468,8 @@ var Main = React.createClass({
/**
* Handles the changing of the NavBars grouping threshold.
-
- * @param {object} event
+ * @param {object} event Fired when the threshold changes
+ * @return {boolean} False
*/
onUpdateThreshold: function(event) {
var thres = event.target.value;
@@ -486,8 +485,6 @@ var Main = React.createClass({
/**
* Handles the sending and updating tool ordinals.
-
- * @param {array} data - Array of tools
*/
onToolReorder: function() {
$('.react-drag.dragging').removeClass('dragging');
[14/20] allura git commit: [#8035] ESLINT FIX: operator-linebreak
Posted by he...@apache.org.
[#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/3776b083
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/3776b083
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/3776b083
Branch: refs/heads/hs/8035
Commit: 3776b0835885133e02e72cb4e2064e4acb0826fd
Parents: 48e7f4f
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 18:33:22 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:14 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/3776b083/.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/3776b083/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>
);
},
[03/20] allura git commit: [#8035] ESLINT FIX: one-var
Posted by he...@apache.org.
[#8035] ESLINT FIX: one-var
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/0f4e3b0c
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/0f4e3b0c
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/0f4e3b0c
Branch: refs/heads/hs/8035
Commit: 0f4e3b0c4aae857bddec5370df63a4ce833d77e9
Parents: f2f964b
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 18:12:23 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:13 2016 -0500
----------------------------------------------------------------------
Allura/allura/public/nf/js/navbar.es6.js | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/0f4e3b0c/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 ee356a4..4570872 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -27,7 +27,9 @@
* @returns {string}
*/
function _getProjectUrl(rest = true) {
- var nbhd, proj, nbhd_proj;
+ var nbhd;
+ var proj;
+ var nbhd_proj;
var ident_classes = document.getElementById('page-body').className.split(' ');
for (var cls of ident_classes) {
if (cls.indexOf('project-') === 0) {
@@ -287,7 +289,8 @@ var AdminNav = React.createClass({
buildMenu: function (items, isSubMenu=false) {
var _this = this;
var [tools, anchoredTools, endTools] = [[], [], []];
- var subMenu, childOptionsOpen;
+ var subMenu;
+ var childOptionsOpen;
for (let item of items) {
if (item.children) {
@@ -297,8 +300,8 @@ var AdminNav = React.createClass({
}
var _handle = isSubMenu ? "draggable-handle-sub" : 'draggable-handle';
-
- var toolList, isAnchored;
+ var toolList;
+ var isAnchored;
if (item.mount_point === 'admin') {
// force admin to end, just like 'Project.sitemap()' does
toolList = endTools;
[18/20] allura git commit: [#8035] ESLINT FIX: indent,
block-scoped-var
Posted by he...@apache.org.
[#8035] ESLINT FIX: indent, block-scoped-var
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/d51ada7b
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/d51ada7b
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/d51ada7b
Branch: refs/heads/hs/8035
Commit: d51ada7bec14404419ec83f2482c69bbc887efe6
Parents: 355d6fa
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 19:44:56 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:15 2016 -0500
----------------------------------------------------------------------
.eslintrc | 3 ++-
Allura/allura/public/nf/js/navbar.es6.js | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/d51ada7b/.eslintrc
----------------------------------------------------------------------
diff --git a/.eslintrc b/.eslintrc
index e58bfe1..455b95a 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -11,7 +11,8 @@
"ClassDeclaration": false
}
}],
- "no-inline-comments": 0
+ "no-inline-comments": 0,
+ "comma-dangle": 0
},
"globals": {
"ReactDOM": true,
http://git-wip-us.apache.org/repos/asf/allura/blob/d51ada7b/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 23f9313..52493bc 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -171,7 +171,7 @@ var NormalNavItem = React.createClass({
url: React.PropTypes.string.isRequired,
classes: React.PropTypes.string
},
- mixins: [React.addons.PureRenderMixin],
+ mixins: [React.addons.PureRenderMixin],
render: function() {
return (
<li key={`tb-norm-${_.uniqueId()}`}>
@@ -291,7 +291,7 @@ var AdminNav = React.createClass({
var [tools, anchoredTools, endTools] = [[], [], []];
var subMenu;
var childOptionsOpen;
-
+ var _handle;
for (let item of items) {
if (item.children) {
subMenu = this.buildMenu(item.children, true);
@@ -299,7 +299,7 @@ var AdminNav = React.createClass({
subMenu = null;
}
- var _handle = isSubMenu ? "draggable-handle-sub" : 'draggable-handle';
+ _handle = isSubMenu ? "draggable-handle-sub" : 'draggable-handle';
var toolList;
var isAnchored;
if (item.mount_point === 'admin') {
[05/20] allura git commit: [#8035] Update eslintrc to include plugins
Posted by he...@apache.org.
[#8035] Update eslintrc to include plugins
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/d30a5219
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/d30a5219
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/d30a5219
Branch: refs/heads/hs/8035
Commit: d30a521931eadde61f08fbf780e7376a774c5cc6
Parents: 07e6ae4
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 15:45:44 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:13 2016 -0500
----------------------------------------------------------------------
.eslintrc | 51 +++++++++++++++++++--------------------------------
1 file changed, 19 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/d30a5219/.eslintrc
----------------------------------------------------------------------
diff --git a/.eslintrc b/.eslintrc
index 493b774..2ba7869 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,42 +1,29 @@
{
"rules": {
- "indent": [2, 4],
- "no-unused-vars": [2, {"vars": "all", "args": "none"}],
- "no-console": 0,
- "semi": [2, "always"],
- "eqeqeq": 2,
- "block-scoped-var": 2,
- "consistent-return": 2,
- // specify curly brace conventions for all control statements
- "curly": [2, "all"],
- // require default case in switch statements
- "default-case": 2,
- // disallow use of eval()
- "no-eval": 2,
- // disallow adding to native types
- "no-extend-native": 2,
- // disallow use of eval()-like methods
- "no-implied-eval": 2,
- // disallow this keywords outside of classes or class-like objects
- "no-invalid-this": 2,
- // disallow creation of functions within loops
- "no-loop-func": 2,
- // disallow declaring the same variable more then once
- "no-redeclare": 2,
- // disallow use of the with statement
- "no-with": 2,
- // require use of the second argument for parseInt()
- "radix": 2
+ "indent": [
+ 2,
+ 4
+ ]
},
"globals": {
-
+ "ReactDOM": true,
+ "$": true,
+ "window": true,
+ "_": true,
+ "ReactReorderable": true
},
- "parser": "esprima-fb",
+ "parser": "babel-eslint",
"env": {
- "browser": true,
- "jquery": true
+ "es6": true,
+ "browser": true
+ },
+ "extends": "google",
+ "ecmaFeatures": {
+ "jsx": true,
+ "forOf": true,
+ "experimentalObjectRestSpread": true
},
- "extends": "eslint:recommended",
"plugins": [
+ "react"
]
}
\ No newline at end of file
[08/20] allura git commit: [#8035] ESLINT FIX: max-len
Posted by he...@apache.org.
[#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/842c6d5f
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/842c6d5f
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/842c6d5f
Branch: refs/heads/hs/8035
Commit: 842c6d5fdc2041efa78024c5c23b44dd91b30f2f
Parents: 079a754
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 17:37:38 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:13 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/842c6d5f/.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/842c6d5f/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);
}
[12/20] allura git commit: [#8035] ESLINT FIX: no-implicit-coercion
Posted by he...@apache.org.
[#8035] ESLINT FIX: no-implicit-coercion
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/355d6fa6
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/355d6fa6
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/355d6fa6
Branch: refs/heads/hs/8035
Commit: 355d6fa6ded99249c9bdaf76447b1d0fcea52e3d
Parents: 5d75779
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 19:32:34 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:14 2016 -0500
----------------------------------------------------------------------
Allura/allura/public/nf/js/navbar.es6.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/355d6fa6/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 d83f1f0..23f9313 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -139,7 +139,7 @@ var GroupingThreshold = React.createClass({
render: function() {
return (
<div>
- { !!this.props.isHidden &&
+ { !Boolean(this.props.isHidden) &&
<div id='threshold-config'>
<span>
<label htmlFor='threshold-input'>Grouping Threshold</label>
[04/20] allura git commit: [#8035] ESLINT FIX: camelcase (add file
override for api-heavy files)
Posted by he...@apache.org.
[#8035] ESLINT FIX: camelcase (add file override for api-heavy files)
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/f2f964bb
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/f2f964bb
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/f2f964bb
Branch: refs/heads/hs/8035
Commit: f2f964bba07229975147b1fa32724b8b37e03fa3
Parents: 364f2cd
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 18:04:21 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:13 2016 -0500
----------------------------------------------------------------------
Allura/allura/public/nf/js/context-menu.es6.js | 1 +
Allura/allura/public/nf/js/navbar.es6.js | 31 +++++++++++----------
2 files changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/f2f964bb/Allura/allura/public/nf/js/context-menu.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/context-menu.es6.js b/Allura/allura/public/nf/js/context-menu.es6.js
index 7572fb3..96ab2e1 100644
--- a/Allura/allura/public/nf/js/context-menu.es6.js
+++ b/Allura/allura/public/nf/js/context-menu.es6.js
@@ -16,6 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
+/* eslint camelcase: 0 */
'use strict';
http://git-wip-us.apache.org/repos/asf/allura/blob/f2f964bb/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 b1a0eb3..ee356a4 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -16,6 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
+/* eslint camelcase: 0 */
'use strict';
/**
@@ -285,7 +286,7 @@ var AdminNav = React.createClass({
buildMenu: function (items, isSubMenu=false) {
var _this = this;
- var [tools, anchored_tools, end_tools] = [[], [], []];
+ var [tools, anchoredTools, endTools] = [[], [], []];
var subMenu, childOptionsOpen;
for (let item of items) {
@@ -297,19 +298,19 @@ var AdminNav = React.createClass({
var _handle = isSubMenu ? "draggable-handle-sub" : 'draggable-handle';
- var tool_list, is_anchored;
+ var toolList, isAnchored;
if (item.mount_point === 'admin') {
// force admin to end, just like 'Project.sitemap()' does
- tool_list = end_tools;
- is_anchored = true;
+ toolList = endTools;
+ isAnchored = true;
} else if (item.is_anchored) {
- tool_list = anchored_tools;
- is_anchored = true;
+ toolList = anchoredTools;
+ isAnchored = true;
} else {
- tool_list = tools;
- is_anchored = false;
+ toolList = tools;
+ isAnchored = false;
}
- var core_item = <NavBarItem
+ var coreItem = <NavBarItem
{..._this.props}
mount_point={ item.mount_point }
name={ item.name }
@@ -317,27 +318,27 @@ var AdminNav = React.createClass({
isGrouper={item.children && item.children.length > 0}
url={ item.url }
key={ 'tb-item-' + _.uniqueId() }
- is_anchored={ is_anchored }
+ is_anchored={ isAnchored }
options={ item.admin_options }
/>;
if (subMenu) {
childOptionsOpen = _.contains(_.pluck(item.children, 'mount_point'),
this.props.currentOptionMenu.tool);
- tool_list.push(<NavBarItemWithSubMenu
+ toolList.push(<NavBarItemWithSubMenu
key={_.uniqueId()}
- tool={core_item}
+ tool={coreItem}
subMenu={subMenu}
childOptionsOpen={childOptionsOpen}
/>);
} else {
- tool_list.push(core_item);
+ toolList.push(coreItem);
}
}
return (
<div className='react-drag'>
- { anchored_tools }
+ { anchoredTools }
<ReactReorderable
key={ 'reorder-' + _.uniqueId() }
handle={"." + _handle}
@@ -346,7 +347,7 @@ var AdminNav = React.createClass({
onDrop={ _this.props.onToolReorder }>
{ tools }
</ReactReorderable>
- { end_tools }
+ { endTools }
{ !isSubMenu && <div id="add-tool-container" className="unlocked-container">
<ToggleAddNewTool installableTools={this.props.installableTools}/>
</div>}
[15/20] allura git commit: [#8035] ESLINT FIX: space-infix-ops
Posted by he...@apache.org.
[#8035] ESLINT FIX: space-infix-ops
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/6abcb9c4
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/6abcb9c4
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/6abcb9c4
Branch: refs/heads/hs/8035
Commit: 6abcb9c43744809292434ad0dd9317dc90487612
Parents: 3776b08
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 18:34:22 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:14 2016 -0500
----------------------------------------------------------------------
Allura/allura/public/nf/js/navbar.es6.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/6abcb9c4/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 818bb3e..a7266ae 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -286,7 +286,7 @@ var AdminNav = React.createClass({
onOptionClick: React.PropTypes.func.isRequired
},
- buildMenu: function(items, isSubMenu=false) {
+ buildMenu: function(items, isSubMenu = false) {
var _this = this;
var [tools, anchoredTools, endTools] = [[], [], []];
var subMenu;
[07/20] allura git commit: [#8035] ESLINT FIX: quotes, jsx-quotes
Posted by he...@apache.org.
[#8035] ESLINT FIX: quotes, jsx-quotes
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/364f2cdf
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/364f2cdf
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/364f2cdf
Branch: refs/heads/hs/8035
Commit: 364f2cdf9f3a467cfa75854fe763624d2ff40a49
Parents: 842c6d5
Author: Heith Seewald <he...@gmail.com>
Authored: Thu Jan 21 17:44:54 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Thu Jan 21 19:59:13 2016 -0500
----------------------------------------------------------------------
.eslintrc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/364f2cdf/.eslintrc
----------------------------------------------------------------------
diff --git a/.eslintrc b/.eslintrc
index a66f2fa..b42eb66 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,7 +1,9 @@
{
"rules": {
"max-len": [1, 119, 4],
- "indent": [2, 4]
+ "indent": [2, 4],
+ "jsx-quotes": [0],
+ "quotes": [0]
},
"globals": {
"ReactDOM": true,