allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [21/50] [abbrv] allura git commit: [#7919] fix className in ContextMenu, so admin modals work again
Date Fri, 08 Jan 2016 19:30:26 GMT
[#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/e1331673
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e1331673
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e1331673

Branch: refs/heads/master
Commit: e13316739c8c1f9bc48ba9497e2afcc7bc2b9a39
Parents: 7b7754b
Author: Dave Brondsema <dave@brondsema.net>
Authored: Wed Dec 9 18:05:41 2015 -0500
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Fri Jan 8 14:06:16 2016 -0500

----------------------------------------------------------------------
 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/e1331673/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/e1331673/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}
                     />}


Mime
View raw message