# HG changeset patch # User Alexandre Segura # Date 1488470341 -3600 # Node ID c4b700679964930ede38319607148119ce800de6 # Parent 49a7538085052cbe60c4ff5873d6656f48dd3739 Fix tooltip position when page is scrolled. diff -r 49a753808505 -r c4b700679964 src_js/iconolab-bundle/package.json --- a/src_js/iconolab-bundle/package.json Wed Mar 01 18:50:40 2017 +0100 +++ b/src_js/iconolab-bundle/package.json Thu Mar 02 16:59:01 2017 +0100 @@ -10,7 +10,7 @@ "standalone": "webpack-dev-server --content-base src_js/iconolab-bundle/" }, "dependencies": { - "bootstrap": "^3.3.6", + "bootstrap": "^3.3.7", "bootstrap-sass": "^3.3.7", "diff": "^3.0.0", "event-emitter": "^0.3.4", diff -r 49a753808505 -r c4b700679964 src_js/iconolab-bundle/src/components/editor/mixins/tooltip.js --- a/src_js/iconolab-bundle/src/components/editor/mixins/tooltip.js Wed Mar 01 18:50:40 2017 +0100 +++ b/src_js/iconolab-bundle/src/components/editor/mixins/tooltip.js Thu Mar 02 16:59:01 2017 +0100 @@ -7,7 +7,6 @@ trigger: 'manual', html: true, title: '', - viewport: '.cut-canvas', content: '', } @@ -37,9 +36,8 @@ var target = new Snap(this.getTooltipTarget()); var $el = $(target.node); - $el - .popover(popoverOptions) - .popover('show'); + + $el.popover(popoverOptions); this.$on('drag:start', function() { $el.popover('hide'); @@ -49,9 +47,16 @@ }); $el.on('shown.bs.popover', (e) => { - var $tip = $el.data('bs.popover').$tip; + var $tip = $el.data('bs.popover').tip(); $tip.find('input[name="title"]').focus(); + // Fixes tooltip positioning when page is scrolled + // See https://github.com/twbs/bootstrap/issues/21855 + if (document.body.scrollTop > 0) { + $tip.css('top', parseInt($tip.css('top'), 10) + document.body.scrollTop); + } }); + + $el.popover('show'); }, destroyTooltip: function() { var target = new Snap(this.getTooltipTarget());