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 2015/12/17 20:22:23 UTC
[36/50] [abbrv] allura git commit: [#7919] fix className in
ContextMenu, so admin modals work again
[#7919] fix className in ContextMenu, so admin modals work again
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/478fc333
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/478fc333
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/478fc333
Branch: refs/heads/db/8034
Commit: 478fc333ffa79f49fb951d8f475b501cdc0711d3
Parents: 0bc1567
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Dec 9 18:05:41 2015 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Wed Dec 16 13:55:39 2015 -0600
----------------------------------------------------------------------
Allura/allura/public/nf/js/context-menu.es6.js | 6 +++---
Allura/allura/public/nf/js/navbar.es6.js | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/478fc333/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 3ce3c96..7572fb3 100644
--- a/Allura/allura/public/nf/js/context-menu.es6.js
+++ b/Allura/allura/public/nf/js/context-menu.es6.js
@@ -25,12 +25,12 @@ class ContextMenu extends React.Component {
}
static propTypes = {
- classes: React.PropTypes.array.isRequired,
+ classes: React.PropTypes.array,
items: React.PropTypes.arrayOf(React.PropTypes.object).isRequired,
onOptionClick: React.PropTypes.func.isRequired
};
- static defaultOptions = {
+ static defaultProps = {
classes: []
};
@@ -69,7 +69,7 @@ class ContextMenu extends React.Component {
this.props.items.map(function (o, i) {
return (<li key={i}>
<a href={o.href}
- classes={_this.props.classes.concat([o.className])}
+ className={_this.props.classes.concat([o.className]).join(' ')}
title={o.tooltip}>{o.text}</a>
</li>)
})}
http://git-wip-us.apache.org/repos/asf/allura/blob/478fc333/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 e7262d1..a4cfeb3 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -148,7 +148,6 @@ var NavBarItem = React.createClass({
&& this.props.currentOptionMenu.tool === this.props.mount_point
&& <ContextMenu
{...this.props}
- classes={['tool-options']}
items={this.props.options}
onOptionClick={this.props.onOptionClick}
/>}