Skip to content

Commit

Permalink
Merge branch 'master' into react-14
Browse files Browse the repository at this point in the history
  • Loading branch information
taion committed Aug 13, 2015
2 parents 2ec8528 + df01f05 commit b8448f5
Show file tree
Hide file tree
Showing 128 changed files with 3,836 additions and 2,374 deletions.
6 changes: 3 additions & 3 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"optional": [
"es7.objectRestSpread"
]
"stage": 1,
"optional": ["runtime"],
"loose": ["all"]
}
6 changes: 4 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"extends": ["defaults"],
"env": {
"browser": true,
"node": true
Expand All @@ -24,6 +25,8 @@
"babel/object-shorthand": 2,
"quotes": [2, "single", "avoid-escape"],
"react/display-name": 0,
"react/jsx-boolean-value": [2, "never"],
"react/jsx-no-duplicate-props": 2,
"react/jsx-no-undef": 2,
"react/jsx-uses-react": 2,
"react/no-did-mount-set-state": 2,
Expand All @@ -34,8 +37,7 @@
"react/self-closing-comp": 2,
"react/wrap-multilines": 2,
"react/jsx-uses-vars": 2,
/* disable till https://github.com/eslint/eslint/issues/3016 is resolved */
"space-infix-ops": 0,
"space-infix-ops": 2,
"strict": [2, "never"]
}
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
*~
.DS_Store
npm-debug.log
npm-debug.log*
node_modules
amd/
!tools/amd/
Expand Down
87 changes: 87 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,90 @@
v0.24.4 - Mon, 10 Aug 2015 19:33:35 GMT
---------------------------------------

- [b688014](../../commit/b688014) [added] custom feedback icons for Input
- [83cdaa3](../../commit/83cdaa3) [added] formControlFeedback prop to Glyphicon
- [2ecac68](../../commit/2ecac68) [fixed] Modal uses provided className again
- [47bd7f6](../../commit/47bd7f6) [fixed] disabled pagination buttons should not fire 'onSelect'
- [c60dc03](../../commit/c60dc03) [fixed] only add aria-expanded to Collapse when an ARIA role is present



v0.24.3 - Fri, 31 Jul 2015 18:09:54 GMT
---------------------------------------

- [02f8966](../../commit/02f8966) [changed] Update dependencies
- [bae8ba9](../../commit/bae8ba9) [fixed] Carousel checks if it is mounted before setting state
- [fd8d4d2](../../commit/fd8d4d2) [fixed] regression when clicking "static" modal backdrops
- [0f46a97](../../commit/0f46a97) [added] Allow custom Modal dialog components
- [a4ce7e1](../../commit/a4ce7e1) [fixed] added finalisation for the Modal when it was unbound from the tree
- [d89d5f3](../../commit/d89d5f3) [fixed] Modal error when backdrop is `false`
- [f410904](../../commit/f410904) [added] 'xs, sm, md, lg' values for 'bsSize'
- [2558f32](../../commit/2558f32) [fixed] TabbedArea panes rendering with animation
- [90aece6](../../commit/90aece6) [changed] Simplify 'styleMaps.STYLES' to be of Array type
- [860d168](../../commit/860d168) [fixed] allow totally custom styles via 'bsStyle'
- [74da76a](../../commit/74da76a) [fixed] Prevent click on PageItem if disabled



v0.24.2 - Sat, 25 Jul 2015 00:47:07 GMT
---------------------------------------

- [4271eb3](../../commit/4271eb3) [fixed] add lodash as direct dependency



v0.24.1 - Fri, 24 Jul 2015 23:12:09 GMT
---------------------------------------

- [e5155c6](../../commit/e5155c6) [fixed] ensure last focused item can be focused
- [6a541ff](../../commit/6a541ff) [added] buttonComponentClass prop for Pagination
- [29fe417](../../commit/29fe417) [fixed] overlay classNames are maintained by overlayTrigget
- [d272389](../../commit/d272389) [added] Overlay and OverlayTrigger accept Transition callbacks
- [596f40c](../../commit/596f40c) [fixed] Modal uses bsClass prop to set its classes
- [86d3feb](../../commit/86d3feb) [fixed] added missed 'aria-label' prop type validation for 'ModalHeader'
- [58eaab0](../../commit/58eaab0) [changed] pass transition callbacks to Modal Transition
- [abccff9](../../commit/abccff9) [changed] expose static Modal Dialog component
- [b5c1893](../../commit/b5c1893) [changed] unfix 'babel' back.



v0.24.0 - Tue, 21 Jul 2015 22:13:05 GMT
---------------------------------------

