mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-25 10:26:17 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-56596-master-fix' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
David Monllao 2016-11-09 14:35:41 +08:00
commit 4e2ae9caee
3 changed files with 15 additions and 11 deletions
admin/tool/usertours
amd
build
tour.min.js
src
tour.js
thirdpartylibs.xml

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

File diff suppressed because one or more lines are too long

22
admin/tool/usertours/amd/src/tour.js

@ -521,6 +521,10 @@ Tour.prototype.normalizeStepConfig = function (stepConfig) {
attachPoint: 'after'
}, stepConfig);
if (stepConfig.attachTo) {
stepConfig.attachTo = $(stepConfig.attachTo).first();
}
return stepConfig;
};
@ -739,10 +743,10 @@ Tour.prototype.addStepToPage = function (stepConfig) {
this.positionBackdrop(stepConfig);
if (stepConfig.attachPoint === 'append') {
$(stepConfig.attachTo).append(currentStepNode);
stepConfig.attachTo.append(currentStepNode);
this.currentStepNode = currentStepNode;
} else {
this.currentStepNode = currentStepNode.insertAfter($(stepConfig.attachTo));
this.currentStepNode = currentStepNode.insertAfter(stepConfig.attachTo);
}
// Ensure that the step node is positioned.
@ -762,7 +766,7 @@ Tour.prototype.addStepToPage = function (stepConfig) {
stepConfig.isOrphan = true;
// This will be appended to the body instead.
stepConfig.attachTo = 'body';
stepConfig.attachTo = $('body').first();
stepConfig.attachPoint = 'append';
// Add the backdrop.
@ -772,7 +776,7 @@ Tour.prototype.addStepToPage = function (stepConfig) {
currentStepNode.addClass('orphan');
// It lives in the body.
$(stepConfig.attachTo).append(currentStepNode);
stepConfig.attachTo.append(currentStepNode);
this.currentStepNode = currentStepNode;
this.currentStepNode.offset(this.calculateStepPositionInPage());
@ -1214,9 +1218,9 @@ Tour.prototype.positionBackdrop = function (stepConfig) {
if (stepConfig.zIndex) {
if (stepConfig.attachPoint === 'append') {
$(stepConfig.attachTo).append(backdrop);
stepConfig.attachTo.append(backdrop);
} else {
backdrop.insertAfter($(stepConfig.attachTo));
backdrop.insertAfter(stepConfig.attachTo);
}
} else {
$('body').append(backdrop);
@ -1277,10 +1281,10 @@ Tour.prototype.positionBackdrop = function (stepConfig) {
if (stepConfig.zIndex) {
if (stepConfig.attachPoint === 'append') {
$(stepConfig.attachTo).append(background);
stepConfig.attachTo.append(background);
} else {
fader.insertAfter($(stepConfig.attachTo));
background.insertAfter($(stepConfig.attachTo));
fader.insertAfter(stepConfig.attachTo);
background.insertAfter(stepConfig.attachTo);
}
} else {
$('body').append(fader);

2
admin/tool/usertours/thirdpartylibs.xml

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