loleaflet/Makefile.am | 4 +++- loleaflet/js/global.js | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-)
New commits: commit 345df913de36ca563fb2b91ff2838bb691665f03 Author: Jan Holesovsky <[email protected]> AuthorDate: Wed Mar 20 09:44:39 2019 +0100 Commit: Jan Holesovsky <[email protected]> CommitDate: Wed Mar 20 09:44:39 2019 +0100 Revert "loleaflet: remove jquery-ui.js" This is needed for the functionality of the dialogs. This reverts commit e81441f63bb19981fa5a47b0fd251a91a8b98c1f. diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 5d3f735d6..5f51a91a4 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -78,7 +78,8 @@ LOLEAFLET_CSS =\ $(builddir)/node_modules/vex-js/css/vex-theme-bottom-right-corner.css \ $(builddir)/node_modules/smartmenus/dist/css/sm-core-css.css \ $(builddir)/node_modules/smartmenus/dist/css/sm-simple/sm-simple.css \ - $(srcdir)/css/menubar.css + $(srcdir)/css/menubar.css \ + $(builddir)/node_modules/jquery-ui/themes/ui-lightness/jquery-ui.css LOLEAFLET_CSS_DST = $(foreach file,$(LOLEAFLET_CSS),$(builddir)/dist/$(notdir $(file))) LOLEAFLET_CSS_M4 = $(strip $(foreach file,$(LOLEAFLET_CSS),$(notdir $(file)))) @@ -90,6 +91,7 @@ NODE_MODULES_JS =\ node_modules/jquery/dist/jquery.js \ node_modules/jquery-mousewheel/jquery.mousewheel.js \ node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \ + node_modules/jquery-ui/jquery-ui.js \ node_modules/smartmenus/dist/jquery.smartmenus.js \ node_modules/autolinker/dist/Autolinker.js \ node_modules/json-js/json2.js \ diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js index 60a833ef5..664a06e37 100644 --- a/loleaflet/js/global.js +++ b/loleaflet/js/global.js @@ -38,6 +38,14 @@ } } + // fix jquery-ui + // var jQuery = require('jquery'); + global.require = function (path) { + if (path=='jquery') { + return global.jQuery; + } + }; + global.getParameterByName = function (name) { name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]'); var regex = new RegExp('[\\?&]' + name + '=([^&#]*)'); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
