diff options
| -rw-r--r-- | examples/example5-collapsing.html | 2 | ||||
| -rw-r--r-- | examples/example9-row-reordering.html | 6 | ||||
| -rw-r--r-- | slick.grid.js | 10 |
3 files changed, 8 insertions, 10 deletions
diff --git a/examples/example5-collapsing.html b/examples/example5-collapsing.html index a443980..fdb0135 100644 --- a/examples/example5-collapsing.html +++ b/examples/example5-collapsing.html @@ -211,7 +211,7 @@ dataView.updateItem(item.id, item); } - e.stopPropagation(); + e.stopImmediatePropagation(); } }); diff --git a/examples/example9-row-reordering.html b/examples/example9-row-reordering.html index 1d70c95..f527e89 100644 --- a/examples/example9-row-reordering.html +++ b/examples/example9-row-reordering.html @@ -88,7 +88,6 @@ <script src="../plugins/slick.cellselectionmodel.js"></script> <script src="../plugins/slick.rowselectionmodel.js"></script> <script src="../plugins/slick.rowmovemanager.js"></script> - <script src="../slick.editors.js"></script> <script src="../slick.grid.js"></script> @@ -152,12 +151,9 @@ { name: "Find out who's nice", complete: false} ]; - data = data.concat(data); - data = data.concat(data); - grid = new Slick.Grid("#myGrid", data, columns, options); - grid.setSelectionModel(new Slick.CellSelectionModel()); + grid.setSelectionModel(new Slick.RowSelectionModel()); var moveRowsPlugin = new Slick.RowMoveManager(); diff --git a/slick.grid.js b/slick.grid.js index d39673d..fbe0e80 100644 --- a/slick.grid.js +++ b/slick.grid.js @@ -1687,12 +1687,14 @@ if (typeof Slick === "undefined") { } function setFocus() { - // IE7 tries to scroll the viewport so that the item being focused is aligned to the left border + // IE tries to scroll the viewport so that the item being focused is aligned to the left border // IE-specific .setActive() sets the focus, but doesn't scroll - if ($.browser.msie && parseInt($.browser.version) < 8) + if ($.browser.msie) { $canvas[0].setActive(); - else + } + else { $canvas[0].focus(); + } } function scrollActiveCellIntoView() { @@ -1706,7 +1708,7 @@ if (typeof Slick === "undefined") { $viewport.scrollLeft(left); else if (right > scrollRight) $viewport.scrollLeft(Math.min(left, right - $viewport[0].clientWidth)); - } + } } function setActiveCellInternal(newCell, editMode) { |