Skip to content

Commit

Permalink
Merge pull request react-bootstrap#1252 from AlexKVal/airbnb
Browse files Browse the repository at this point in the history
Next portion of 'Airbnb'
  • Loading branch information
AlexKVal committed Aug 30, 2015
2 parents bb0f1c6 + 3713022 commit 09fe7a5
Show file tree
Hide file tree
Showing 129 changed files with 954 additions and 985 deletions.
6 changes: 0 additions & 6 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,20 @@
"func-names": 0,
"guard-for-in": 0,
"one-var": [2, { "initialized": "never" }],
"padded-blocks": 0,
"prefer-const": 0,
"key-spacing": 0,
"no-eq-null": 0,
"no-else-return": 0,
"no-multiple-empty-lines": 0,
"no-nested-ternary": 0,
"no-param-reassign": 0,
"no-this-before-super": 2,
"no-throw-literal": 0,
"no-underscore-dangle": 0,
"no-undef": 2,
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
"no-use-before-define": 0,
"no-var": 2,
"babel/object-shorthand": 2,
"quotes": [2, "single", "avoid-escape"],
"react/display-name": 0,
"react/jsx-boolean-value": [2, "never"],
"react/jsx-quotes": 0,
"react/jsx-no-duplicate-props": 2,
"react/jsx-no-undef": 2,
"react/jsx-uses-react": 2,
Expand Down
1 change: 0 additions & 1 deletion docs/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ export default function BuildDocs({dev}) {
.then(() => fsp.mkdir(docsBuilt))
.then(metadata)
.then(propData => {

let pagesGenerators = Root.getPages().map( page => generateHTML(page, propData));

return Promise.all(pagesGenerators.concat([
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/AlertAutoDismissable.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const AlertAutoDismissable = React.createClass({
render() {
if (this.state.alertVisible) {
return (
<Alert bsStyle='danger' onDismiss={this.handleAlertDismiss} dismissAfter={2000}>
<Alert bsStyle="danger" onDismiss={this.handleAlertDismiss} dismissAfter={2000}>
<h4>Oh snap! You got an error!</h4>
<p>But this will hide after 2 seconds.</p>
</Alert>
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/AlertBasic.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const alertInstance = (
<Alert bsStyle='warning'>
<Alert bsStyle="warning">
<strong>Holy guacamole!</strong> Best check yo self, you're not looking too good.
</Alert>
);
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/AlertDismissable.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ const AlertDismissable = React.createClass({
render() {
if (this.state.alertVisible) {
return (
<Alert bsStyle='danger' onDismiss={this.handleAlertDismiss}>
<Alert bsStyle="danger" onDismiss={this.handleAlertDismiss}>
<h4>Oh snap! You got an error!</h4>
<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>
<p>
<Button bsStyle='danger'>Take this action</Button>
<Button bsStyle="danger">Take this action</Button>
<span> or </span>
<Button onClick={this.handleAlertDismiss}>Hide Alert</Button>
</p>
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/ButtonActive.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const buttonsInstance = (
<ButtonToolbar>
<Button bsStyle='primary' bsSize='large' active>Primary button</Button>
<Button bsSize='large' active>Button</Button>
<Button bsStyle="primary" bsSize="large" active>Primary button</Button>
<Button bsSize="large" active>Button</Button>
</ButtonToolbar>
);

Expand Down
6 changes: 3 additions & 3 deletions docs/examples/ButtonBlock.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const wellStyles = {maxWidth: 400, margin: '0 auto 10px'};

const buttonsInstance = (
<div className='well' style={wellStyles}>
<Button bsStyle='primary' bsSize='large' block>Block level button</Button>
<Button bsSize='large' block>Block level button</Button>
<div className="well" style={wellStyles}>
<Button bsStyle="primary" bsSize="large" block>Block level button</Button>
<Button bsSize="large" block>Block level button</Button>
</div>
);

Expand Down
4 changes: 2 additions & 2 deletions docs/examples/ButtonDisabled.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const buttonsInstance = (
<ButtonToolbar>
<Button bsStyle='primary' bsSize='large' disabled>Primary button</Button>
<Button bsSize='large' disabled>Button</Button>
<Button bsStyle="primary" bsSize="large" disabled>Primary button</Button>
<Button bsSize="large" disabled>Button</Button>
</ButtonToolbar>
);

Expand Down
10 changes: 5 additions & 5 deletions docs/examples/ButtonGroupJustified.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
const buttonGroupInstance = (
<ButtonGroup justified>
<Button href='#'>Left</Button>
<Button href='#'>Middle</Button>
<DropdownButton title='Dropdown' id='bg-justified-dropdown'>
<MenuItem eventKey='1'>Dropdown link</MenuItem>
<MenuItem eventKey='2'>Dropdown link</MenuItem>
<Button href="#">Left</Button>
<Button href="#">Middle</Button>
<DropdownButton title="Dropdown" id="bg-justified-dropdown">
<MenuItem eventKey="1">Dropdown link</MenuItem>
<MenuItem eventKey="2">Dropdown link</MenuItem>
</DropdownButton>
</ButtonGroup>
);
Expand Down
6 changes: 3 additions & 3 deletions docs/examples/ButtonGroupNested.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ const buttonGroupInstance = (
<ButtonGroup>
<Button>1</Button>
<Button>2</Button>
<DropdownButton title='Dropdown' id='bg-nested-dropdown'>
<MenuItem eventKey='1'>Dropdown link</MenuItem>
<MenuItem eventKey='2'>Dropdown link</MenuItem>
<DropdownButton title="Dropdown" id="bg-nested-dropdown">
<MenuItem eventKey="1">Dropdown link</MenuItem>
<MenuItem eventKey="2">Dropdown link</MenuItem>
</DropdownButton>
</ButtonGroup>
);
Expand Down
6 changes: 3 additions & 3 deletions docs/examples/ButtonGroupSizes.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const buttonGroupInstance = (
<div>
<ButtonToolbar>
<ButtonGroup bsSize='large'>
<ButtonGroup bsSize="large">
<Button>Left</Button>
<Button>Middle</Button>
<Button>Right</Button>
Expand All @@ -17,15 +17,15 @@ const buttonGroupInstance = (
</ButtonToolbar>

<ButtonToolbar>
<ButtonGroup bsSize='small'>
<ButtonGroup bsSize="small">
<Button>Left</Button>
<Button>Middle</Button>
<Button>Right</Button>
</ButtonGroup>
</ButtonToolbar>

<ButtonToolbar>
<ButtonGroup bsSize='xsmall'>
<ButtonGroup bsSize="xsmall">
<Button>Left</Button>
<Button>Middle</Button>
<Button>Right</Button>
Expand Down
18 changes: 9 additions & 9 deletions docs/examples/ButtonGroupVertical.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ const buttonGroupInstance = (
<ButtonGroup vertical>
<Button>Button</Button>
<Button>Button</Button>
<DropdownButton title='Dropdown' id='bg-vertical-dropdown-1'>
<MenuItem eventKey='1'>Dropdown link</MenuItem>
<MenuItem eventKey='2'>Dropdown link</MenuItem>
<DropdownButton title="Dropdown" id="bg-vertical-dropdown-1">
<MenuItem eventKey="1">Dropdown link</MenuItem>
<MenuItem eventKey="2">Dropdown link</MenuItem>
</DropdownButton>
<Button>Button</Button>
<Button>Button</Button>
<DropdownButton title='Dropdown' id='bg-vertical-dropdown-2'>
<MenuItem eventKey='1'>Dropdown link</MenuItem>
<MenuItem eventKey='2'>Dropdown link</MenuItem>
<DropdownButton title="Dropdown" id="bg-vertical-dropdown-2">
<MenuItem eventKey="1">Dropdown link</MenuItem>
<MenuItem eventKey="2">Dropdown link</MenuItem>
</DropdownButton>
<DropdownButton title='Dropdown' id='bg-vertical-dropdown-3'>
<MenuItem eventKey='1'>Dropdown link</MenuItem>
<MenuItem eventKey='2'>Dropdown link</MenuItem>
<DropdownButton title="Dropdown" id="bg-vertical-dropdown-3">
<MenuItem eventKey="1">Dropdown link</MenuItem>
<MenuItem eventKey="2">Dropdown link</MenuItem>
</DropdownButton>
</ButtonGroup>
);
Expand Down
3 changes: 1 addition & 2 deletions docs/examples/ButtonLoading.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const LoadingButton = React.createClass({
let isLoading = this.state.isLoading;
return (
<Button
bsStyle='primary'
bsStyle="primary"
disabled={isLoading}
onClick={!isLoading ? this.handleClick : null}>
{isLoading ? 'Loading...' : 'Loading state'}
Expand All @@ -22,7 +22,6 @@ const LoadingButton = React.createClass({

// This probably where you would have an `ajax` call
setTimeout(() => {

// Completed of async action, set loading state back
this.setState({isLoading: false});
}, 2000);
Expand Down
14 changes: 7 additions & 7 deletions docs/examples/ButtonSizes.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
const buttonsInstance = (
<div>
<ButtonToolbar>
<Button bsStyle='primary' bsSize='large'>Large button</Button>
<Button bsSize='large'>Large button</Button>
<Button bsStyle="primary" bsSize="large">Large button</Button>
<Button bsSize="large">Large button</Button>
</ButtonToolbar>
<ButtonToolbar>
<Button bsStyle='primary'>Default button</Button>
<Button bsStyle="primary">Default button</Button>
<Button>Default button</Button>
</ButtonToolbar>
<ButtonToolbar>
<Button bsStyle='primary' bsSize='small'>Small button</Button>
<Button bsSize='small'>Small button</Button>
<Button bsStyle="primary" bsSize="small">Small button</Button>
<Button bsSize="small">Small button</Button>
</ButtonToolbar>
<ButtonToolbar>
<Button bsStyle='primary' bsSize='xsmall'>Extra small button</Button>
<Button bsSize='xsmall'>Extra small button</Button>
<Button bsStyle="primary" bsSize="xsmall">Extra small button</Button>
<Button bsSize="xsmall">Extra small button</Button>
</ButtonToolbar>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/ButtonTagTypes.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const buttonsInstance = (
<ButtonToolbar>
<Button href='#'>Link</Button>
<Button href="#">Link</Button>
<Button>Button</Button>
</ButtonToolbar>
);
Expand Down
12 changes: 6 additions & 6 deletions docs/examples/ButtonTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ const buttonsInstance = (
<Button>Default</Button>

{/* Provides extra visual weight and identifies the primary action in a set of buttons */}
<Button bsStyle='primary'>Primary</Button>
<Button bsStyle="primary">Primary</Button>

{/* Indicates a successful or positive action */}
<Button bsStyle='success'>Success</Button>
<Button bsStyle="success">Success</Button>

{/* Contextual button for informational alert messages */}
<Button bsStyle='info'>Info</Button>
<Button bsStyle="info">Info</Button>

{/* Indicates caution should be taken with this action */}
<Button bsStyle='warning'>Warning</Button>
<Button bsStyle="warning">Warning</Button>

{/* Indicates a dangerous or potentially negative action */}
<Button bsStyle='danger'>Danger</Button>
<Button bsStyle="danger">Danger</Button>

{/* Deemphasize a button by making it look like a link while maintaining button behavior */}
<Button bsStyle='link'>Link</Button>
<Button bsStyle="link">Link</Button>
</ButtonToolbar>
);

Expand Down
12 changes: 6 additions & 6 deletions docs/examples/CarouselControlled.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ const ControlledCarousel = React.createClass({
return (
<Carousel activeIndex={this.state.index} direction={this.state.direction} onSelect={this.handleSelect}>
<CarouselItem>
<img width={900} height={500} alt='900x500' src='/assets/carousel.png'/>
<div className='carousel-caption'>
<img width={900} height={500} alt="900x500" src="/assets/carousel.png"/>
<div className="carousel-caption">
<h3>First slide label</h3>
<p>Nulla vitae elit libero, a pharetra augue mollis interdum.</p>
</div>
</CarouselItem>
<CarouselItem>
<img width={900} height={500} alt='900x500' src='/assets/carousel.png'/>
<div className='carousel-caption'>
<img width={900} height={500} alt="900x500" src="/assets/carousel.png"/>
<div className="carousel-caption">
<h3>Second slide label</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
</div>
</CarouselItem>
<CarouselItem>
<img width={900} height={500} alt='900x500' src='/assets/carousel.png'/>
<div className='carousel-caption'>
<img width={900} height={500} alt="900x500" src="/assets/carousel.png"/>
<div className="carousel-caption">
<h3>Third slide label</h3>
<p>Praesent commodo cursus magna, vel scelerisque nisl consectetur.</p>
</div>
Expand Down
12 changes: 6 additions & 6 deletions docs/examples/CarouselUncontrolled.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
const carouselInstance = (
<Carousel>
<CarouselItem>
<img width={900} height={500} alt='900x500' src='/assets/carousel.png'/>
<div className='carousel-caption'>
<img width={900} height={500} alt="900x500" src="/assets/carousel.png"/>
<div className="carousel-caption">
<h3>First slide label</h3>
<p>Nulla vitae elit libero, a pharetra augue mollis interdum.</p>
</div>
</CarouselItem>
<CarouselItem>
<img width={900} height={500} alt='900x500' src='/assets/carousel.png'/>
<div className='carousel-caption'>
<img width={900} height={500} alt="900x500" src="/assets/carousel.png"/>
<div className="carousel-caption">
<h3>Second slide label</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
</div>
</CarouselItem>
<CarouselItem>
<img width={900} height={500} alt='900x500' src='/assets/carousel.png'/>
<div className='carousel-caption'>
<img width={900} height={500} alt="900x500" src="/assets/carousel.png"/>
<div className="carousel-caption">
<h3>Third slide label</h3>
<p>Praesent commodo cursus magna, vel scelerisque nisl consectetur.</p>
</div>
Expand Down
1 change: 0 additions & 1 deletion docs/examples/Collapse.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ class Example extends React.Component {
}

render(){

return (
<div>
<Button onClick={ ()=> this.setState({ open: !this.state.open })}>
Expand Down
20 changes: 10 additions & 10 deletions docs/examples/CollapsibleNav.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
const navbarInstance = (
<Navbar brand='React-Bootstrap' toggleNavKey={0}>
<Navbar brand="React-Bootstrap" toggleNavKey={0}>
<CollapsibleNav eventKey={0}> {/* This is the eventKey referenced */}
<Nav navbar>
<NavItem eventKey={1} href='#'>Link</NavItem>
<NavItem eventKey={2} href='#'>Link</NavItem>
<NavDropdown eventKey={3} title='Dropdown' id='collapsible-nav-dropdown'>
<MenuItem eventKey='1'>Action</MenuItem>
<MenuItem eventKey='2'>Another action</MenuItem>
<MenuItem eventKey='3'>Something else here</MenuItem>
<NavItem eventKey={1} href="#">Link</NavItem>
<NavItem eventKey={2} href="#">Link</NavItem>
<NavDropdown eventKey={3} title="Dropdown" id="collapsible-nav-dropdown">
<MenuItem eventKey="1">Action</MenuItem>
<MenuItem eventKey="2">Another action</MenuItem>
<MenuItem eventKey="3">Something else here</MenuItem>
<MenuItem divider />
<MenuItem eventKey='4'>Separated link</MenuItem>
<MenuItem eventKey="4">Separated link</MenuItem>
</NavDropdown>
</Nav>
<Nav navbar right>
<NavItem eventKey={1} href='#'>Link Right</NavItem>
<NavItem eventKey={2} href='#'>Link Right</NavItem>
<NavItem eventKey={1} href="#">Link Right</NavItem>
<NavItem eventKey={2} href="#">Link Right</NavItem>
</Nav>
</CollapsibleNav>
</Navbar>
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/DropdownButtonBasic.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ const BUTTONS = ['Default', 'Primary', 'Success', 'Info', 'Warning', 'Danger', '
function renderDropdownButton (title, i) {
return (
<DropdownButton bsStyle={title.toLowerCase()} title={title} key={i} id={`dropdown-basic-${i}`}>
<MenuItem eventKey='1'>Action</MenuItem>
<MenuItem eventKey='2'>Another action</MenuItem>
<MenuItem eventKey='3' active>Active Item</MenuItem>
<MenuItem eventKey="1">Action</MenuItem>
<MenuItem eventKey="2">Another action</MenuItem>
<MenuItem eventKey="3" active>Active Item</MenuItem>
<MenuItem divider />
<MenuItem eventKey='4'>Separated link</MenuItem>
<MenuItem eventKey="4">Separated link</MenuItem>
</DropdownButton>
);
}
Expand Down
Loading

0 comments on commit 09fe7a5

Please sign in to comment.