Skip to content

Commit a3b1f65

Browse files
taiontaion
committed
Merge branch 'master' into react-14
2 parents 7dbcd12 + 08d5758 commit a3b1f65

File tree

180 files changed

+1721
-1438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+1721
-1438
lines changed

‎.eslintrc‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,49 +15,20 @@
1515
"rules": {
1616
"constructor-super": 2,
1717
"comma-dangle": 0,
18-
"comma-spacing": 2,
19-
"comma-style": [2, "last"],
2018
"func-names": 0,
2119
"guard-for-in": 0,
2220
"one-var": [2, { "initialized": "never" }],
23-
"padded-blocks": 0,
2421
"prefer-const": 0,
2522
"key-spacing": 0,
2623
"no-eq-null": 0,
2724
"no-else-return": 0,
28-
"no-multiple-empty-lines": 0,
29-
"no-nested-ternary": 0,
3025
"no-param-reassign": 0,
3126
"no-this-before-super": 2,
32-
"no-throw-literal": 0,
33-
"no-underscore-dangle": 0,
3427
"no-undef": 2,
35-
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
36-
"no-use-before-define": 0,
37-
"no-var": 2,
3828
"babel/object-shorthand": 2,
39-
"quotes": [2, "single", "avoid-escape"],
40-
"react/display-name": 0,
4129
"react/jsx-boolean-value": [2, "never"],
42-
"react/jsx-quotes": 0,
4330
"react/jsx-no-duplicate-props": 2,
44-
"react/jsx-no-undef": 2,
45-
"react/jsx-uses-react": 2,
46-
"react/no-did-mount-set-state": 2,
47-
"react/no-did-update-set-state": 2,
48-
"react/no-multi-comp": 2,
4931
"react/prop-types": [2, { "ignore": [ "children", "className", "style" ] }],
50-
"react/react-in-jsx-scope": 2,
51-
"react/self-closing-comp": 2,
52-
"react/sort-comp": 0,
53-
"react/wrap-multilines": 2,
54-
"react/jsx-uses-vars": 2,
55-
"space-after-keywords": 0,
56-
"space-before-blocks": 0,
57-
"space-before-function-paren": 0,
58-
"space-infix-ops": 2,
59-
"spaced-comment": 0,
60-
"strict": [2, "never"],
61-
"vars-on-top": 0
32+
"react/sort-comp": 0
6233
}
6334
}

‎.travis.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ sudo: false
22
language: node_js
33
node_js:
44
- "iojs"
5+
cache:
6+
directories:
7+
- node_modules
58
notifications:
69
webhooks:
710
urls:

‎CHANGELOG.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
v0.25.2 - Sat, 12 Sep 2015 15:59:13 GMT
2+
---------------------------------------
3+
4+
- [f2c3b68](../../commit/f2c3b68) [changed] tab keyboard navigation to be more inline with ARIA spec
5+
- [0c27403](../../commit/0c27403) [fixed] Don't render Grid or Row with Tabs
6+
- [b847dec](../../commit/b847dec) [added] active prop on MenuItem (again)
7+
- [3a369cc](../../commit/3a369cc) [fixed] Error on opening dropdown without focusable items
8+
- [bad277e](../../commit/bad277e) [changed] Use PropTypes.node for validation and fix/add tests
9+
- [533530a](../../commit/533530a) [added] Adds a callout to the sr-only button in `Closable Alerts`
10+
- [1f29000](../../commit/1f29000) [fixed] screen-reader accessible dismiss button on alerts
11+
- [c8a59c6](../../commit/c8a59c6) [fixed] OverlayTrigger hover triggers on mousenter/leave
12+
- [9c69271](../../commit/9c69271) [fixed] OverlayTrigger event handlers are properly maintained
13+
- [da1d0bc](../../commit/da1d0bc) [fixed] focus returns to the toggle by default onClose
14+
15+
16+
17+
v0.25.1 - Fri, 28 Aug 2015 18:30:59 GMT
18+
---------------------------------------
19+
20+
- [478300a](../../commit/478300a) [fixed] Handle falsey DropdownMenu children correctly
21+
- [c450e96](../../commit/c450e96) [fixed] stop rendering extra attributes on Progress bar dom nodes
22+
- [3ceb7af](../../commit/3ceb7af) [fixed] allow null activeKey (empty) selection
23+
- [a7f93ae](../../commit/a7f93ae) [fixed] title is not passed to tab pane DOM node
24+
- [1bee466](../../commit/1bee466) [changed] 'id' prop-type made uniform throughout the project
25+
- [e438250](../../commit/e438250) [fixed] 'isRequireForA11y' undefined/null checking
26+
- [664b465](../../commit/664b465) [fixed] id passthrough for MenuItem
27+
28+
29+
130
v0.25.0 - Tue, 25 Aug 2015 18:56:33 GMT
231
---------------------------------------
332

‎README.md‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@
1818

