upgrade rc-tools

Author: yiminghe

.gitignore

@@ -19,11 +19,8 @@ Thumbs.db
 *.pyo
 .build
 node_modules
-_site
-sea-modules
-spm_modules
 .cache
 dist
 assets/**/*.css
-examples/**/*.css
-build
+build
+lib

.jscsrc

@@ -1,6 +1,5 @@
-bower_components/
+build/
 *.cfg
-node_modules/
 nohup.out
 *.iml
 .idea/
@@ -21,9 +20,10 @@ Thumbs.db
 out/
 .build
 node_modules
-_site
-sea-modules
-spm_modules
 .cache
-dist
-build
+examples
+tests
+src
+/index.js
+.*
+assets/**/*.less

.jshintrc

@@ -1,4 +1,5 @@
-/** @jsx React.DOM */
+'use strict';
+
 var React = require('react');
 var Menu = require('rc-menu');
 var SubMenu = Menu.SubMenu;

.npmignore

@@ -1,4 +1,5 @@
-/** @jsx React.DOM */
+'use strict';
+
 var React = require('react');
 var Menu = require('rc-menu');
 var SubMenu = Menu.SubMenu;

examples/multiple.js

@@ -1,4 +1,5 @@
-/** @jsx React.DOM */
+'use strict';
+
 var React = require('react');
 var Menu = require('rc-menu');
 var SubMenu = Menu.SubMenu;

examples/scrollable.js

@@ -1,4 +1,5 @@
-/** @jsx React.DOM */
+'use strict';
+
 var React = require('react');
 var Menu = require('rc-menu');
 var SubMenu = Menu.SubMenu;
