Skip to content

Commit

Permalink
Disabling filtering for now, fixing longs in date exports 2
Browse files Browse the repository at this point in the history
  • Loading branch information
@caguthrie
caguthrie committed Jun 19, 2015
1 parent 1573f72 commit 8f44de1
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 15 deletions.
10 changes: 6 additions & 4 deletions build/DOMBuilder.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,9 @@ function buildHeaders(table) {
(columnDef == table.state.columnDefSorted && table.state.sortAsc ?
table.handleSort.bind(null, columnDef, false) : table.replaceData.bind(null, table.props.data, true))},
React.DOM.div({style: {textAlign: "center"}, className: "rt-header-element", key: columnDef.colTag},
React.DOM.a({className: textClasses,
onClick: table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)},
React.DOM.a({className: textClasses
//onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}
},
table.state.firstColumnLabel.join("/")
),
React.DOM.input({style: ss, className: ("rt-" + columnDef.colTag + "-filter-input rt-filter-input") + (table.state.filterInPlace[columnDef.colTag] ? "" : " rt-hide"),
Expand Down Expand Up @@ -175,8 +176,9 @@ function buildHeaders(table) {
(columnDef == table.state.columnDefSorted && table.state.sortAsc ?
table.handleSort.bind(null, columnDef, false) : table.replaceData.bind(null, table.props.data, true))},
React.DOM.div({style: style, className: "rt-header-element rt-info-header", key: columnDef.colTag},
React.DOM.a({className: textClasses,
onClick: table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)},
React.DOM.a({className: textClasses
//onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}
},
columnDef.text
),
React.DOM.input({style: ss, className: ("rt-" + columnDef.colTag + "-filter-input rt-filter-input") + (table.state.filterInPlace[columnDef.colTag] ? "" : " rt-hide"),
Expand Down
2 changes: 1 addition & 1 deletion build/ReactTableEventHandlers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ function ReactTableGetInitialState() {
var rootNode = createTree(this.props);
var selections = _getInitialSelections(this.props.selectedRows, this.props.selectedSummaryRows);
// FILTERING NOT READY****************
this.props.filtering = {disable: true};
//this.props.filtering = {disable: true};
// ******************
return {
rootNode: rootNode,
Expand Down
12 changes: 7 additions & 5 deletions dist/react-table.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,9 @@ function buildHeaders(table) {
(columnDef == table.state.columnDefSorted && table.state.sortAsc ?
table.handleSort.bind(null, columnDef, false) : table.replaceData.bind(null, table.props.data, true))},
React.DOM.div({style: {textAlign: "center"}, className: "rt-header-element", key: columnDef.colTag},
React.DOM.a({className: textClasses,
onClick: table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)},
React.DOM.a({className: textClasses
//onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}
},
table.state.firstColumnLabel.join("/")
),
React.DOM.input({style: ss, className: ("rt-" + columnDef.colTag + "-filter-input rt-filter-input") + (table.state.filterInPlace[columnDef.colTag] ? "" : " rt-hide"),
Expand Down Expand Up @@ -267,8 +268,9 @@ function buildHeaders(table) {
(columnDef == table.state.columnDefSorted && table.state.sortAsc ?
table.handleSort.bind(null, columnDef, false) : table.replaceData.bind(null, table.props.data, true))},
React.DOM.div({style: style, className: "rt-header-element rt-info-header", key: columnDef.colTag},
React.DOM.a({className: textClasses,
onClick: table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)},
React.DOM.a({className: textClasses
//onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}
},
columnDef.text
),
React.DOM.input({style: ss, className: ("rt-" + columnDef.colTag + "-filter-input rt-filter-input") + (table.state.filterInPlace[columnDef.colTag] ? "" : " rt-hide"),
Expand Down Expand Up @@ -1422,7 +1424,7 @@ function _computePageDisplayRange(currentPage, maxDisplayedPages) {
var rootNode = createTree(this.props);
var selections = _getInitialSelections(this.props.selectedRows, this.props.selectedSummaryRows);
// FILTERING NOT READY****************
this.props.filtering = {disable: true};
//this.props.filtering = {disable: true};
// ******************
return {
rootNode: rootNode,
Expand Down
4 changes: 2 additions & 2 deletions dist/react-table.min.js
View file

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions src/DOMBuilder.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ function buildHeaders(table) {
table.handleSort.bind(null, columnDef, false) : table.replaceData.bind(null, table.props.data, true))}>
<div style={{textAlign: "center"}} className="rt-header-element" key={columnDef.colTag}>
<a className={textClasses}
onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}>
//onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}
>
{table.state.firstColumnLabel.join("/")}
</a>
<input style={ss} className={("rt-" + columnDef.colTag + "-filter-input rt-filter-input") + (table.state.filterInPlace[columnDef.colTag] ? "" : " rt-hide")}
Expand Down Expand Up @@ -176,7 +177,8 @@ function buildHeaders(table) {
table.handleSort.bind(null, columnDef, false) : table.replaceData.bind(null, table.props.data, true))}>
<div style={style} className="rt-header-element rt-info-header" key={columnDef.colTag}>
<a className={textClasses}
onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}>
//onClick={table.props.filtering && table.props.filtering.disable ? null : toggleFilterBox.bind(null, table, columnDef.colTag)}
>
{columnDef.text}
</a>
<input style={ss} className={("rt-" + columnDef.colTag + "-filter-input rt-filter-input") + (table.state.filterInPlace[columnDef.colTag] ? "" : " rt-hide")}
Expand Down
2 changes: 1 addition & 1 deletion src/ReactTableEventHandlers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ function ReactTableGetInitialState() {
var rootNode = createTree(this.props);
var selections = _getInitialSelections(this.props.selectedRows, this.props.selectedSummaryRows);
// FILTERING NOT READY****************
this.props.filtering = {disable: true};
//this.props.filtering = {disable: true};
// ******************
return {
rootNode: rootNode,
Expand Down

0 comments on commit 8f44de1

Please sign in to comment.