loleaflet/Makefile.am | 5 +---- loleaflet/debug/document/loleaflet.html | 2 -- loleaflet/evol.colorpicker.strings.js | 7 ------- loleaflet/npm-shrinkwrap.json.in | 10 ---------- loleaflet/package.json | 1 - 5 files changed, 1 insertion(+), 24 deletions(-)
New commits: commit b1948bff68c8bbad55cc94b801df107692e92038 Author: Andras Timar <andras.ti...@collabora.com> Date: Fri May 25 14:56:23 2018 +0200 remove unused evol-colorpicker Change-Id: I3eaf2040aa8cfaefb7861c33bceac7c1e5d7866a Reviewed-on: https://gerrit.libreoffice.org/54806 Reviewed-by: Henry Castro <hcas...@collabora.com> Tested-by: Henry Castro <hcas...@collabora.com> diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index bd5fc2a0a..78bccc835 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -68,8 +68,7 @@ LOLEAFLET_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 \ - $(builddir)/node_modules/jquery-ui/themes/ui-lightness/jquery-ui.css \ - $(builddir)/node_modules/evol-colorpicker/css/evol-colorpicker.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)))) @@ -81,7 +80,6 @@ NODE_MODULES_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/evol-colorpicker/js/evol-colorpicker.js \ node_modules/smartmenus/dist/jquery.smartmenus.js \ node_modules/timeago/jquery.timeago.js \ node_modules/autolinker/dist/Autolinker.js \ @@ -251,7 +249,6 @@ install-data-hook: pot: xgettext --from-code=UTF-8 --keyword=_ --output=po/templates/loleaflet-ui.pot \ admin.strings.js \ - evol.colorpicker.strings.js \ src/errormessages.js \ js/toolbar.js \ src/admin/AdminSocketAnalytics.js \ diff --git a/loleaflet/debug/document/loleaflet.html b/loleaflet/debug/document/loleaflet.html index 429da430e..8f9d5fd9d 100644 --- a/loleaflet/debug/document/loleaflet.html +++ b/loleaflet/debug/document/loleaflet.html @@ -26,7 +26,6 @@ <link rel="stylesheet" href="/loleaflet/%VERSION%/smartmenus/sm-core-css.css" /> <link rel="stylesheet" href="/loleaflet/%VERSION%/smartmenus/sm-simple.css" /> <link rel="stylesheet" href="/loleaflet/%VERSION%/jqueryui/1.11.1/themes/ui-lightness/jquery-ui.css"> -<link rel="stylesheet" href="/loleaflet/%VERSION%/toolbar/evol.colorpicker.min.css"> <link rel="localizations" href="/loleaflet/%VERSION%/l10n/localizations.json" type="application/vnd.oftn.l10n+json"/> <link rel="localizations" href="/loleaflet/%VERSION%/l10n/locore-localizations.json" type="application/vnd.oftn.l10n+json" /> <link rel="localizations" href="/loleaflet/%VERSION%/l10n/help-localizations.json" type="application/vnd.oftn.l10n+json"/> @@ -52,7 +51,6 @@ <script src="/loleaflet/%VERSION%/toolbar/w2ui.min.js"></script> <script src="/loleaflet/%VERSION%/toolbar/select2.min.js"></script> <script src="/loleaflet/%VERSION%/jqueryui/1.11.1/jquery-ui.min.js"></script> - <script src="/loleaflet/%VERSION%/toolbar/evol.colorpicker.min.js"></script> <script src="/loleaflet/%VERSION%/leaflet-src.js"></script> <script src="/loleaflet/%VERSION%/plugins/draw-0.2.4/dist/leaflet.draw.js"></script> <script src="/loleaflet/%VERSION%/scrollbar/jquery.mCustomScrollbar.js"></script> diff --git a/loleaflet/evol.colorpicker.strings.js b/loleaflet/evol.colorpicker.strings.js deleted file mode 100644 index 243259799..000000000 --- a/loleaflet/evol.colorpicker.strings.js +++ /dev/null @@ -1,7 +0,0 @@ -/* Strings for l10n from evol.colorpicker */ -var themeColors = _('Theme Colors'); -var standardColors = _('Standard Colors'); -var webColors = _('Web Colors'); -var backToPalette = _('Back to Palette'); -var history = _('History'); -var noHistory = _('No history yet.'); diff --git a/loleaflet/npm-shrinkwrap.json.in b/loleaflet/npm-shrinkwrap.json.in index c7c348cda..0cdbb868c 100644 --- a/loleaflet/npm-shrinkwrap.json.in +++ b/loleaflet/npm-shrinkwrap.json.in @@ -1169,16 +1169,6 @@ "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", "dev": true }, - "evol-colorpicker": { - "version": "3.2.6", - "resolved": "file:node_shrinkwrap/evol-colorpicker-3.2.6.tgz", - "integrity": "sha1-a4Nyx+jvjMVHiCNbl+n6JdZ1Kts=", - "dev": true, - "requires": { - "jquery": "2.2.4", - "jquery-ui": "1.10.5" - } - }, "evp_bytestokey": { "version": "1.0.3", "resolved": "file:node_shrinkwrap/evp_bytestokey-1.0.3.tgz", diff --git a/loleaflet/package.json b/loleaflet/package.json index 025978dd3..4fbb38854 100644 --- a/loleaflet/package.json +++ b/loleaflet/package.json @@ -9,7 +9,6 @@ "browserify-css": "0.9.1", "d3": "3.5.17", "eslint": "3.0.0", - "evol-colorpicker": "3.2.6", "exorcist": "0.4.0", "jake": "~8.0.10", "jquery": "2.2.4", _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits