Skip to content
Snippets Groups Projects
Commit e396fd45 authored by Rajmund Hruška's avatar Rajmund Hruška
Browse files

Remove Tippy.js and Popper.js (Redmine issue: #7632)

parent 2dccd754
No related branches found
No related tags found
No related merge requests found
...@@ -59,9 +59,9 @@ module.exports = function(grunt) { ...@@ -59,9 +59,9 @@ module.exports = function(grunt) {
{ {
expand: true, expand: true,
flatten: true, flatten: true,
cwd: 'node_modules/popper.js/dist/umd/', cwd: 'node_modules/@popperjs/core/dist/umd/',
src: './*', src: './*',
dest: '<%= project_paths.web_static_dir %>vendor/popper.js/js/' dest: '<%= project_paths.web_static_dir %>vendor/popperjs/js/'
}, },
// ----- Bootstrap // ----- Bootstrap
{ {
......
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
<!-- Moment.js --> <!-- Moment.js -->
<script src="{{ url_for('static', filename='vendor/moment/js/moment-with-locales.min.js') }}"></script> <script src="{{ url_for('static', filename='vendor/moment/js/moment-with-locales.min.js') }}"></script>
<!-- Popper.js --> <!-- @popperjs/core -->
<script src="{{ url_for('static', filename='vendor/popper.js/js/popper.min.js') }}"></script> <script src="{{ url_for('static', filename='vendor/popperjs/js/popper.min.js') }}"></script>
<!-- jQuery --> <!-- jQuery -->
<script src="{{ url_for('static', filename='vendor/jquery/js/jquery.min.js') }}"></script> <script src="{{ url_for('static', filename='vendor/jquery/js/jquery.min.js') }}"></script>
......
...@@ -136,31 +136,31 @@ $(function() { ...@@ -136,31 +136,31 @@ $(function() {
$('body').popover({ $('body').popover({
selector: "[data-toggle=popover]", selector: "[data-toggle=popover]",
}); });
// Custom popovers implemented using Popper.js library. The Bootstrap variant // Custom popovers implemented using @popperjs/core library. The Bootstrap variant
// does not support some advanced features. // does not support some advanced features.
$('.popover-hover-container').on("mouseenter", ".popover-hover", function() { $('.popover-hover-container').on("mouseenter", ".popover-hover", function() {
var ref = $(this); var ref = $(this);
var popup = $($(this).attr("data-popover-content")); var popup = $($(this).attr("data-popover-content"));
popup.toggleClass("hidden static-popover"); popup.toggleClass("hidden static-popover");
var popper = new Popper(ref, popup, { var popper = Popper.createPopper(ref[0], popup[0], {
placement: 'top', placement: 'top',
onCreate: function(data) { onCreate: function(data) {
popup.find('.popover').removeClass('top'); popup.find('.popover').removeClass('top');
popup.find('.popover').removeClass('bottom'); popup.find('.popover').removeClass('bottom');
popup.find('.popover').addClass(data.placement); popup.find('.popover').addClass(data.placement);
popper.scheduleUpdate(); popper.update();
}, },
onUpdate: function(data) { onUpdate: function(data) {
popup.find('.popover').removeClass('top'); popup.find('.popover').removeClass('top');
popup.find('.popover').removeClass('bottom'); popup.find('.popover').removeClass('bottom');
popup.find('.popover').addClass(data.placement); popup.find('.popover').addClass(data.placement);
popper.scheduleUpdate(); popper.update();
}, },
modifiers: { modifiers: {
flip: { flip: {
behavior: ['top','bottom'] behavior: ['top','bottom']
}
} }
}
}); });
ref.data('popper-instance', popper); ref.data('popper-instance', popper);
}); });
...@@ -169,8 +169,10 @@ $(function() { ...@@ -169,8 +169,10 @@ $(function() {
var popup = $($(this).attr("data-popover-content")); var popup = $($(this).attr("data-popover-content"));
popup.toggleClass("hidden static-popover"); popup.toggleClass("hidden static-popover");
var popper = ref.data('popper-instance'); var popper = ref.data('popper-instance');
popper.destroy(); if (popper) {
ref.data('popper-instance', null); popper.destroy();
ref.data('popper-instance', null);
}
}); });
// Callback for triggering re-render of NVD3 charts within the bootstrap tabs. // Callback for triggering re-render of NVD3 charts within the bootstrap tabs.
......
...@@ -43,8 +43,6 @@ ...@@ -43,8 +43,6 @@
"jquery": "^3.6.4", "jquery": "^3.6.4",
"moment": "^2.29.4", "moment": "^2.29.4",
"moment-timezone": "^0.5.43", "moment-timezone": "^0.5.43",
"nvd3": "^1.8.6", "nvd3": "^1.8.6"
"popper.js": "^1.15.0",
"tippy.js": "^6.3.7"
} }
} }
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz#1ee0c174e472c84b23cb46c995154dc383e3b4fe" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz#1ee0c174e472c84b23cb46c995154dc383e3b4fe"
integrity sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ== integrity sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ==
"@popperjs/core@^2.11.7", "@popperjs/core@^2.9.0": "@popperjs/core@^2.11.7":
version "2.11.7" version "2.11.7"
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.7.tgz#ccab5c8f7dc557a52ca3288c10075c9ccd37fff7" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.7.tgz#ccab5c8f7dc557a52ca3288c10075c9ccd37fff7"
integrity sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw== integrity sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw==
...@@ -2719,11 +2719,6 @@ plur@^1.0.0: ...@@ -2719,11 +2719,6 @@ plur@^1.0.0:
resolved "https://registry.yarnpkg.com/plur/-/plur-1.0.0.tgz#db85c6814f5e5e5a3b49efc28d604fec62975156" resolved "https://registry.yarnpkg.com/plur/-/plur-1.0.0.tgz#db85c6814f5e5e5a3b49efc28d604fec62975156"
integrity sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY= integrity sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY=
popper.js@^1.15.0:
version "1.16.1"
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
pretty-ms@^2.1.0: pretty-ms@^2.1.0:
version "2.1.0" version "2.1.0"
resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-2.1.0.tgz#4257c256df3fb0b451d6affaab021884126981dc" resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-2.1.0.tgz#4257c256df3fb0b451d6affaab021884126981dc"
...@@ -3432,13 +3427,6 @@ time-zone@^0.1.0: ...@@ -3432,13 +3427,6 @@ time-zone@^0.1.0:
resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-0.1.0.tgz#4a7728b6ac28db0e008f514043fd555bd5573b46" resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-0.1.0.tgz#4a7728b6ac28db0e008f514043fd555bd5573b46"
integrity sha1-Sncotqwo2w4Aj1FAQ/1VW9VXO0Y= integrity sha1-Sncotqwo2w4Aj1FAQ/1VW9VXO0Y=
tippy.js@^6.3.7:
version "6.3.7"
resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz#8ccfb651d642010ed9a32ff29b0e9e19c5b8c61c"
integrity sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==
dependencies:
"@popperjs/core" "^2.9.0"
to-regex-range@^5.0.1: to-regex-range@^5.0.1:
version "5.0.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment