Skip to content

Commit 0a46f2c

Browse files
committed
use jsx
1 parent d1e797e commit 0a46f2c

File tree

6 files changed

+30
-20
lines changed

6 files changed

+30
-20
lines changed

.travis.yml

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,36 @@
11
language: node_js
2+
23
notifications:
34
email:
45
6+
57
node_js:
6-
- 0.11
7-
before_script:
8-
- npm start &
9-
- npm install mocha-phantomjs -g
10-
- phantomjs --version
8+
- 0.12
9+
10+
before_install:
11+
- |
12+
if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.md$)|(^(docs|examples))/'
13+
then
14+
echo "Only docs were updated, stopping build process."
15+
exit
16+
fi
17+
npm install mocha-phantomjs -g
18+
phantomjs --version
19+
1120
script:
12-
- npm test
13-
- npm run-script browser-test
14-
- npm run-script browser-test-cover
15-
- npm run saucelabs
21+
- |
22+
if [ "$TEST_TYPE" = test ]; then
23+
npm test
24+
else
25+
npm run $TEST_TYPE
26+
fi
27+
1628
env:
29+
matrix:
30+
- TEST_TYPE=lint
31+
- TEST_TYPE=browser-test
32+
- TEST_TYPE=browser-test-cover
33+
- TEST_TYPE=saucelabs
1734
global:
1835
- secure: ZA1AnTsJO9Y4lT+G9t7D0JEsgDoq7Dv2toYqXKzThdeHtjwToJ3BD98GksPrq7IkYE0H+Mr7J5c9PPJWQ2neYw42l+FaWtpPd7EypVudnMI/JM9CEND3llz3hRKaeqSN8ny23neR6GwXUsTSNwvXZ+pm0PIGDAJl8nEtX4BAdiw=
1936
- secure: IRy84xceUtLxjZLb13NQQqPmOa8X9CJy0SSi2DLYwBldhOrebXEBqkdIxwkIsog8og/PsSvVKDYTZCKOF0LVkRbzrsJWzT6trKWf+dzvV2QXOInYU1Whke3ECCuiq9RISjfSKFWvwHHhS8NnmoiT+FkfP7NIjbwsRTISCkNxwNk=

lib/Menu.js renamed to lib/Menu.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/** @jsx React.DOM */
2-
31
var React = require('react');
42
var rcUtil = require('rc-util');
53
var joinClasses = rcUtil.joinClasses;

lib/MenuItem.js renamed to lib/MenuItem.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/** @jsx React.DOM */
2-
31
var React = require('react');
42
var rcUtil = require('rc-util');
53
var joinClasses = rcUtil.joinClasses;

lib/SubMenu.js renamed to lib/SubMenu.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/** @jsx React.DOM */
2-
31
var React = require('react');
42
var rcUtil = require('rc-util');
53
var joinClasses = rcUtil.joinClasses;
File renamed without changes.

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rc-menu",
3-
"version": "3.2.0",
3+
"version": "3.2.1",
44
"description": "menu ui component for react",
55
"keywords": [
66
"react",
@@ -40,10 +40,9 @@
4040
"start": "node --harmony node_modules/.bin/rc-server",
4141
"publish": "rc-tools run tag && spm publish",
4242
"lint": "rc-tools run lint",
43-
"test": "",
44-
"saucelabs": "rc-tools run saucelabs",
45-
"browser-test": "rc-tools run browser-test",
46-
"browser-test-cover": "rc-tools run browser-test-cover"
43+
"saucelabs": "node --harmony node_modules/.bin/rc-tools run saucelabs",
44+
"browser-test": "node --harmony node_modules/.bin/rc-tools run browser-test",
45+
"browser-test-cover": "node --harmony node_modules/.bin/rc-tools run browser-test-cover"
4746
},
4847
"devDependencies": {
4948
"font-awesome": "~4.2.0",

0 commit comments

Comments
 (0)