Skip to content

Commit

Permalink
Merge tag 'v0.23.2' into v0.24-rc
Browse files Browse the repository at this point in the history
v0.23.2

Conflicts:
	package.json
  • Loading branch information
mtscout6 committed Jun 9, 2015
2 parents 3146dee + f2da250 commit d3c2eca
Show file tree
Hide file tree
Showing 68 changed files with 904 additions and 655 deletions.
28 changes: 14 additions & 14 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@
"react"
],
"rules": {
"comma-spacing": 1,
"comma-spacing": 2,
"key-spacing": 0,
"no-underscore-dangle": 0,
"no-unused-vars": [1, { "vars": "all", "args": "none" }],
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
"no-var": 2,
"object-shorthand": 1,
"quotes": [1, "single", "avoid-escape"],
"object-shorthand": 2,
"quotes": [2, "single", "avoid-escape"],
"react/display-name": 0,
"react/jsx-no-undef": 1,
"react/jsx-uses-react": 1,
"react/no-did-mount-set-state": 1,
"react/no-did-update-set-state": 1,
"react/no-multi-comp": 1,
"react/prop-types": [1, { ignore: [children, className] }],
"react/react-in-jsx-scope": 1,
"react/self-closing-comp": 1,
"react/wrap-multilines": 1,
"react/jsx-uses-vars": 1,
"react/jsx-no-undef": 2,
"react/jsx-uses-react": 2,
"react/no-did-mount-set-state": 2,
"react/no-did-update-set-state": 2,
"react/no-multi-comp": 2,
"react/prop-types": [2, { ignore: [children, className] }],
"react/react-in-jsx-scope": 2,
"react/self-closing-comp": 2,
"react/wrap-multilines": 2,
"react/jsx-uses-vars": 2,
"strict": 0
}
}
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ lib/
dist/
!tools/dist/
docs-built/
ie8/bundle.js
tmp-bower-repo/
tmp-docs-repo/
.babel-cache/
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
v0.23.2 - Mon, 08 Jun 2015 18:56:48 GMT
---------------------------------------

- [7211dcb](../../commit/7211dcb) [added] Add prevIcon and nextIcon props as node proptypes to Carousel
- [5734ec3](../../commit/5734ec3) [added] Pagination component
- [2f8c454](../../commit/2f8c454) [changed] Assert ProgressBar children can be ProgressBar only.
- [2c46820](../../commit/2c46820) [added] `createSelectedEvent` for consistent onSelect handling
- [c2ff9ad](../../commit/c2ff9ad) [added] property disabled on MenuItem



v0.23.1 - Tue, 02 Jun 2015 16:57:57 GMT
---------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions MAINTAINING.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ helping out.

