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:37 UTC
[04/20] allura git commit: [#8035] ESLINT FIX: camelcase (add file
override for api-heavy files)
[#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>}