mirror of
https://github.com/moodle/moodle.git
synced 2025-08-08 10:26:40 +02:00
MDL-62287 tool_usertours: Pull v0.12.3 for background click fix
This commit is contained in:
parent
4ead20ffea
commit
971d02f6f4
4 changed files with 26 additions and 14 deletions
2
admin/tool/usertours/amd/build/tour.min.js
vendored
2
admin/tool/usertours/amd/build/tour.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -640,18 +640,6 @@ Tour.prototype.processStepListeners = function (stepConfig) {
|
||||||
args: ['click', $.proxy(this.hide, this)]
|
args: ['click', $.proxy(this.hide, this)]
|
||||||
},
|
},
|
||||||
|
|
||||||
// Click out and hide tour without backdrop.
|
|
||||||
{
|
|
||||||
node: $('body'),
|
|
||||||
args: ['click', $.proxy(function (e) {
|
|
||||||
// Handle click in or click out tour content,
|
|
||||||
// if click out, hide tour.
|
|
||||||
if (!this.currentStepNode.is(e.target) && $(e.target).closest('[data-role="flexitour-step"]').length === 0) {
|
|
||||||
this.hide();
|
|
||||||
}
|
|
||||||
}, this)]
|
|
||||||
},
|
|
||||||
|
|
||||||
// Keypresses.
|
// Keypresses.
|
||||||
{
|
{
|
||||||
node: $('body'),
|
node: $('body'),
|
||||||
|
|
24
admin/tool/usertours/tests/behat/tour_navigation.feature
Normal file
24
admin/tool/usertours/tests/behat/tour_navigation.feature
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
@tool @tool_usertours
|
||||||
|
Feature: Steps can be navigated within a tour
|
||||||
|
In order to use a tour effectively
|
||||||
|
As a user
|
||||||
|
I can navigate its steps
|
||||||
|
|
||||||
|
@javascript
|
||||||
|
Scenario: Clicking on items in the page should not end the tour
|
||||||
|
Given I log in as "admin"
|
||||||
|
And I add a new user tour with:
|
||||||
|
| Name | Calendar tour |
|
||||||
|
| Description | Calendar tour |
|
||||||
|
| Apply to URL match | /my/% |
|
||||||
|
| Tour is enabled | 1 |
|
||||||
|
And I add steps to the "Calendar tour" tour:
|
||||||
|
| targettype | Block | Title | Content |
|
||||||
|
| Block | Calendar | Calendar events | This is the calendar block |
|
||||||
|
And I change window size to "large"
|
||||||
|
And I follow "Dashboard" in the user menu
|
||||||
|
And I wait until the page is ready
|
||||||
|
And I should see "This is the calendar block"
|
||||||
|
When I click on ".block_calendar_month .calendar-controls .next" "css_element"
|
||||||
|
And I wait until the page is ready
|
||||||
|
Then I should see "Calendar events"
|
|
@ -4,7 +4,7 @@
|
||||||
<location>amd/src/tour.js</location>
|
<location>amd/src/tour.js</location>
|
||||||
<name>Flexitour</name>
|
<name>Flexitour</name>
|
||||||
<license>GPLv3</license>
|
<license>GPLv3</license>
|
||||||
<version>0.12.2</version>
|
<version>0.12.3</version>
|
||||||
<licenseversion>3</licenseversion>
|
<licenseversion>3</licenseversion>
|
||||||
</library>
|
</library>
|
||||||
</libraries>
|
</libraries>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue