mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 16:40:07 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-60077-master-fix' of https://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Jake Dallimore 2018-02-01 14:55:50 +08:00
commit 91f841d00f
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/tool/usertours/amd/build/tour.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
admin/tool/usertours/amd/src/tour.js
View File

@ -1274,13 +1274,14 @@ Tour.prototype.positionStep = function (stepConfig) {
var placement = data.placement.split('-')[0];
var isVertical = ['left', 'right'].indexOf(placement) !== -1;
var arrowElement = data.instance.popper.querySelector('[data-role="arrow"]');
var stepElement = $(data.instance.popper.querySelector('[data-role="flexitour-step"]'));
if (isVertical) {
var arrowHeight = parseFloat(window.getComputedStyle(arrowElement).height);
var arrowOffset = parseFloat(window.getComputedStyle(arrowElement).top);
var popperHeight = parseFloat(window.getComputedStyle(data.instance.popper).height);
var popperOffset = parseFloat(window.getComputedStyle(data.instance.popper).top);
var popperBorderWidth = parseFloat($('.modal-content').css('borderTopWidth'));
var popperBorderRadiusWidth = parseFloat($('.modal-content').css('borderTopLeftRadius'));
var popperBorderWidth = parseFloat(stepElement.css('borderTopWidth'));
var popperBorderRadiusWidth = parseFloat(stepElement.css('borderTopLeftRadius')) * 2;
var arrowPos = arrowOffset + arrowHeight / 2;
var maxPos = popperHeight + popperOffset - popperBorderWidth - popperBorderRadiusWidth;
var minPos = popperOffset + popperBorderWidth + popperBorderRadiusWidth;
@ -1298,8 +1299,8 @@ Tour.prototype.positionStep = function (stepConfig) {
var _arrowOffset = parseFloat(window.getComputedStyle(arrowElement).left);
var popperWidth = parseFloat(window.getComputedStyle(data.instance.popper).width);
var _popperOffset = parseFloat(window.getComputedStyle(data.instance.popper).left);
var _popperBorderWidth = parseFloat($('.modal-content').css('borderTopWidth'));
var _popperBorderRadiusWidth = parseFloat($('.modal-content').css('borderTopLeftRadius'));
var _popperBorderWidth = parseFloat(stepElement.css('borderTopWidth'));
var _popperBorderRadiusWidth = parseFloat(stepElement.css('borderTopLeftRadius')) * 2;
var _arrowPos = _arrowOffset + arrowWidth / 2;
var _maxPos = popperWidth + _popperOffset - _popperBorderWidth - _popperBorderRadiusWidth;
var _minPos = _popperOffset + _popperBorderWidth + _popperBorderRadiusWidth;

2
admin/tool/usertours/thirdpartylibs.xml
View File

@ -4,7 +4,7 @@
<location>amd/src/tour.js</location>
<name>Flexitour</name>
<license>GPLv3</license>
<version>0.12.1</version>
<version>0.12.2</version>
<licenseversion>3</licenseversion>
</library>
<library>