@@ -20,7 +21,7 @@ var style = `
   zoom:1;
 }
 .rc-top-menu:after {
-  content:"\20";
+  content:"\\20";
   display:block;
   height:0;
   clear:both;

examples/single.js

@@ -1,4 +1 @@
-var Menu = require('./lib/Menu');
-Menu.SubMenu = require('./lib/SubMenu');
-Menu.Item = require('./lib/MenuItem');
-module.exports = Menu;
+module.exports = require('./src/');

examples/top.js

@@ -1,6 +1,6 @@
 {
   "name": "rc-menu",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "menu ui component for react",
   "keywords": [
     "react",
@@ -22,23 +22,17 @@
     "url": "http://github.com/react-component/menu/issues"
   },
   "licenses": "MIT",
-  "spm": {
-    "dependencies": {
-      "react": "*",
-      "rc-util": "2.x",
-      "dom-scroll-into-view": "^1.0.1"
-    }
-  },
   "config": {
     "port": 8000
   },
   "scripts": {
     "build": "rc-tools run build",
+    "precommit": "rc-tools run precommit",
     "less": "rc-tools run less",
     "gh-pages": "rc-tools run gh-pages",
     "history": "rc-tools run history",
     "start": "node --harmony node_modules/.bin/rc-server",
-    "publish": "rc-tools run tag && spm publish",
+    "publish": "rc-tools run tag",
     "lint": "rc-tools run lint",
     "saucelabs": "node --harmony node_modules/.bin/rc-tools run saucelabs",
     "browser-test": "node --harmony node_modules/.bin/rc-tools run browser-test",
@@ -51,16 +45,15 @@
     "gregorian-calendar-format": "^2.1.1",
     "precommit-hook": "^1.0.7",
     "rc-calendar": "^1.5.8",
-    "rc-server": "^2.0.0",
-    "rc-tools": "2.x",
+    "rc-server": "3.x",
+    "rc-tools": "3.x",
     "react": "~0.13.0"
   },
   "dependencies": {
     "dom-scroll-into-view": "^1.0.1",
     "rc-util": "2.x"
   },
   "precommit": [
-    "lint",
-    "less"
+    "precommit"
   ]
 }

index.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var React = require('react');
 var rcUtil = require('rc-util');
 var joinClasses = rcUtil.joinClasses;
@@ -93,6 +95,7 @@ class Menu extends React.Component {
       case KeyCode.DOWN: //down
         activeKey = this.step(1);
         break;
+      default:
     }
     if (activeKey) {
       e.preventDefault();
@@ -116,16 +119,16 @@ class Menu extends React.Component {
     }
     // find current activeIndex
     var activeIndex = -1;
-    children.every((c, i)=> {
+    children.every((c, ci)=> {
       if (c.key === activeKey) {
-        activeIndex = i;
+        activeIndex = ci;
         return false;
       }
       return true;
     });
     var start = (activeIndex + 1) % len;
     var i = start;
-    while (1) {
+    for (;;) {
       var child = children[i];
       var key = child.key;
       if (child.props.disabled) {
@@ -239,8 +242,8 @@ class Menu extends React.Component {
     classes[props.prefixCls] = true;
     var domProps = {
       className: joinClasses(props.className, classSet(classes)),
-      role: "menu",
-      "aria-activedescendant": ""
+      role: 'menu',
+      'aria-activedescendant': ''
     };
     if (props.id) {
       domProps.id = props.id;

package.json

@@ -1,3 +1,5 @@
+'use strict';
+
 var React = require('react');
 var rcUtil = require('rc-util');
 var joinClasses = rcUtil.joinClasses;
@@ -55,11 +57,10 @@ class MenuItem extends React.Component {
       } else {
         props.onSelect(eventKey, this, e);
       }
-    } else {
-      if (!props.selected) {
-        props.onSelect(eventKey, this, e);
-      }
+    } else if (!props.selected) {
+      props.onSelect(eventKey, this, e);
     }
+
   }
 
   componentWillUnmount() {
@@ -79,9 +80,9 @@ class MenuItem extends React.Component {
     var attrs = {
       title: props.title,
       className: joinClasses(props.className, classSet(classes)),
-      role: "menuitem",
-      "aria-selected": props.selected,
-      "aria-disabled": props.disabled
+      role: 'menuitem',
+      'aria-selected': props.selected,
+      'aria-disabled': props.disabled
     };
     var mouseEvent = {};
     if (!props.disabled) {

lib/Menu.jsx renamed to src/Menu.jsx

@@ -1,3 +1,5 @@
+'use strict';
+
 var React = require('react');
 var rcUtil = require('rc-util');
 var joinClasses = rcUtil.joinClasses;
@@ -81,7 +83,7 @@ var SubMenu = React.createClass({
       if (this.state.open) {
         handled = menu.handleKeyDown(e);
       } else {
-        return;
+        return undefined;
       }
       if (!handled) {
         this.setOpenState(false);

lib/MenuItem.jsx renamed to src/MenuItem.jsx

@@ -1,3 +1,5 @@
+'use strict';
+
 var rcUtil = require('rc-util');
 var KeyCode = rcUtil.KeyCode;
 var React = require('react');

lib/SubMenu.jsx renamed to src/SubMenu.jsx

@@ -0,0 +1,6 @@
+'use strict';
+
+var Menu = require('./Menu');
+Menu.SubMenu = require('./SubMenu');
+Menu.Item = require('./MenuItem');
+module.exports = Menu;

lib/SubMenuStateMixin.jsx renamed to src/SubMenuStateMixin.jsx

@@ -1,4 +1,4 @@
-/** @jsx React.DOM */
+'use strict';
 
 var expect = require('expect.js');
 var React = require('react/addons');

src/index.js

@@ -1,4 +1,4 @@
-/** @jsx React.DOM */
+'use strict';
 
 var expect = require('expect.js');
 var React = require('react/addons');

tests/Menu.spec.js

@@ -1,4 +1,4 @@
-/** @jsx React.DOM */
+'use strict';
 
 require('/assets/index.css');
 require('./Menu.spec');