slickgrid
Advanced tools
Comparing version 2.4.21 to 2.4.22
{ | ||
"name": "slickgrid", | ||
"version": "2.4.21", | ||
"version": "2.4.22", | ||
"description": "A lightning fast JavaScript grid/spreadsheet", | ||
@@ -37,3 +37,3 @@ "main": "slick.core.js", | ||
"devDependencies": { | ||
"cypress": "^4.2.0", | ||
"cypress": "^4.4.0", | ||
"eslint": "^6.8.0", | ||
@@ -40,0 +40,0 @@ "http-server": "^0.12.1" |
@@ -224,4 +224,4 @@ (function ($) { | ||
// Get the row and check it's a selectable row before pushing it onto the stack | ||
var rowItem = _grid.getDataItem(i); | ||
if (rowItem.selectableRow !== false) { | ||
var rowItem = _grid.getDataItem(i); | ||
if (checkSelectableOverride(i, rowItem, _grid)) { | ||
rows.push(i); | ||
@@ -228,0 +228,0 @@ } |
@@ -235,3 +235,3 @@ /*** | ||
// clicking on a row select checkbox | ||
if (_options.useRowClick || _grid.getColumns()[args.cell][_dataViewIdProperty] === _options.columnId && $(e.target).hasClass(_options.cssClass)) { | ||
if (_options.useRowClick || _grid.getColumns()[args.cell]['id'] === _options.columnId && $(e.target).hasClass(_options.cssClass)) { | ||
// if editing, try to commit | ||
@@ -238,0 +238,0 @@ if (_grid.getEditorLock().isActive() && !_grid.getEditorLock().commitCurrentEdit()) { |
@@ -134,9 +134,21 @@ /** | ||
if (_self.onBeforeMoveRows.notify(eventData) === false) { | ||
dd.guide.css("top", -1000); | ||
dd.canMove = false; | ||
} else { | ||
dd.guide.css("top", insertBefore * _grid.getOptions().rowHeight); | ||
dd.canMove = true; | ||
} | ||
// if there's a UsabilityOverride defined, we also need to verify that the condition is valid | ||
if (_usabilityOverride) { | ||
var insertBeforeDataContext = _grid.getDataItem(insertBefore); | ||
dd.canMove = checkUsabilityOverride(insertBefore, insertBeforeDataContext, _grid); | ||
} | ||
// if the new target is possible we'll display the dark blue bar (representin the acceptability) at the target position | ||
// else it won't show up (it will be off the screen) | ||
if (!dd.canMove) { | ||
dd.guide.css("top", -1000); | ||
} else { | ||
dd.guide.css("top", insertBefore * _grid.getOptions().rowHeight); | ||
} | ||
dd.insertBefore = insertBefore; | ||
@@ -143,0 +155,0 @@ } |
@@ -14,10 +14,10 @@ ## This is the 6pac SlickGrid repo | ||
### E2E Tests with Cypress | ||
We are now starting to add E2E (end to end) tests in the browser with [Cypress](https://www.cypress.io/). You can see [here](https://github.com/6pac/SlickGrid/tree/master/cypress/integration) the list of Examples that now have E2E tests. We also added these Cypress E2E tests to the [GitHub Actions](https://github.com/features/actions) Workflow to automate certain steps while making sure any new commits aren't breaking the build/test. It will basically run all the E2E tests every time someone pushes a commit or a PR. | ||
We are now starting to add E2E (end to end) tests in the browser with [Cypress](https://www.cypress.io/). You can see [here](https://github.com/6pac/SlickGrid/tree/master/cypress/integration) the list of Examples that now have E2E tests. We also added these tests to the [GitHub Actions](https://github.com/features/actions) Workflow to automate certain steps while making sure any new commits aren't breaking the build/test. It will basically run all the E2E tests every time someone pushes a Commit or a Pull Request. | ||
We also welcome any contributions (tests or fixes) and if you wish to add Cypress E2E tests, all you need to do is to clone the repo and then run the following commands | ||
We also welcome any new contributions (tests or fixes) and if you wish to add Cypress E2E tests, all you need to do is to clone the repo and then run the following commands | ||
```bash | ||
npm install # install all npm packages | ||
npm run server # run a local http server | ||
npm run cypress:open # open Cypress tool | ||
npm install # install all npm packages | ||
npm run serve # run a local http server on port 8080 | ||
npm run cypress:open # open Cypress tool | ||
``` | ||
Once Cypress UI is open, you can click on "Run all Specs" to start the E2E browser tests. | ||
Once the Cypress UI is open, you can then click on "Run all Specs" to execute all E2E browser tests. |
@@ -656,2 +656,6 @@ (function ($) { | ||
if(groups.length) { | ||
addTotals(groups); | ||
} | ||
groups.sort(groupingInfos[level].comparer); | ||
@@ -1001,3 +1005,2 @@ | ||
if (groups.length) { | ||
addTotals(groups); | ||
newRows = flattenGroupedRows(groups); | ||
@@ -1004,0 +1007,0 @@ } |
Sorry, the diff of this file is too big to display
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
4423937
97532