- [924f8fb](../../commit/924f8fb) [fixed] Tooltip accepts a style prop
- [dd064ad](../../commit/dd064ad) [fixed] remove extraneous styling
- [c837d8d](../../commit/c837d8d) [fixed] Only calculate overlay position on display
- [fbf9ed6](../../commit/fbf9ed6) [changed] Add deprecation warning that factories will be removed
- [a4385d3](../../commit/a4385d3) [fixed] Portal doesn't mount extra node
- [6744b94](../../commit/6744b94) [fixed] 'modalClassName' property for 'ModalTitle'
- [3e6523a](../../commit/3e6523a) [added] ListGroup supports iterator as child
- [ec368f0](../../commit/ec368f0) [added] Fade Component, replaces FadeMixin
- [0503507](../../commit/0503507) [added] Collapse Component, replaces CollapsibleMixin
- [4fb7e0d](../../commit/4fb7e0d) [changed] Remove Overlay and Modal deprecations
- [0683df7](../../commit/0683df7) [fixed] 'stacked' progress with 'active' and 'striped' children
- [a3c5400](../../commit/a3c5400) [fixed] Add missed 'type' property React.PropTypes.<type> checking
- [a4c065e](../../commit/a4c065e) [added] links to every component / example on Components page
- [eb0c323](../../commit/eb0c323) [fixed] Position.js typo `componentDidUpate`
- [9feddf9](../../commit/9feddf9) [fixed] 'componentWillReceiveProps' method name of Position component
- [c64679f](../../commit/c64679f) [fixed] Active Next and Last button in Pagination when ellipsis=true and items=0
- [9dae734](../../commit/9dae734) [fixed] Negative page number in Pagination when ellipsis=true and items=1
- [ffbcf39](../../commit/ffbcf39) [fixed] html id and class attributes handling for Nav
- [89ea6ed](../../commit/89ea6ed) [fixed] Add missed propType validation for Button 'type' property
- [b1b6a4c](../../commit/b1b6a4c) [changed] Add two-release deprecation policy
- [e89b9bc](../../commit/e89b9bc) [removed] Don't need to disable Babel cache
- [d12d59e](../../commit/d12d59e) [changed] Enabled "loose" Babel transpilation
- [01c547f](../../commit/01c547f) [fixed] Do not use Babel cache for release build
- [b67081b](../../commit/b67081b) [fixed] rootClose behavior on replaced elements
- [fbbb344](../../commit/fbbb344) [fixed] bower template.
- [fafe46f](../../commit/fafe46f) [changed] Use named exports in index files
- [6e985b0](../../commit/6e985b0) [removed] Individual files in bower release
- [598b9d8](../../commit/598b9d8) [fixed] SafeAnchor event ordering
- [beaa1fa](../../commit/beaa1fa) [changed] `PaginationButton` to use `SafeAnchor`
- [9c09e2a](../../commit/9c09e2a) [fixed] Keyboard accessibility for anchors serving as buttons
- [ce5b436](../../commit/ce5b436) [removed] Input type=submit deprecation warning.



v0.23.7 - Wed, 01 Jul 2015 15:18:30 GMT
---------------------------------------

Expand Down
10 changes: 10 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,16 @@ Also Bootstrap mentions http://getbootstrap.com/getting-started/#examples
as examples of things you can do, but they are not part of the core library,
therefore this project is the wrong place to implement them.

## Breaking changes

Breaking changes should be accompanied with deprecations of removed
functionality. Prior to the 1.0.0 release, we aim to follow React's example of
taking two Minor releases to break old functionality. As such, changes that
intend to remove or change public APIs should be be submitted against the
`vX-rc` branch, and should be accompanied with deprecation warnings on the old
APIs. The deprecated APIs themselves should not be removed until the Minor
release after that.

## Notes for lodash functions usage in the code

You can use `lodash` but keep it to things where it actually needs it, i.e. don't use `lodash`'s `forEach` when `Array.prototype.forEach` is fine.
Expand Down
19 changes: 10 additions & 9 deletions MAINTAINING.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ publish` BY ITSELF__. The release script will do that. We want to prevent issues
like [#325](https://github.com/react-bootstrap/react-bootstrap/issues/325) and
[#218](https://github.com/react-bootstrap/react-bootstrap/issues/218) from ever
happening again. In order to run the release script you will need permission to
publish to the package to npm. Those with this permission are in the [publishers
publish the package to npm. Those with this permission are in the [publishers
team](https://github.com/orgs/react-bootstrap/teams/publishers)

*Note: The publishers team does exist. If you see 404 that means you just have no permissions to publish.*
Expand All @@ -82,7 +82,8 @@ Example usages of the release script:
$ ./tools/release patch
$ ./tools/release minor
$ ./tools/release major
$ ./tools/release minor --preid beta
$ ./tools/release minor --preid beta Use both bump and preid for first prerelease
$ ./tools/release --preid beta For follow on prereleases of the next version just use this
```

