Merge remote-tracking branch 'remotes/cdeng/master' into k0stya-rowsp…

…an: Fixed an issue where the selected class is not applied to new visible columns (mleibman#1026) Conflicts: controls/slick.columnpicker.js
GerHobbelt · Nov 5, 2014 · ca3005a · ca3005a
2 parents 9c2cb59 + 6a62864
commit ca3005a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/controls/slick.columnpicker.js b/controls/slick.columnpicker.js
@@ -152,6 +152,11 @@
         });
 
         grid.setColumns(newColumnSet);
+
+        if (grid.getSelectedRows().length > 0) {
+          grid.setSelectedRows(grid.getSelectedRows());
+        }
+
         var evd = new Slick.EventData();
         evd.hiddenColumns = invisibleColumns;
         evd.visibleColumns = visibleColumns;