Skip to content

Commit 8d16ac2

Browse files
committed
Default button style. 1.0.2
1 parent 46fec69 commit 8d16ac2

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

lib/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ exports.default = _react2.default.createClass({
334334
var buttonStyle = this.props.bsStyle === "error" ? "danger" : this.props.bsStyle;
335335
var clearButton = _react2.default.createElement(
336336
_Button2.default,
337-
{ onClick: this.clear, bsStyle: buttonStyle, disabled: !this.state.inputValue },
337+
{ onClick: this.clear, bsStyle: buttonStyle || "default", disabled: !this.state.inputValue },
338338
this.props.clearButtonElement
339339
);
340340
return _react2.default.createElement(
@@ -348,7 +348,6 @@ exports.default = _react2.default.createClass({
348348
ref: 'input',
349349
type: 'text',
350350
valueLink: null,
351-
bsStyle: this.props.bsStyle || "default",
352351
placeholder: this.state.focused ? "MM/DD/YYYY" : this.props.placeholder,
353352
onFocus: this.handleFocus,
354353
onBlur: this.handleBlur,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "react-bootstrap-date-picker",
33
"keywords": ["react", "react-component", "react-bootstrap", "bootstrap", "date picker", "calendar", "date", "picker"],
44
"main": "lib/index.js",
5-
"version": "1.0.1",
5+
"version": "1.0.2",
66
"description": "React-Bootstrap based date picker.",
77
"directories": {
88
"test": "test"

src/index.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ export default React.createClass({
287287
<Calendar cellPadding={this.props.cellPadding} selectedDate={this.state.selectedDate} displayDate={this.state.displayDate} onChange={this.onChangeDate} dayLabels={this.props.dayLabels} />
288288
</Popover>;
289289
const buttonStyle = this.props.bsStyle === "error" ? "danger" : this.props.bsStyle;
290-
const clearButton = <Button onClick={this.clear} bsStyle={buttonStyle} disabled={!this.state.inputValue}>{this.props.clearButtonElement}</Button>;
290+
const clearButton = <Button onClick={this.clear} bsStyle={buttonStyle || "default"} disabled={!this.state.inputValue}>{this.props.clearButtonElement}</Button>;
291291
return <div>
292292
<OverlayTrigger ref="overlay" trigger="click" rootClose placement={this.props.calendarPlacement} overlay={popOver} delayHide={100}>
293293
<Input
@@ -296,7 +296,6 @@ export default React.createClass({
296296
ref="input"
297297
type="text"
298298
valueLink={null}
299-
bsStyle={this.props.bsStyle || "default"}
300299
placeholder={this.state.focused ? "MM/DD/YYYY" : this.props.placeholder}
301300
onFocus={this.handleFocus}
302301
onBlur={this.handleBlur}

0 commit comments

Comments
 (0)