GitHub by default does not publicly state that you are a member of the
organization. Please feel free to change that setting for yourself so others
will know who's helping out. That can be configured on [organization
will know who's helping out. That can be configured on the [organization
list](https://github.com/orgs/react-bootstrap/people) page.

Being a maintainer is not an obligation. You can help when you have time and be
Expand All @@ -77,7 +77,7 @@ Example usages of the release script:
$ ./tools/release patch
$ ./tools/release minor
$ ./tools/release major
$ ./tools/release minor --pre beta
$ ./tools/release minor --preid beta
```

Note that the above commands will bump the [semver](http://semver.org) version
Expand Down
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
[Bootstrap 3][bootstrap] components built with [React][react]

[![Travis Build Status][build-badge]][build]
[![NPM version][npm-badge]][npm]
[![Bower version][bower-badge]][bower]
[![Build status][appveyor-badge]][appveyor]

[![HuBoard][huboard-badge]][huboard]
[![Gitter][gitter-badge]][gitter]

[![NPM version][npm-badge]][npm]
[![Bower version][bower-badge]][bower]

[![Dependency Status][deps-badge]][deps]
[![devDependency Status][dev-deps-badge]][dev-deps]
[![peerDependency Status][peer-deps-badge]][peer-deps]
Expand Down Expand Up @@ -73,4 +76,4 @@ Yes please! See the [contributing guidelines][contributing] for details.
[huboard]: https://huboard.com/react-bootstrap/react-bootstrap

[appveyor-badge]: https://ci.appveyor.com/api/projects/status/ylitpyo6n5yq1s6i/branch/master?svg=true
[appveyor]: https://ci.appveyor.com/project/mtscout6/react-bootstrap/branch/master
[appveyor]: https://ci.appveyor.com/project/react-bootstrap/react-bootstrap/branch/master
17 changes: 17 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: '{build}'

# Install scripts. (runs after repo cloning)
install:
# Get the latest stable version of io.js
- ps: Install-Product node ''
- npm -g install npm@latest
- set PATH=%APPDATA%\npm;%PATH%
- node --version
- npm --version
- npm install

# No need for MSBuild on this project
build: off

test_script:
- npm test
28 changes: 0 additions & 28 deletions appveyor.yml.tmp

This file was deleted.

9 changes: 9 additions & 0 deletions docs/assets/docs.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
* Responsive tests
* Glyphicons
* Customizer
* MenuItem
* Miscellaneous
*/

Expand Down Expand Up @@ -1127,6 +1128,14 @@ h1[id] {
overflow: auto;
}

/* MenuItem */
.bs-example .dropdown-menu.open {
position: static;
display: block;
margin-bottom: 5px;
clear: left;
}


/*
* Code snippets
Expand Down
1 change: 1 addition & 0 deletions docs/examples/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"PageHeader",
"PageItem",
"Pager",
"Pagination",
"Panel",
"PanelGroup",
"Popover",
Expand Down
26 changes: 26 additions & 0 deletions docs/examples/MenuItem.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
function onSelectAlert(eventKey, href, target) {
alert('Alert from menu item.\neventKey: "' + eventKey + '"\nhref: "' + href + '"');
}

function preventDefault() {}

const MenuItems = (
<div className="clearfix">
<ul className="dropdown-menu open">
<MenuItem header>Header</MenuItem>
<MenuItem onSelect={preventDefault}>link</MenuItem>
<MenuItem divider/>
<MenuItem header>Header</MenuItem>
<MenuItem onSelect={preventDefault}>link</MenuItem>
<MenuItem disabled>disabled</MenuItem>
<MenuItem title="See? I have a title." onSelect={preventDefault}>
link with title
</MenuItem>
<MenuItem eventKey={1} href="#someHref" onSelect={onSelectAlert}>
link that alerts
</MenuItem>
</ul>
</div>
);

React.render(MenuItems, mountNode);
30 changes: 30 additions & 0 deletions docs/examples/PaginationAdvanced.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
const PaginationAdvanced = React.createClass({
getInitialState() {
return {
activePage: 1
};
},

handleSelect(event, selectedEvent) {
this.setState({
activePage: selectedEvent.eventKey
});
},

render() {
return (
<Pagination
prev={true}
next={true}
first={true}
last={true}
ellipsis={true}
items={20}
maxButtons={5}
activePage={this.state.activePage}
onSelect={this.handleSelect} />
);
}
});

React.render(<PaginationAdvanced />, mountNode);
41 changes: 41 additions & 0 deletions docs/examples/PaginationBasic.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
const PaginationBasic = React.createClass({
getInitialState() {
return {
activePage: 1
};
},

handleSelect(event, selectedEvent){
this.setState({
activePage: selectedEvent.eventKey
});
},

render() {
return (
<div>
<Pagination
bsSize='large'
items={10}
activePage={this.state.activePage}
onSelect={this.handleSelect} />
<br />

<Pagination
bsSize='medium'
items={10}
activePage={this.state.activePage}
onSelect={this.handleSelect} />
<br />

<Pagination
bsSize='small'
items={10}
activePage={this.state.activePage}
onSelect={this.handleSelect} />
</div>
);
}
});

React.render(<PaginationBasic />, mountNode);
61 changes: 48 additions & 13 deletions docs/src/ComponentsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,25 @@ const ComponentsPage = React.createClass({
<ReactPlayground codeText={Samples.SplitButtonRight} />
</div>

{/* Menu Item */}
<div className='bs-docs-section'>
<h1 id='menu-item' className='page-header'>Menu Item <small> MenudItem</small></h1>
<p>This is a component used in other components (see <a href="buttons">Buttons</a>, <a href="#navbars">Navbars</a>).</p>
<p>It supports the basic anchor properties <code>href</code>, <code>target</code>, <code>title</code>.</p>
<p>It also supports different properties of the normal Bootstrap MenuItem.
<ul>
<li><code>header</code>: To add a header label to sections</li>
<li><code>divider</code>: Adds an horizontal divider between sections</li>
<li><code>disabled</code>: shows the item as disabled, and prevents the onclick</li>
<li><code>eventKey</code>: passed to the callback</li>
<li><code>onSelect</code>: a callback that is called when the user clicks the item.</li>
</ul>
<p>The callback is called with the following arguments: <code>eventKey</code>, <code>href</code> and <code>target</code></p>
</p>
<ReactPlayground codeText={Samples.MenuItem} />
</div>

{/* Panels */}
<div className='bs-docs-section'>
<h1 id='panels' className='page-header'>Panels <small>Panel, PanelGroup, Accordion</small></h1>

Expand Down Expand Up @@ -426,6 +445,19 @@ const ComponentsPage = React.createClass({
<ReactPlayground codeText={Samples.PagerDisabled} />
</div>

{/* Pagination */}
<div className='bs-docs-section'>
<h1 id='pagination' className='page-header'>Pagination <small>Pagination</small></h1>
<h2 id='pagination-examples'>Example pagination</h2>

<p>Provide pagination links for your site or app with the multi-page pagination component. Set <code>items</code> to the number of pages. <code>activePage</code> prop dictates which page is active</p>
<ReactPlayground codeText={Samples.PaginationBasic} />

<p>More options such as <code>first</code>, <code>last</code>, <code>previous</code>, <code>next</code> and <code>ellipsis</code>.</p>
<ReactPlayground codeText={Samples.PaginationAdvanced} />

</div>

{/* Alerts */}
<div className='bs-docs-section'>
<h1 id='alerts' className='page-header'>Alert messages <small>Alert</small></h1>
Expand Down Expand Up @@ -607,6 +639,7 @@ const ComponentsPage = React.createClass({
<code>getValue()</code> will not work when used this way.</p>
<ReactPlayground codeText={Samples.InputWrapper} />
</div>

</div>

<div className='col-md-3'>
Expand All @@ -623,6 +656,7 @@ const ComponentsPage = React.createClass({
<SubNav href='#buttons' key={1} text='Buttons'>
<NavItem href='#btn-groups' key={2}>Button groups</NavItem>
<NavItem href='#btn-dropdowns' key={3}>Button dropdowns</NavItem>
<NavItem href='#menu-item' key={25}>Menu Item</NavItem>
</SubNav>
<NavItem href='#panels' key={4}>Panels</NavItem>
<NavItem href='#modals' key={5}>Modals</NavItem>
Expand All @@ -633,19 +667,20 @@ const ComponentsPage = React.createClass({
<NavItem href='#navbars' key={10}>Navbars</NavItem>
<NavItem href='#tabs' key={11}>Togglable tabs</NavItem>
<NavItem href='#pager' key={12}>Pager</NavItem>
<NavItem href='#alerts' key={13}>Alerts</NavItem>
<NavItem href='#carousels' key={14}>Carousels</NavItem>
<NavItem href='#grids' key={15}>Grids</NavItem>
<NavItem href='#thumbnail' key={16}>Thumbnail</NavItem>
<NavItem href='#listgroup' key={17}>List group</NavItem>
<NavItem href='#labels' key={18}>Labels</NavItem>
<NavItem href='#badges' key={19}>Badges</NavItem>
<NavItem href='#jumbotron' key={20}>Jumbotron</NavItem>
<NavItem href='#page-header' key={21}>Page Header</NavItem>
<NavItem href='#wells' key={22}>Wells</NavItem>
<NavItem href='#glyphicons' key={23}>Glyphicons</NavItem>
<NavItem href='#tables' key={24}>Tables</NavItem>
<NavItem href='#input' key={25}>Input</NavItem>
<NavItem href='#pagination' key={13}>Pagination</NavItem>
<NavItem href='#alerts' key={14}>Alerts</NavItem>
<NavItem href='#carousels' key={15}>Carousels</NavItem>
<NavItem href='#grids' key={16}>Grids</NavItem>
<NavItem href='#thumbnail' key={17}>Thumbnail</NavItem>
<NavItem href='#listgroup' key={18}>List group</NavItem>
<NavItem href='#labels' key={19}>Labels</NavItem>
<NavItem href='#badges' key={20}>Badges</NavItem>
<NavItem href='#jumbotron' key={21}>Jumbotron</NavItem>
<NavItem href='#page-header' key={22}>Page Header</NavItem>
<NavItem href='#wells' key={23}>Wells</NavItem>
<NavItem href='#glyphicons' key={24}>Glyphicons</NavItem>
<NavItem href='#tables' key={25}>Tables</NavItem>
<NavItem href='#input' key={26}>Input</NavItem>
</Nav>
<a className='back-to-top' href='#top'>
Back to top
Expand Down
8 changes: 7 additions & 1 deletion docs/src/PageFooter.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import React from 'react';
import packageJSON from '../../package.json';

let version = packageJSON.version;

if (/docs/.test(version)) {
version = version.split('-')[0];
}

const PageHeader = React.createClass({
render() {
return (
Expand Down Expand Up @@ -36,7 +42,7 @@ const PageHeader = React.createClass({
</div>
<p>Code licensed under <a href='https://github.com/react-bootstrap/react-bootstrap/blob/master/LICENSE' target='_blank'>MIT</a>.</p>
<ul className='bs-docs-footer-links muted'>
<li>Currently v{packageJSON.version}</li>
<li>Currently v{version}</li>
<li>·</li>
<li><a href='https://github.com/react-bootstrap/react-bootstrap/'>GitHub</a></li>
<li>·</li>
Expand Down
Loading

0 comments on commit d3c2eca

Please sign in to comment.