sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-07-13 17:52:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: save tour state

Browse source 
Implimentation of #6545 by @tylerxo

fixes #5854
fixes #5852

closes #6545
This commit is contained in:
Blade Barringer 2016-09-08 20:23:49 -05:00
parent d1903578f9
commit 454ccffb03
2 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
website/client/js/services/guideServices.js
View file

@ -195,19 +195,28 @@ function($rootScope, User, $timeout, $state, Analytics) {
}
};
step.onHide = function(){
var ups={};
if (!$rootScope.stepAwarded) $rootScope.stepAwarded = {};
if (!$rootScope.stepAwarded[i]) {
$rootScope.stepAwarded[i] = true;
ups['stats.gp'] = User.user.stats.gp + (step.gold || 0);
ups['stats.exp'] = User.user.stats.exp + (step.experience || 0);
var ups = {};
var lastKnownStep = User.user.flags.tour[k];
// Return early if user has already completed this tutorial
if (lastKnownStep === -2) {
return;
}
if (i > lastKnownStep) {
if (step.gold) ups['stats.gp'] = User.user.stats.gp + step.gold;
if (step.experience) ups['stats.exp'] = User.user.stats.exp + step.experience;
ups['flags.tour.'+k] = i;
}
if (step.final) { // -2 indicates complete
ups['flags.tour.'+k] = -2;
$rootScope.stepAwarded = null;
Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'tutorial','eventLabel':k+'-web','eventValue':i+1,'complete':true})
}
User.set(ups);
// User.set() doesn't include a check for level changes, so manually check here.
if (step.experience) {
User.user.fns.updateStats(User.user.stats);
}
}
}).value();
});
@ -245,8 +254,6 @@ function($rootScope, User, $timeout, $state, Analytics) {
if (page === -1) page = 0;
var curr = User.user.flags.tour[chapter];
if (page != curr+1 && !force) return;
var updates = {};updates['flags.tour.'+chapter] = page;
User.set(updates);
var chap = tour[chapter], opts = chap._options;
opts.steps = [];
_.times(page, function(p){
@ -259,7 +266,12 @@ function($rootScope, User, $timeout, $state, Analytics) {
chap.goTo(end);
} else {
chap.setCurrentStep(end);
chap.start();
if (page > 0) {
chap.init();
chap.goTo(page);
} else {
chap.start();
}
}
}

2
website/views/shared/header/menu.jade
View file

@ -280,7 +280,7 @@ nav.toolbar(ng-controller='MenuCtrl')
ul.toolbar-bailey(ng-class='{inactive: !_expandedMenu.menu}')
li.toolbar-bailey-container(ng-if='user.flags.tour.intro!=-2')
.npc_justin_head.npc_bailey_head(popover='Continue Tour', popover-trigger='mouseenter', popover-placement='bottom', ng-click='Guide.goto("intro", user.flags.tour.intro, true)')
.npc_justin_head.npc_bailey_head(popover='Continue Tour', popover-trigger='mouseenter', popover-placement='bottom', ng-click='Guide.goto("intro", user.flags.tour.intro + 1, true)')
ul.toolbar-bailey(ng-class='{inactive: !_expandedMenu.menu}')
li.toolbar-bailey-container(ng-if='user.flags.newStuff')