Skip to content

Commit e5ab34d

Browse files
committed
Merge branch 'master' into v0.25-rc
2 parents 6c8b8e0 + 2db54cd commit e5ab34d

47 files changed

Lines changed: 1877 additions & 1204 deletions

Some content is hidden

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

.eslintrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"quotes": [2, "single", "avoid-escape"],
2626
"react/display-name": 0,
2727
"react/jsx-boolean-value": [2, "never"],
28+
"react/jsx-no-duplicate-props": 2,
2829
"react/jsx-no-undef": 2,
2930
"react/jsx-uses-react": 2,
3031
"react/no-did-mount-set-state": 2,
@@ -35,8 +36,7 @@
3536
"react/self-closing-comp": 2,
3637
"react/wrap-multilines": 2,
3738
"react/jsx-uses-vars": 2,
38-
/* disable till https://github.com/eslint/eslint/issues/3016 is resolved */
39-
"space-infix-ops": 0,
39+
"space-infix-ops": 2,
4040
"strict": [2, "never"]
4141
}
4242
}

CHANGELOG.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,79 @@
1+
v0.24.3 - Fri, 31 Jul 2015 18:09:54 GMT
2+
---------------------------------------
3+
4+
- [02f8966](../../commit/02f8966) [changed] Update dependencies
5+
- [bae8ba9](../../commit/bae8ba9) [fixed] Carousel checks if it is mounted before setting state
6+
- [fd8d4d2](../../commit/fd8d4d2) [fixed] regression when clicking "static" modal backdrops
7+
- [0f46a97](../../commit/0f46a97) [added] Allow custom Modal dialog components
8+
- [a4ce7e1](../../commit/a4ce7e1) [fixed] added finalisation for the Modal when it was unbound from the tree
9+
- [d89d5f3](../../commit/d89d5f3) [fixed] Modal error when backdrop is `false`
10+
- [f410904](../../commit/f410904) [added] 'xs, sm, md, lg' values for 'bsSize'
11+
- [2558f32](../../commit/2558f32) [fixed] TabbedArea panes rendering with animation
12+
- [90aece6](../../commit/90aece6) [changed] Simplify 'styleMaps.STYLES' to be of Array type
13+
- [860d168](../../commit/860d168) [fixed] allow totally custom styles via 'bsStyle'
14+
- [74da76a](../../commit/74da76a) [fixed] Prevent click on PageItem if disabled
15+
16+
17+
18+
v0.24.2 - Sat, 25 Jul 2015 00:47:07 GMT
19+
---------------------------------------
20+
21+
- [4271eb3](../../commit/4271eb3) [fixed] add lodash as direct dependency
22+
23+
24+
25+
v0.24.1 - Fri, 24 Jul 2015 23:12:09 GMT
26+
---------------------------------------
27+
28+
- [e5155c6](../../commit/e5155c6) [fixed] ensure last focused item can be focused
29+
- [6a541ff](../../commit/6a541ff) [added] buttonComponentClass prop for Pagination
30+
- [29fe417](../../commit/29fe417) [fixed] overlay classNames are maintained by overlayTrigget
31+
- [d272389](../../commit/d272389) [added] Overlay and OverlayTrigger accept Transition callbacks
32+
- [596f40c](../../commit/596f40c) [fixed] Modal uses bsClass prop to set its classes
33+
- [86d3feb](../../commit/86d3feb) [fixed] added missed 'aria-label' prop type validation for 'ModalHeader'
34+
- [58eaab0](../../commit/58eaab0) [changed] pass transition callbacks to Modal Transition
35+
- [abccff9](../../commit/abccff9) [changed] expose static Modal Dialog component
36+
- [b5c1893](../../commit/b5c1893) [changed] unfix 'babel' back.
37+
38+
39+
40+
v0.24.0 - Tue, 21 Jul 2015 22:13:05 GMT
41+
---------------------------------------
42+
43+
- [924f8fb](../../commit/924f8fb) [fixed] Tooltip accepts a style prop
44+
- [dd064ad](../../commit/dd064ad) [fixed] remove extraneous styling
45+
- [c837d8d](../../commit/c837d8d) [fixed] Only calculate overlay position on display
46+
- [fbf9ed6](../../commit/fbf9ed6) [changed] Add deprecation warning that factories will be removed
47+
- [a4385d3](../../commit/a4385d3) [fixed] Portal doesn't mount extra node
48+
- [6744b94](../../commit/6744b94) [fixed] 'modalClassName' property for 'ModalTitle'
49+
- [3e6523a](../../commit/3e6523a) [added] ListGroup supports iterator as child
50+
- [ec368f0](../../commit/ec368f0) [added] Fade Component, replaces FadeMixin
51+
- [0503507](../../commit/0503507) [added] Collapse Component, replaces CollapsibleMixin
52+
- [4fb7e0d](../../commit/4fb7e0d) [changed] Remove Overlay and Modal deprecations
53+
- [0683df7](../../commit/0683df7) [fixed] 'stacked' progress with 'active' and 'striped' children
54+
- [a3c5400](../../commit/a3c5400) [fixed] Add missed 'type' property React.PropTypes.<type> checking
55+
- [a4c065e](../../commit/a4c065e) [added] links to every component / example on Components page
56+
- [eb0c323](../../commit/eb0c323) [fixed] Position.js typo `componentDidUpate`
57+
- [9feddf9](../../commit/9feddf9) [fixed] 'componentWillReceiveProps' method name of Position component
58+
- [c64679f](../../commit/c64679f) [fixed] Active Next and Last button in Pagination when ellipsis=true and items=0
59+
- [9dae734](../../commit/9dae734) [fixed] Negative page number in Pagination when ellipsis=true and items=1
60+
- [ffbcf39](../../commit/ffbcf39) [fixed] html id and class attributes handling for Nav
61+
- [89ea6ed](../../commit/89ea6ed) [fixed] Add missed propType validation for Button 'type' property
62+
- [b1b6a4c](../../commit/b1b6a4c) [changed] Add two-release deprecation policy
63+
- [e89b9bc](../../commit/e89b9bc) [removed] Don't need to disable Babel cache
64+
- [d12d59e](../../commit/d12d59e) [changed] Enabled "loose" Babel transpilation
65+
- [01c547f](../../commit/01c547f) [fixed] Do not use Babel cache for release build
66+
- [b67081b](../../commit/b67081b) [fixed] rootClose behavior on replaced elements
67+
- [fbbb344](../../commit/fbbb344) [fixed] bower template.
68+
- [fafe46f](../../commit/fafe46f) [changed] Use named exports in index files
69+
- [6e985b0](../../commit/6e985b0) [removed] Individual files in bower release
70+
- [598b9d8](../../commit/598b9d8) [fixed] SafeAnchor event ordering
71+
- [beaa1fa](../../commit/beaa1fa) [changed] `PaginationButton` to use `SafeAnchor`
72+
- [9c09e2a](../../commit/9c09e2a) [fixed] Keyboard accessibility for anchors serving as buttons
73+
- [ce5b436](../../commit/ce5b436) [removed] Input type=submit deprecation warning.
74+
75+
76+
177
v0.23.7 - Wed, 01 Jul 2015 15:18:30 GMT
278
---------------------------------------
379

