Skip to content

Commit 77f451f

Browse files
committed
- features tour was not working if helptip was disabled
1 parent 912caf2 commit 77f451f

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

www/js/config.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,32 @@ angular.module("cesium.config", [])
1010

1111
.constant("csConfig", {
1212
"cacheTimeMs": 60000,
13-
"fallbackLanguage": "en",
14-
"rememberMe": false,
13+
"fallbackLanguage": "fr-FR",
14+
"defaultLanguage": "fr-FR",
15+
"rememberMe": true,
1516
"showUDHistory": false,
16-
"timeout": 4000,
17+
"timeout": 6000,
1718
"timeWarningExpireMembership": 5184000,
1819
"timeWarningExpire": 7776000,
1920
"useLocalStorage": true,
2021
"useRelative": true,
2122
"initPhase": false,
2223
"helptip": {
23-
"enable": true
24+
"enable": false
2425
},
2526
"node": {
26-
"host": "test-net.duniter.fr",
27-
"port": "9201"
27+
"host": "duniter.le-sou.org",
28+
"port": "9600"
2829
},
2930
"plugins": {
3031
"es": {
31-
"enable": true,
32+
"enable": false,
3233
"host": "data.duniter.fr",
3334
"port": "80"
3435
}
3536
},
3637
"version": "0.4.0",
37-
"build": "2016-10-21T15:18:23.187Z",
38+
"build": "2016-10-21T15:54:09.573Z",
3839
"newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug"
3940
})
4041

www/js/controllers/app-controllers.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
142142
};
143143

144144
$scope.startHelpTour = function() {
145-
delete $rootScope.tour;
146-
var helptipScope = $scope.createHelptipScope();
147145
$rootScope.tour = true; // to avoid other helptip to be launched (e.g. wallet)
146+
var helptipScope = $scope.$new();
147+
$controller('HelpTipCtrl', { '$scope': helptipScope});
148148
return helptipScope.startHelpTour()
149149
.then(function() {
150150
helptipScope.$destroy();

0 commit comments

Comments
 (0)