Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix issue #68 editor with activeRow selection #241

Merged
merged 3 commits into from
May 12, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions slick.grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -2749,7 +2749,9 @@ if (typeof Slick === "undefined") {
scrollRowIntoView(cell.row, false);

var preClickModeOn = (e.target && e.target.className === Slick.preClickClassName);
setActiveCellInternal(getCellNode(cell.row, cell.cell), null, preClickModeOn);
var column = columns[cell.cell];
var suppressActiveCellChangedEvent = (options.editable && column && column.editor) ? true : false;
setActiveCellInternal(getCellNode(cell.row, cell.cell), null, preClickModeOn, suppressActiveCellChangedEvent);
}
}
}
Expand Down Expand Up @@ -3704,7 +3706,7 @@ if (typeof Slick === "undefined") {
var newCell = getCellNode(row, cell);

// if selecting the 'add new' row, start editing right away
setActiveCellInternal(newCell, forceEdit || (row === getDataLength()) || options.autoEdit);
setActiveCellInternal(newCell, (forceEdit || (row === getDataLength()) || options.autoEdit), null, options.editable);

// if no editor was created, set the focus back on the grid
if (!currentEditor) {
Expand Down