docs/assets/style.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,14 @@ body {
188188
left: -0.8em;
189189
opacity: 0;
190190
}
191+
191192
h1:hover .anchor-icon,
193+
h1 a:focus .anchor-icon,
192194
h2:hover .anchor-icon,
195+
h2 a:focus .anchor-icon,
193196
h3:hover .anchor-icon,
194-
h4:hover .anchor-icon {
197+
h3 a:focus .anchor-icon,
198+
h4:hover .anchor-icon,
199+
h4 a:focus .anchor-icon {
195200
opacity: 0.5;
196201
}

docs/examples/CollapsibleParagraph.js

Lines changed: 0 additions & 37 deletions
This file was deleted.

docs/examples/ModalStatic.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
const modalInstance = (
3+
<div className='static-modal'>
4+
<Modal.Dialog>
5+
<Modal.Header>
6+
<Modal.Title>Modal title</Modal.Title>
7+
</Modal.Header>
8+
9+
<Modal.Body>
10+
One fine body...
11+
</Modal.Body>
12+
13+
<Modal.Footer>
14+
<Button>Close</Button>
15+
<Button bsStyle='primary'>Save changes</Button>
16+
</Modal.Footer>
17+
18+
</Modal.Dialog>
19+
</div>
20+
);
21+
22+
React.render(modalInstance, mountNode);

docs/examples/PanelCollapsible.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
class Example extends React.Component {
2+
constructor(...args){
3+
super(...args);
4+
this.state = {
5+
open: true
6+
};
7+
}
8+
9+
render(){
10+
return (
11+
<div>
12+
<Button onClick={ ()=> this.setState({ open: !this.state.open })}>
13+
click
14+
</Button>
15+
<Panel collapsible expanded={this.state.open}>
16+
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid.
17+
Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident.
18+
</Panel>
19+
</div>
20+
);
21+
}
22+
}
23+
24+
React.render(<Example/>, mountNode);

docs/examples/PopoverContained.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class Example extends React.Component {
2-
constructor(props, context){
3-
super(props, context);
2+
constructor(...args){
3+
super(...args);
44
this.state = { show: false };
55
}
66
render(){

docs/src/ComponentsPage.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,9 @@ const ComponentsPage = React.createClass({
219219
<p>You can pass on any additional properties you need, e.g. a custom <code>onClick</code> handler, as it is shown in the example code. They all will apply to the wrapper <code>div</code> element.</p>
220220
<ReactPlayground codeText={Samples.PanelBasic} />
221221

222+
<h3><Anchor id='panels-collapsible'>Collapsible Panel</Anchor></h3>
223+
<ReactPlayground codeText={Samples.PanelCollapsible} />
224+
222225
<h3><Anchor id='panels-heading'>Panel with heading</Anchor></h3>
223226
<p>Easily add a heading container to your panel with the <code>header</code> prop.</p>
224227
<ReactPlayground codeText={Samples.PanelWithHeading} />
@@ -260,6 +263,10 @@ const ComponentsPage = React.createClass({
260263
<div className='bs-docs-section'>
261264
<h1 className='page-header'><Anchor id='modals'>Modals</Anchor> <small>Modal</small></h1>
262265

266+
<h3><Anchor id='modals-static'>Static Markup</Anchor></h3>
267+
<p>A modal dialog component</p>
268+
<ReactPlayground codeText={Samples.ModalStatic} />
269+
263270
<h3><Anchor id='modals-live'>Basic example</Anchor></h3>
264271
<p></p>
265272
<p>

0 commit comments

Comments
 (0)