From 1227cba4e152792c8d942046c337711a79285878 Mon Sep 17 00:00:00 2001 From: George Gelashvili and Joao Pereira Date: Mon, 15 May 2017 14:16:23 -0400 Subject: [PATCH] Update SlickGrid to version 2.3.6-53ee34 --- libraries.txt | 2 +- .../copy_selected_query_results_feature_test.py | 3 +- web/pgadmin/static/vendor/slickgrid/README | 9 - web/pgadmin/static/vendor/slickgrid/README.md | 9 + .../slickgrid/controls/slick.columnpicker.js | 9 +- .../static/vendor/slickgrid/images/CheckboxN.png | Bin 0 -> 257 bytes .../static/vendor/slickgrid/images/CheckboxY.png | Bin 0 -> 361 bytes .../vendor/slickgrid/plugins/slick.autotooltips.js | 10 +- .../slickgrid/plugins/slick.cellcopymanager.js | 6 +- .../plugins/slick.cellexternalcopymanager.js | 449 ++ .../slickgrid/plugins/slick.cellselectionmodel.js | 46 +- .../slickgrid/plugins/slick.headerbuttons.js | 6 +- .../vendor/slickgrid/plugins/slick.headermenu.js | 8 +- .../slickgrid/plugins/slick.rowselectionmodel.js | 8 +- .../vendor/slickgrid/slick-default-theme.css | 22 +- web/pgadmin/static/vendor/slickgrid/slick.core.js | 15 +- .../static/vendor/slickgrid/slick.dataview.js | 40 +- .../static/vendor/slickgrid/slick.editors.js | 67 +- .../static/vendor/slickgrid/slick.formatters.js | 12 +- web/pgadmin/static/vendor/slickgrid/slick.grid.css | 43 +- web/pgadmin/static/vendor/slickgrid/slick.grid.js | 7401 ++++++++++---------- .../slickgrid/slick.groupitemmetadataprovider.js | 158 + .../vendor/slickgrid/slick.remotemodel-yahoo.js | 206 + .../static/vendor/slickgrid/slick.remotemodel.js | 169 + .../tools/sqleditor/static/css/sqleditor.css | 19 +- .../sqleditor/templates/sqleditor/js/sqleditor.js | 3 +- .../javascript/selection/row_selector_spec.js | 34 +- 27 files changed, 4989 insertions(+), 3765 deletions(-) delete mode 100644 web/pgadmin/static/vendor/slickgrid/README create mode 100644 web/pgadmin/static/vendor/slickgrid/README.md create mode 100644 web/pgadmin/static/vendor/slickgrid/images/CheckboxN.png create mode 100644 web/pgadmin/static/vendor/slickgrid/images/CheckboxY.png create mode 100644 web/pgadmin/static/vendor/slickgrid/plugins/slick.cellexternalcopymanager.js create mode 100644 web/pgadmin/static/vendor/slickgrid/slick.groupitemmetadataprovider.js create mode 100644 web/pgadmin/static/vendor/slickgrid/slick.remotemodel-yahoo.js create mode 100644 web/pgadmin/static/vendor/slickgrid/slick.remotemodel.js diff --git a/libraries.txt b/libraries.txt index 7e0bd5b7..a8c634c8 100644 --- a/libraries.txt +++ b/libraries.txt @@ -31,6 +31,6 @@ dropzone 4e20bd4 MIT https://github.com/enyo/dropzone Filemanager 7e060c2 MIT https://github.com/simogeo/Filemanager Unit (Length) d8e6237 MIT https://github.com/heygrady/Units/blob/master/Length.min.js Natural Sort 9565816 MIT https://github.com/javve/natural-sort/blob/master/index.js -SlickGrid 2.2.4 MIT https://github.com/6pac/SlickGrid +SlickGrid 2.3.6-53ee34 MIT https://github.com/6pac/SlickGrid jQuery-UI 1.11.3 MIT https://jqueryui.com/ BigNumber 3.0.1 MIT http://mikemcl.github.io/bignumber.js \ No newline at end of file diff --git a/web/pgadmin/feature_tests/copy_selected_query_results_feature_test.py b/web/pgadmin/feature_tests/copy_selected_query_results_feature_test.py index 338e5f71..91407808 100644 --- a/web/pgadmin/feature_tests/copy_selected_query_results_feature_test.py +++ b/web/pgadmin/feature_tests/copy_selected_query_results_feature_test.py @@ -21,7 +21,6 @@ class CopySelectedQueryResultsFeatureTest(BaseFeatureTest): Tests various ways to copy data from the query results grid. """ - scenarios = [ ("Test Copying Query Results", dict()) ] @@ -56,7 +55,7 @@ class CopySelectedQueryResultsFeatureTest(BaseFeatureTest): def _copies_rows(self): pyperclip.copy("old clipboard contents") time.sleep(5) - self.page.find_by_xpath("//*[contains(@class, 'sr')]/*[1]/input[@type='checkbox']").click() + self.page.find_by_xpath("//*[contains(@class, 'slick-row')]/*[1]/input[@type='checkbox']").click() self.page.find_by_xpath("//*[@id='btn-copy-row']").click() self.assertEqual("'Some-Name','6'", diff --git a/web/pgadmin/static/vendor/slickgrid/README b/web/pgadmin/static/vendor/slickgrid/README deleted file mode 100644 index cf583515..00000000 --- a/web/pgadmin/static/vendor/slickgrid/README +++ /dev/null @@ -1,9 +0,0 @@ -WARNING!! - -The following changes have been made to SlickGrid. These must be re-applied if updating the code from upstream! - -- The CSS class 'slick-row' has been renamed to 'sr' - -- The CSS class 'slick-cell' has been renamed to 'sc' - -The intent of these changes is to minimise memory usage by the grid, by saving a few bytes per row/cell. \ No newline at end of file diff --git a/web/pgadmin/static/vendor/slickgrid/README.md b/web/pgadmin/static/vendor/slickgrid/README.md new file mode 100644 index 00000000..e8a1ad7a --- /dev/null +++ b/web/pgadmin/static/vendor/slickgrid/README.md @@ -0,0 +1,9 @@ +## This is the 6pac SlickGrid repo + +This is the acknowledged most active non-customised fork of SlickGrid. + +It aims to be a viable alternative master repo, building on the legacy of the mleibman/SlickGrid master branch, keeping libraries up to date and applying small, safe core patches and enhancements without turning into a personalised build. + +Check out the [examples](https://github.com/6pac/SlickGrid/wiki/Examples) for examples demonstrating new features and use cases, such as dynamic grid creation and editors with third party controls. + +Also check out the [wiki](https://github.com/6pac/SlickGrid/wiki) for news and documentation. \ No newline at end of file diff --git a/web/pgadmin/static/vendor/slickgrid/controls/slick.columnpicker.js b/web/pgadmin/static/vendor/slickgrid/controls/slick.columnpicker.js index dc167209..93a6be5b 100644 --- a/web/pgadmin/static/vendor/slickgrid/controls/slick.columnpicker.js +++ b/web/pgadmin/static/vendor/slickgrid/controls/slick.columnpicker.js @@ -12,12 +12,12 @@ grid.onColumnsReordered.subscribe(updateColumnOrder); options = $.extend({}, defaults, options); - $menu = $("