Merge pull request react-bootstrap#1228 from AlexKVal/v0.26-rc

`v0.26 rc` lift-up
kyletsang · Aug 27, 2015 · 0a22241 · 0a22241
2 parents 757aa97 + 886054d
commit 0a22241
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -55,10 +55,10 @@
     "css-loader": "^0.16.0",
     "es5-shim": "^4.1.10",
     "eslint": "^1.1.0",
-    "eslint-config-airbnb": "0.0.7",
+    "eslint-config-airbnb": "0.0.8",
     "eslint-plugin-babel": "^2.0.0",
     "eslint-plugin-lodash": "^0.1.3",
-    "eslint-plugin-mocha": "^0.4.0",
+    "eslint-plugin-mocha": "^0.5.1",
     "eslint-plugin-react": "^3.1.0",
     "express": "^4.13.1",
     "extract-text-webpack-plugin": "^0.8.2",

diff --git a/src/MenuItem.js b/src/MenuItem.js
@@ -47,6 +47,7 @@ export default class MenuItem extends React.Component {
         <SafeAnchor
           role='menuitem'
           tabIndex='-1'
+          id={this.props.id}
           target={this.props.target}
           title={this.props.title}
           href={this.props.href || ''}
@@ -78,7 +79,11 @@ MenuItem.propTypes = {
   target: React.PropTypes.string,
   title: React.PropTypes.string,
   onKeyDown: React.PropTypes.func,
-  onSelect: React.PropTypes.func
+  onSelect: React.PropTypes.func,
+  id: React.PropTypes.oneOfType([
+    React.PropTypes.string,
+    React.PropTypes.number
+  ])
 };
 
 MenuItem.defaultProps = {

diff --git a/src/utils/CustomPropTypes.js b/src/utils/CustomPropTypes.js
@@ -44,7 +44,7 @@ const CustomPropTypes = {
 
   isRequiredForA11y(propType){
     return function(props, propName, componentName){
-      if (props[propName] === null) {
+      if (props[propName] == null) {
         return new Error(
           'The prop `' + propName + '` is required to make ' + componentName + ' accessible ' +
             'for users using assistive technologies such as screen readers `'