Skip to content

Commit c9f876f

Browse files
AllenFangAllenFang
committed
lib
1 parent 4db1094 commit c9f876f

26 files changed

+95
-58
lines changed

‎lib/BootstrapTable.js‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@ var BootstrapTable = function (_Component) {
138138
return _this.__handleSearch__REACT_HOT_LOADER__.apply(_this, arguments);
139139
};
140140

141+
_this._scrollTop = function () {
142+
return _this.___scrollTop__REACT_HOT_LOADER__.apply(_this, arguments);
143+
};
144+
141145
_this._scrollHeader = function () {
142146
return _this.___scrollHeader__REACT_HOT_LOADER__.apply(_this, arguments);
143147
};
@@ -359,6 +363,9 @@ var BootstrapTable = function (_Component) {
359363
this._adjustTable();
360364
window.addEventListener('resize', this._adjustTable);
361365
this.refs.body.refs.container.addEventListener('scroll', this._scrollHeader);
366+
if (this.props.scrollTop) {
367+
this._scrollTop();
368+
}
362369
}
363370
}, {
364371
key: 'componentWillUnmount',
@@ -953,6 +960,11 @@ var BootstrapTable = function (_Component) {
953960
}, {
954961
key: '__handleSearch__REACT_HOT_LOADER__',
955962
value: function __handleSearch__REACT_HOT_LOADER__(searchText) {
963+
// Set search field if this function being called outside
964+
// but it's not necessary if calling fron inside.
965+
if (this.refs.toolbar) {
966+
this.refs.toolbar.setSearchInput(searchText);
967+
}
956968
var onSearchChange = this.props.options.onSearchChange;
957969

958970
if (onSearchChange) {
@@ -1073,6 +1085,7 @@ var BootstrapTable = function (_Component) {
10731085
'div',
10741086
{ className: 'react-bs-table-tool-bar' },
10751087
_react2.default.createElement(_ToolBar2.default, {
1088+
ref: 'toolbar',
10761089
defaultSearch: this.props.options.defaultSearch,
10771090
clearSearch: this.props.options.clearSearch,
10781091
searchDelayTime: this.props.options.searchDelayTime,
@@ -1110,6 +1123,19 @@ var BootstrapTable = function (_Component) {
11101123
return null;
11111124
}
11121125
}
1126+
}, {
1127+
key: '___scrollTop__REACT_HOT_LOADER__',
1128+
value: function ___scrollTop__REACT_HOT_LOADER__() {
1129+
var scrollTop = this.props.scrollTop;
1130+
1131+
if (scrollTop === _Const2.default.SCROLL_TOP) {
1132+
this.refs.body.refs.container.scrollTop = 0;
1133+
} else if (scrollTop === _Const2.default.SCROLL_BOTTOM) {
1134+
this.refs.body.refs.container.scrollTop = this.refs.body.refs.container.scrollHeight;
1135+
} else if (typeof scrollTop === 'number' && !isNaN(scrollTop)) {
1136+
this.refs.body.refs.container.scrollTop = scrollTop;
1137+
}
1138+
}
11131139
}, {
11141140
key: '___scrollHeader__REACT_HOT_LOADER__',
11151141
value: function ___scrollHeader__REACT_HOT_LOADER__(e) {
@@ -1226,6 +1252,7 @@ BootstrapTable.propTypes = {
12261252
maxHeight: _react.PropTypes.oneOfType([_react.PropTypes.string, _react.PropTypes.number]),
12271253
data: _react.PropTypes.oneOfType([_react.PropTypes.array, _react.PropTypes.object]),
12281254
remote: _react.PropTypes.bool, // remote data, default is false
1255+
scrollTop: _react.PropTypes.oneOfType([_react.PropTypes.string, _react.PropTypes.number]),
12291256
striped: _react.PropTypes.bool,
12301257
bordered: _react.PropTypes.bool,
12311258
hover: _react.PropTypes.bool,
@@ -1323,6 +1350,7 @@ BootstrapTable.propTypes = {
13231350
expandComponent: _react.PropTypes.func
13241351
};
13251352
BootstrapTable.defaultProps = {
1353+
scrollTop: undefined,
13261354
expandComponent: undefined,
13271355
expandableRow: undefined,
13281356
height: '100%',
@@ -1429,9 +1457,9 @@ var _temp = function () {
14291457
return;
14301458
}
14311459

1432-
__REACT_HOT_LOADER__.register(BootstrapTable, 'BootstrapTable', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/BootstrapTable.js');
1460+
__REACT_HOT_LOADER__.register(BootstrapTable, 'BootstrapTable', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/BootstrapTable.js');
14331461

1434-
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/BootstrapTable.js');
1462+
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/BootstrapTable.js');
14351463
}();
14361464

14371465
;

‎lib/Const.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ var _default = {
3030
SAVE_BTN_TEXT: 'Save',
3131
CLOSE_BTN_TEXT: 'Close',
3232
FILTER_DELAY: 500,
33+
SCROLL_TOP: 'Top',
34+
SCROLL_BOTTOM: 'Bottom',
3335
FILTER_TYPE: {
3436
TEXT: 'TextFilter',
3537
REGEX: 'RegexFilter',
@@ -47,7 +49,7 @@ var _temp = function () {
4749
return;
4850
}
4951

50-
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/Const.js');
52+
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/Const.js');
5153
}();
5254

5355
;

‎lib/Editor.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ var _temp = function () {
127127
return;
128128
}
129129

130-
__REACT_HOT_LOADER__.register(editor, 'editor', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/Editor.js');
130+
__REACT_HOT_LOADER__.register(editor, 'editor', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/Editor.js');
131131

132-
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/Editor.js');
132+
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/Editor.js');
133133
}();
134134

135135
;

‎lib/ExpandComponent.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ var _temp = function () {
6767
return;
6868
}
6969

70-
__REACT_HOT_LOADER__.register(ExpandComponent, 'ExpandComponent', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/ExpandComponent.js');
70+
__REACT_HOT_LOADER__.register(ExpandComponent, 'ExpandComponent', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/ExpandComponent.js');
7171

72-
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/ExpandComponent.js');
72+
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/ExpandComponent.js');
7373
}();
7474

7575
;

‎lib/Filter.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ var _temp = function () {
7474
return;
7575
}
7676

77-
__REACT_HOT_LOADER__.register(Filter, 'Filter', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/Filter.js');
77+
__REACT_HOT_LOADER__.register(Filter, 'Filter', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/Filter.js');
7878
}();
7979

8080
;

‎lib/Notification.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var _react = require('react');
1010

1111
var _react2 = _interopRequireDefault(_react);
1212

13-
var _reactToastr = require('react-toastr');
13+
var _reactToastr = require('@allenfang/react-toastr');
1414

1515
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
1616

@@ -66,11 +66,11 @@ var _temp = function () {
6666
return;
6767
}
6868

69-
__REACT_HOT_LOADER__.register(ToastrMessageFactory, 'ToastrMessageFactory', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/Notification.js');
69+
__REACT_HOT_LOADER__.register(ToastrMessageFactory, 'ToastrMessageFactory', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/Notification.js');
7070

71-
__REACT_HOT_LOADER__.register(Notification, 'Notification', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/Notification.js');
71+
__REACT_HOT_LOADER__.register(Notification, 'Notification', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/Notification.js');
7272

73-
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/Notification.js');
73+
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/Notification.js');
7474
}();
7575

7676
;

‎lib/SelectRowHeaderColumn.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ var _temp = function () {
5353
return;
5454
}
5555

56-
__REACT_HOT_LOADER__.register(SelectRowHeaderColumn, 'SelectRowHeaderColumn', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/SelectRowHeaderColumn.js');
56+
__REACT_HOT_LOADER__.register(SelectRowHeaderColumn, 'SelectRowHeaderColumn', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/SelectRowHeaderColumn.js');
5757

58-
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/SelectRowHeaderColumn.js');
58+
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/SelectRowHeaderColumn.js');
5959
}();
6060

6161
;

‎lib/TableBody.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -455,11 +455,11 @@ var _temp = function () {
455455
return;
456456
}
457457

458-
__REACT_HOT_LOADER__.register(isFun, 'isFun', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/TableBody.js');
458+
__REACT_HOT_LOADER__.register(isFun, 'isFun', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/TableBody.js');
459459

460-
__REACT_HOT_LOADER__.register(TableBody, 'TableBody', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/TableBody.js');
460+
__REACT_HOT_LOADER__.register(TableBody, 'TableBody', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/TableBody.js');
461461

462-
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/TableBody.js');
462+
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/TableBody.js');
463463
}();
464464

465465
;

‎lib/TableColumn.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ var _temp = function () {
150150
return;
151151
}
152152

153-
__REACT_HOT_LOADER__.register(TableColumn, 'TableColumn', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/TableColumn.js');
153+
__REACT_HOT_LOADER__.register(TableColumn, 'TableColumn', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/TableColumn.js');
154154

155-
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/TableColumn.js');
155+
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/TableColumn.js');
156156
}();
157157

158158
;

‎lib/TableEditColumn.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,9 @@ var _temp = function () {
236236
return;
237237
}
238238

239-
__REACT_HOT_LOADER__.register(TableEditColumn, 'TableEditColumn', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/TableEditColumn.js');
239+
__REACT_HOT_LOADER__.register(TableEditColumn, 'TableEditColumn', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/TableEditColumn.js');
240240

241-
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/omerfarukalmali/Projects/personal/js/reactjs/oalmali/react-bootstrap-table/src/TableEditColumn.js');
241+
__REACT_HOT_LOADER__.register(_default, 'default', '/Users/allen/Node/react-bootstrap-table-new/react-bootstrap-table/src/TableEditColumn.js');
242242
}();
243243

244244
;

0 commit comments

Comments
 (0)