taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #688 from taigaio/fix-joyride-in-error-pages 

fix joy-ride in error pages
stable
David Barragán Merino 2015-10-27 10:40:15 +01:00
parent a757618d97 b4b0334dbe
commit 00cddb6bb6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/modules/components/joy-ride/joy-ride.directive.coffee
View File

@ -2,6 +2,7 @@ taiga = @.taiga
JoyRideDirective = ($rootScope, currentUserService, joyRideService, $location) -> JoyRideDirective = ($rootScope, currentUserService, joyRideService, $location) ->
link = (scope, el, attrs, ctrl) -> link = (scope, el, attrs, ctrl) ->
unsuscribe = null
intro = introJs() intro = introJs()
#Todo: translate #Todo: translate
@ -30,19 +31,21 @@ JoyRideDirective = ($rootScope, currentUserService, joyRideService, $location) -
intro.start() intro.start()
$rootScope.$on '$routeChangeSuccess', (event, next) -> $rootScope.$on '$routeChangeSuccess', (event, next) ->
return if !next.joyride || if !next.joyride || !currentUserService.isAuthenticated()
!currentUserService.isAuthenticated() || intro.exit()
$location.path() == '/error' unsuscribe() if unsuscribe
return
intro.oncomplete () -> intro.oncomplete () ->
currentUserService.disableJoyRide(next.joyride) currentUserService.disableJoyRide(next.joyride)
if next.loader if next.loader
un = $rootScope.$on 'loader:end', () -> unsuscribe = $rootScope.$on 'loader:end', () ->
currentUserService.loadJoyRideConfig() currentUserService.loadJoyRideConfig()
.then (config) -> initJoyrRide(next, config) .then (config) -> initJoyrRide(next, config)
un() unsuscribe()
else else
currentUserService.loadJoyRideConfig() currentUserService.loadJoyRideConfig()
.then (config) -> initJoyrRide(next, config) .then (config) -> initJoyrRide(next, config)