1919
__Under active development - APIs will change.__ Check out the [1.0.0 Roadmap](https://github.com/react-bootstrap/react-bootstrap/wiki#100-roadmap) and [Contributing Guidelines][contributing] to see where you can help out. Prior to the 1.0.0 release, deprecations or breaking changes should result in a Minor version bump.
2020

21+
## React-0.14
22+
23+
If you want to try / play with `React-0.14` betas, we cut releases from the `react-14` branch.
24+
They're on the `react-pre` tag.
25+
```
26+
> npm install react-bootstrap@react-pre
27+
```
28+
2129
## Docs
2230

2331
See the [documentation][documentation] with live editable examples.
@@ -54,7 +62,7 @@ Yes please! See the [contributing guidelines][contributing] for details.
5462
[npm]: http://badge.fury.io/js/react-bootstrap
5563

5664
[bower-badge]: https://badge.fury.io/bo/react-bootstrap.svg
57-
[bower]: http://badge.fury.io/bo/react-bootstrap
65+
[bower]: http://badge.fury.io/bo/react-bootstrap
5866

5967
[gitter-badge]: https://badges.gitter.im/Join%20Chat.svg
6068
[gitter]: https://gitter.im/react-bootstrap/react-bootstrap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
@@ -66,7 +74,7 @@ Yes please! See the [contributing guidelines][contributing] for details.
6674
[dev-deps]: https://david-dm.org/react-bootstrap/react-bootstrap#info=devDependencies
6775

6876
[peer-deps-badge]: https://david-dm.org/react-bootstrap/react-bootstrap/peer-status.svg
69-
[peer-deps]: https://david-dm.org/react-bootstrap/react-bootstrap#info=peerDependencies
77+
[peer-deps]: https://david-dm.org/react-bootstrap/react-bootstrap#info=peerDependencies
7078

7179
[react-router-bootstrap]: https://github.com/react-bootstrap/react-router-bootstrap
7280
[react-router]: https://github.com/rackt/react-router

‎docs/build.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const readmeDest = path.join(docsBuilt, 'README.md');
3030
* @internal
3131
*/
3232
function generateHTML(fileName) {
33-
return new Promise((resolve) => {
33+
return new Promise( resolve => {
3434
const urlSlug = fileName === 'index.html' ? '/' : `/${fileName}`;
3535

3636
Router.run(routes, new Location(urlSlug), (error, initialState) => {

‎docs/examples/AlertAutoDismissable.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const AlertAutoDismissable = React.createClass({
88
render() {
99
if (this.state.alertVisible) {
1010
return (
11-
<Alert bsStyle='danger' onDismiss={this.handleAlertDismiss} dismissAfter={2000}>
11+
<Alert bsStyle="danger" onDismiss={this.handleAlertDismiss} dismissAfter={2000}>
1212
<h4>Oh snap! You got an error!</h4>
1313
<p>But this will hide after 2 seconds.</p>
1414
</Alert>

‎docs/examples/AlertBasic.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const alertInstance = (
2-
<Alert bsStyle='warning'>
2+
<Alert bsStyle="warning">
33
<strong>Holy guacamole!</strong> Best check yo self, you're not looking too good.
44
</Alert>
55
);

‎docs/examples/AlertDismissable.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ const AlertDismissable = React.createClass({
88
render() {
99
if (this.state.alertVisible) {
1010
return (
11-
<Alert bsStyle='danger' onDismiss={this.handleAlertDismiss}>
11+
<Alert bsStyle="danger" onDismiss={this.handleAlertDismiss}>
1212
<h4>Oh snap! You got an error!</h4>
1313
<p>Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.</p>
1414
<p>
15-
<Button bsStyle='danger'>Take this action</Button>
15+
<Button bsStyle="danger">Take this action</Button>
1616
<span> or </span>
1717
<Button onClick={this.handleAlertDismiss}>Hide Alert</Button>
1818
</p>

‎docs/examples/ButtonActive.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const buttonsInstance = (
22
<ButtonToolbar>
3-
<Button bsStyle='primary' bsSize='large' active>Primary button</Button>
4-
<Button bsSize='large' active>Button</Button>
3+
<Button bsStyle="primary" bsSize="large" active>Primary button</Button>
4+
<Button bsSize="large" active>Button</Button>
55
</ButtonToolbar>
66
);
77

‎docs/examples/ButtonBlock.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const wellStyles = {maxWidth: 400, margin: '0 auto 10px'};
22

33
const buttonsInstance = (
4-
<div className='well' style={wellStyles}>
5-
<Button bsStyle='primary' bsSize='large' block>Block level button</Button>
6-
<Button bsSize='large' block>Block level button</Button>
4+
<div className="well" style={wellStyles}>
5+
<Button bsStyle="primary" bsSize="large" block>Block level button</Button>
6+
<Button bsSize="large" block>Block level button</Button>
77
</div>
88
);
99

0 commit comments

Comments
 (0)