Skip to content

BUGFIX Load all tours on start already #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pixelbrackets wants to merge 1 commit into
base: master
Choose a base branch
from
Open

BUGFIX Load all tours on start already #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions Resources/Public/JavaScript/BootstrapTourController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ define(['jquery', 'TYPO3/CMS/Guide/BootstrapTourParser', 'TYPO3/CMS/Guide/Logger
}
});
};

return function() {
Logger.log("Start up guided tour");
// Bind button events
Expand Down Expand Up @@ -332,15 +332,12 @@ define(['jquery', 'TYPO3/CMS/Guide/BootstrapTourParser', 'TYPO3/CMS/Guide/Logger
}
// Get tours
top.TYPO3.Guide.TourData = result.tours;
// Init core tours
if(typeof(top.TYPO3.Guide.TourData['Tree']) !== 'undefined') {
top.TYPO3.Guide.loadTour('Tree', false);
}
if(typeof(top.TYPO3.Guide.TourData['Menu']) !== 'undefined') {
top.TYPO3.Guide.loadTour('Menu', false);
}
if(typeof(top.TYPO3.Guide.TourData['Topbar']) !== 'undefined') {
top.TYPO3.Guide.loadTour('Topbar', false);

// Bugfix: Always initialize *all* tours because of the
// required tour data may be missing upon startTour() execution
for (var key in top.TYPO3.Guide.TourData) {
top.TYPO3.Guide.loadTour(key);
Logger.log('Init tour on start already: ', key);
}
}
});
Expand All @@ -357,11 +354,9 @@ define(['jquery', 'TYPO3/CMS/Guide/BootstrapTourParser', 'TYPO3/CMS/Guide/Logger

// Restart a tour
else if(typeof top.TYPO3.Guide.restartTourName !== 'undefined' && top.TYPO3.Guide.restartTourName !== '') {
// First! End some tours
top.TYPO3.Guide.Tours.Menu.end();
top.TYPO3.Guide.Tours.Tree.end();
top.TYPO3.Guide.Tours.Topbar.end();
// Now grab the reminded tour.
// First end some tours
top.TYPO3.Guide.end();
// Now grab the reminded tour
top.TYPO3.Guide.currentTourName = top.TYPO3.Guide.restartTourName;
top.TYPO3.Guide.restartTourName = '';
Logger.log('Restart: ', top.TYPO3.Guide.currentTourName);
Expand Down