Note that the above commands will bump the [semver](http://semver.org) version
Expand All @@ -95,13 +96,13 @@ then be re-applied and released with the proper version bump.
### Release Candidates

In an effort to reduce the frequency with which we introduce breaking changes we
should do our best to first push deprecation warnings in a Minor or Patch
release. Also, Pull Requests with breaking changes should be submitted against
the `vX-rc` branch, where X is the next Major version. Which we will in turn
release as an `alpha` release of the next Major version. When we are ready to
release the next Major version bump we will merge the `vX-rc` branch into the
`master` branch and cut a `beta` release. Once bugs have been addressed with
the `beta` release then we will release the Major version bump.
should do our best to first push deprecation warnings in a Minor release. Also,
Pull Requests with breaking changes should be submitted against the `vX-rc`
branch, where X is the next Major version. Which we will in turn release as an
`alpha` release of the next Major version. When we are ready to release the next
Major version bump we will merge the `vX-rc` branch into the `master` branch and
cut a `beta` release. Once bugs have been addressed with the `beta` release
then we will release the Major version bump.

### Live releasing the documentation

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
[![devDependency Status][dev-deps-badge]][dev-deps]
[![peerDependency Status][peer-deps-badge]][peer-deps]

__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, breaking changes should result in a Minor version bump.
__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.

## Docs

Expand Down
7 changes: 6 additions & 1 deletion docs/assets/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,14 @@ body {
left: -0.8em;
opacity: 0;
}

h1:hover .anchor-icon,
h1 a:focus .anchor-icon,
h2:hover .anchor-icon,
h2 a:focus .anchor-icon,
h3:hover .anchor-icon,
h4:hover .anchor-icon {
h3 a:focus .anchor-icon,
h4:hover .anchor-icon,
h4 a:focus .anchor-icon {
opacity: 0.5;
}
8 changes: 6 additions & 2 deletions docs/build.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint no-console: 0 */

import React from 'react';
import path from 'path';
import Router from 'react-router';
Expand Down Expand Up @@ -35,9 +37,11 @@ function generateHTML(fileName, propData) {
});
}

export default function BuildDocs({ dev }) {
export default function BuildDocs({dev}) {
console.log('Building: '.cyan + 'docs'.green + (dev ? ' [DEV]'.grey : ''));

const devOption = dev ? '' : '-p';

return exec(`rimraf ${docsBuilt}`)
.then(() => fsp.mkdir(docsBuilt))
.then(metadata)
Expand All @@ -46,7 +50,7 @@ export default function BuildDocs({ dev }) {
let pagesGenerators = Root.getPages().map( page => generateHTML(page, propData));

return Promise.all(pagesGenerators.concat([
exec(`webpack --config webpack.docs.js ${dev ? '' : '-p '}--bail`),
exec(`webpack --config webpack.docs.js --bail ${devOption}`),
copy(license, docsBuilt),
copy(readmeSrc, readmeDest)
]));
Expand Down
4 changes: 3 additions & 1 deletion docs/examples/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
"TabPane",
"Tooltip",
"Well",
"Thumbnail"
"Thumbnail",
"Collapse",
"Fade"
}
}
28 changes: 28 additions & 0 deletions docs/examples/Collapse.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
class Example extends React.Component {
constructor(...args){
super(...args);

this.state = {};
}

render(){

return (
<div>
<Button onClick={ ()=> this.setState({ open: !this.state.open })}>
click
</Button>
<Collapse in={this.state.open}>
<div>
<Well>
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid.
Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.
</Well>
</div>
</Collapse>
</div>
);
}
}

React.render(<Example/>, mountNode);
37 changes: 0 additions & 37 deletions docs/examples/CollapsibleParagraph.js

This file was deleted.

2 changes: 1 addition & 1 deletion docs/examples/DropdownButtonBasic.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function renderDropdownButton (title, i) {
<DropdownButton bsStyle={title.toLowerCase()} title={title} key={i}>
<MenuItem eventKey='1'>Action</MenuItem>
<MenuItem eventKey='2'>Another action</MenuItem>
<MenuItem eventKey='3' active={true}>Active Item</MenuItem>
<MenuItem eventKey='3' active>Active Item</MenuItem>
<MenuItem divider />
<MenuItem eventKey='4'>Separated link</MenuItem>
</DropdownButton>
Expand Down
29 changes: 29 additions & 0 deletions docs/examples/Fade.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

class Example extends React.Component {

constructor(...args){
super(...args);
this.state = {};
}

render(){

return (
<div>
<Button onClick={()=> this.setState({ open: !this.state.open })}>
click
</Button>
<Fade in={this.state.open}>
<div>
<Well>
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid.
Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.
</Well>
</div>
</Fade>
</div>
);
}
}

React.render(<Example/>, mountNode);
File renamed without changes.
Loading

0 comments on commit b8448f5

Please sign in to comment.