Skip to content

Commit 8f44de1

Browse files
caguthriecaguthrie
committed
Disabling filtering for now, fixing longs in date exports 2
1 parent 1573f72 commit 8f44de1

6 files changed

+21
-15
lines changed

‎build/DOMBuilder.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,9 @@ function buildHeaders(table) {
145145
(columnDef == table.state.columnDefSorted && table.state.sortAsc ?
146146
table.handleSort.bind(null, columnDef, false) : table.replaceData.bind(null, table.props.data, true))},
147147
React.DOM.div({style: {textAlign: "center"}, className: "rt-header-element", key: columnDef.colTag},
148-
React.DOM.a({className: textClasses,
149-
onClick: table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)},
148+
React.DOM.a({className: textClasses
149+
//onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}
150+
},
150151
table.state.firstColumnLabel.join("/")
151152
),
152153
React.DOM.input({style: ss, className: ("rt-" + columnDef.colTag + "-filter-input rt-filter-input") + (table.state.filterInPlace[columnDef.colTag] ? "" : " rt-hide"),
@@ -175,8 +176,9 @@ function buildHeaders(table) {
175176
(columnDef == table.state.columnDefSorted && table.state.sortAsc ?
176177
table.handleSort.bind(null, columnDef, false) : table.replaceData.bind(null, table.props.data, true))},
177178
React.DOM.div({style: style, className: "rt-header-element rt-info-header", key: columnDef.colTag},
178-
React.DOM.a({className: textClasses,
179-
onClick: table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)},
179+
React.DOM.a({className: textClasses
180+
//onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}
181+
},
180182
columnDef.text
181183
),
182184
React.DOM.input({style: ss, className: ("rt-" + columnDef.colTag + "-filter-input rt-filter-input") + (table.state.filterInPlace[columnDef.colTag] ? "" : " rt-hide"),

‎build/ReactTableEventHandlers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ function ReactTableGetInitialState() {
33
var rootNode = createTree(this.props);
44
var selections = _getInitialSelections(this.props.selectedRows, this.props.selectedSummaryRows);
55
// FILTERING NOT READY****************
6-
this.props.filtering = {disable: true};
6+
//this.props.filtering = {disable: true};
77
// ******************
88
return {
99
rootNode: rootNode,

‎dist/react-table.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,9 @@ function buildHeaders(table) {
237237
(columnDef == table.state.columnDefSorted && table.state.sortAsc ?
238238
table.handleSort.bind(null, columnDef, false) : table.replaceData.bind(null, table.props.data, true))},
239239
React.DOM.div({style: {textAlign: "center"}, className: "rt-header-element", key: columnDef.colTag},
240-
React.DOM.a({className: textClasses,
241-
onClick: table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)},
240+
React.DOM.a({className: textClasses
241+
//onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}
242+
},
242243
table.state.firstColumnLabel.join("/")
243244
),
244245
React.DOM.input({style: ss, className: ("rt-" + columnDef.colTag + "-filter-input rt-filter-input") + (table.state.filterInPlace[columnDef.colTag] ? "" : " rt-hide"),
@@ -267,8 +268,9 @@ function buildHeaders(table) {
267268
(columnDef == table.state.columnDefSorted && table.state.sortAsc ?
268269
table.handleSort.bind(null, columnDef, false) : table.replaceData.bind(null, table.props.data, true))},
269270
React.DOM.div({style: style, className: "rt-header-element rt-info-header", key: columnDef.colTag},
270-
React.DOM.a({className: textClasses,
271-
onClick: table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)},
271+
React.DOM.a({className: textClasses
272+
//onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}
273+
},
272274
columnDef.text
273275
),
274276
React.DOM.input({style: ss, className: ("rt-" + columnDef.colTag + "-filter-input rt-filter-input") + (table.state.filterInPlace[columnDef.colTag] ? "" : " rt-hide"),
@@ -1422,7 +1424,7 @@ function _computePageDisplayRange(currentPage, maxDisplayedPages) {
14221424
var rootNode = createTree(this.props);
14231425
var selections = _getInitialSelections(this.props.selectedRows, this.props.selectedSummaryRows);
14241426
// FILTERING NOT READY****************
1425-
this.props.filtering = {disable: true};
1427+
//this.props.filtering = {disable: true};
14261428
// ******************
14271429
return {
14281430
rootNode: rootNode,

‎dist/react-table.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/DOMBuilder.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ function buildHeaders(table) {
146146
table.handleSort.bind(null, columnDef, false) : table.replaceData.bind(null, table.props.data, true))}>
147147
<div style={{textAlign: "center"}} className="rt-header-element" key={columnDef.colTag}>
148148
<a className={textClasses}
149-
onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}>
149+
//onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}
150+
>
150151
{table.state.firstColumnLabel.join("/")}
151152
</a>
152153
<input style={ss} className={("rt-" + columnDef.colTag + "-filter-input rt-filter-input") + (table.state.filterInPlace[columnDef.colTag] ? "" : " rt-hide")}
@@ -176,7 +177,8 @@ function buildHeaders(table) {
176177
table.handleSort.bind(null, columnDef, false) : table.replaceData.bind(null, table.props.data, true))}>
177178
<div style={style} className="rt-header-element rt-info-header" key={columnDef.colTag}>
178179
<a className={textClasses}
179-
onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}>
180+
//onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}
181+
>
180182
{columnDef.text}
181183
</a>
182184
<input style={ss} className={("rt-" + columnDef.colTag + "-filter-input rt-filter-input") + (table.state.filterInPlace[columnDef.colTag] ? "" : " rt-hide")}

‎src/ReactTableEventHandlers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ function ReactTableGetInitialState() {
33
var rootNode = createTree(this.props);
44
var selections = _getInitialSelections(this.props.selectedRows, this.props.selectedSummaryRows);
55
// FILTERING NOT READY****************
6-
this.props.filtering = {disable: true};
6+
//this.props.filtering = {disable: true};
77
// ******************
88
return {
99
rootNode: rootNode,

0 commit comments

Comments
 (0)