jappwilson-react-datagrid
Advanced tools
Comparing version 2.1.21 to 2.1.22
@@ -9,6 +9,2 @@ 'use strict'; | ||
var _reactLoadMask = require('react-load-mask'); | ||
var _reactLoadMask2 = _interopRequireDefault(_reactLoadMask); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
@@ -19,3 +15,3 @@ | ||
var assign = require('object-assign'); | ||
//import LoadMask from 'react-load-mask' | ||
var Region = require('region'); | ||
@@ -106,3 +102,3 @@ | ||
sortable: _react2.default.PropTypes.bool, | ||
loadMaskOverHeader: _react2.default.PropTypes.bool, | ||
//loadMaskOverHeader : React.PropTypes.bool, | ||
idProperty: _react2.default.PropTypes.string.isRequired, | ||
@@ -425,8 +421,7 @@ | ||
var loadMask; | ||
if (props.loadMaskOverHeader) { | ||
loadMask = _react2.default.createElement(_reactLoadMask2.default, { visible: props.loading }); | ||
/*var loadMask | ||
if (props.loadMaskOverHeader){ | ||
loadMask = <LoadMask visible={props.loading} /> | ||
} | ||
*/ | ||
var paginationToolbar; | ||
@@ -482,3 +477,2 @@ | ||
), | ||
loadMask, | ||
renderMenu(menuProps), | ||
@@ -639,4 +633,4 @@ bottomToolbar | ||
prepareLoading: function prepareLoading(props) { | ||
var showLoadMask = props.showLoadMask || !this.isMounted(); //ismounted check for initial load | ||
return props.loading == null ? showLoadMask && this.state.defaultLoading : props.loading; | ||
//var showLoadMask = props.showLoadMask || !this.isMounted() //ismounted check for initial load | ||
return false; //== null? showLoadMask && this.state.defaultLoading: props.loading | ||
}, | ||
@@ -643,0 +637,0 @@ |
{ | ||
"name": "jappwilson-react-datagrid", | ||
"version": "2.1.21", | ||
"version": "2.1.22", | ||
"description": "React DataGrid", | ||
@@ -5,0 +5,0 @@ "main": "lib/index.js", |
@@ -10,3 +10,3 @@ 'use strict'; | ||
var assign = require('object-assign') | ||
import LoadMask from 'react-load-mask' | ||
//import LoadMask from 'react-load-mask' | ||
var Region = require('region') | ||
@@ -104,3 +104,3 @@ | ||
sortable : React.PropTypes.bool, | ||
loadMaskOverHeader : React.PropTypes.bool, | ||
//loadMaskOverHeader : React.PropTypes.bool, | ||
idProperty : React.PropTypes.string.isRequired, | ||
@@ -425,3 +425,3 @@ | ||
var loadMask | ||
/*var loadMask | ||
@@ -431,3 +431,3 @@ if (props.loadMaskOverHeader){ | ||
} | ||
*/ | ||
var paginationToolbar | ||
@@ -480,4 +480,5 @@ | ||
</div> | ||
{/* | ||
{loadMask} | ||
*/} | ||
{renderMenu(menuProps)} | ||
@@ -648,4 +649,4 @@ {bottomToolbar} | ||
prepareLoading: function(props) { | ||
var showLoadMask = props.showLoadMask || !this.isMounted() //ismounted check for initial load | ||
return props.loading == null? showLoadMask && this.state.defaultLoading: props.loading | ||
//var showLoadMask = props.showLoadMask || !this.isMounted() //ismounted check for initial load | ||
return false //== null? showLoadMask && this.state.defaultLoading: props.loading | ||
}, | ||
@@ -652,0 +653,0 @@ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
58492
3420015