From 000fcf03b25fa465f4a03620f915e07469585009 Mon Sep 17 00:00:00 2001 From: Joao Pereira and Matt Kleiman Date: Thu, 27 Apr 2017 11:40:43 -0400 Subject: [PATCH] Update SlickGrid to latest version version 2.3.4 on commit 1878074 - This latest version fixes the scrollbar issue, so no need for custom changes to SlickGrid code. - Reverted css changes: using original .slick-row and .slick-cell classes --- libraries.txt | 66 +- .../copy_selected_query_results_feature_test.py | 2 +- 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 | 44 +- .../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 | 7375 ++++++++++---------- .../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 | 16 +- .../javascript/selection/row_selector_spec.js | 34 +- 26 files changed, 4989 insertions(+), 3794 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..4076ab59 100644 --- a/libraries.txt +++ b/libraries.txt @@ -1,36 +1,36 @@ This is a list of the third party libraries/code used in the application, not including Python modules installed via Pip which are listed in requirements.txt. -Library Version Licence URL -======= ======= ======= === -QT 4.6.2+ LGPL v2.1/3 http://www.qt.io/ -Bootstrap 3.3.4 MIT http://getbootstrap.com/ -jQuery 1.11.1 MIT http://jquery.com/ -Modernizr 2.6.2 MIT/BSD http://modernizr.com/ -AlertifyJS 1.7.1 MIT http://alertifyjs.com/ *** Do not update - changed to GPL3 in 1.8.0 *** -CodeMirror 5.14.2 MIT http://codemirror.net/ -aciTree 4.5.0-rc.7 MIT/GPL http://acoderinsights.ro/en/aciTree-tree-view-with-jQuery -contextMenu 2.1.0 MIT https://github.com/swisnl/jQuery-contextMenu -wcDocker 0f5690318c MIT/GPL https://github.com/WebCabin/wcDocker -Require.js 2.1.18 BSD/MIT http://requirejs.org/ -Underscore.js 1.8.3 MIT http://underscorejs.org/ -Underscore.string 387ab72d49 MIT http://epeli.github.io/underscore.string/ -Backform.js 5859b4f9db MIT https://github.com/AmiliaApp/backform -Backbone 1.1.2 MIT http://backbonejs.org -font-Awesome 4.5 SIL OFL http://fortawesome.github.io/Font-Awesome/ -font-mfizz 2.3 MIT http://fizzed.com/oss/font-mfizz -backgrid.js 0.3.5 MIT http://backgridjs.com/ -backbone.undo 0.2 MIT http://backbone.undojs.com/ -bootstrap-switch 3.3.2 MIT http://www.bootstrap-switch.org/ -select2 4.0.1 MIT https://select2.github.io/ -backgrid-filter 01b2b21 MIT https://github.com/wyuenho/backgrid-filter -backbone.paginator 2.0.3 MIT http://github.com/backbone-paginator/backbone.paginator -backgrid-paginator 03632df MIT https://github.com/wyuenho/backgrid-paginator -backgrid-select-all 1a00053 MIT https://github.com/wyuenho/backgrid-select-all -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 -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 +Library Version Licence URL +======= ======= ======= === +QT 4.6.2+ LGPL v2.1/3 http://www.qt.io/ +Bootstrap 3.3.4 MIT http://getbootstrap.com/ +jQuery 1.11.1 MIT http://jquery.com/ +Modernizr 2.6.2 MIT/BSD http://modernizr.com/ +AlertifyJS 1.7.1 MIT http://alertifyjs.com/ *** Do not update - changed to GPL3 in 1.8.0 *** +CodeMirror 5.14.2 MIT http://codemirror.net/ +aciTree 4.5.0-rc.7 MIT/GPL http://acoderinsights.ro/en/aciTree-tree-view-with-jQuery +contextMenu 2.1.0 MIT https://github.com/swisnl/jQuery-contextMenu +wcDocker 0f5690318c MIT/GPL https://github.com/WebCabin/wcDocker +Require.js 2.1.18 BSD/MIT http://requirejs.org/ +Underscore.js 1.8.3 MIT http://underscorejs.org/ +Underscore.string 387ab72d49 MIT http://epeli.github.io/underscore.string/ +Backform.js 5859b4f9db MIT https://github.com/AmiliaApp/backform +Backbone 1.1.2 MIT http://backbonejs.org +font-Awesome 4.5 SIL OFL http://fortawesome.github.io/Font-Awesome/ +font-mfizz 2.3 MIT http://fizzed.com/oss/font-mfizz +backgrid.js 0.3.5 MIT http://backgridjs.com/ +backbone.undo 0.2 MIT http://backbone.undojs.com/ +bootstrap-switch 3.3.2 MIT http://www.bootstrap-switch.org/ +select2 4.0.1 MIT https://select2.github.io/ +backgrid-filter 01b2b21 MIT https://github.com/wyuenho/backgrid-filter +backbone.paginator 2.0.3 MIT http://github.com/backbone-paginator/backbone.paginator +backgrid-paginator 03632df MIT https://github.com/wyuenho/backgrid-paginator +backgrid-select-all 1a00053 MIT https://github.com/wyuenho/backgrid-select-all +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.3.4-1878074 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 223579ee..d0e6394d 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 @@ -47,7 +47,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 = $("