From 77f451f0867ece91519878a9c32fd74fed8cde07 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Fri, 21 Oct 2016 18:52:48 +0200
Subject: [PATCH] - features tour was not working if helptip was disabled
---
www/js/config.js | 17 +++++++++--------
www/js/controllers/app-controllers.js | 4 ++--
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/www/js/config.js b/www/js/config.js
index 10c36a9f4..9e52d3054 100644
--- a/www/js/config.js
+++ b/www/js/config.js
@@ -10,31 +10,32 @@ angular.module("cesium.config", [])
.constant("csConfig", {
"cacheTimeMs": 60000,
- "fallbackLanguage": "en",
- "rememberMe": false,
+ "fallbackLanguage": "fr-FR",
+ "defaultLanguage": "fr-FR",
+ "rememberMe": true,
"showUDHistory": false,
- "timeout": 4000,
+ "timeout": 6000,
"timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000,
"useLocalStorage": true,
"useRelative": true,
"initPhase": false,
"helptip": {
- "enable": true
+ "enable": false
},
"node": {
- "host": "test-net.duniter.fr",
- "port": "9201"
+ "host": "duniter.le-sou.org",
+ "port": "9600"
},
"plugins": {
"es": {
- "enable": true,
+ "enable": false,
"host": "data.duniter.fr",
"port": "80"
}
},
"version": "0.4.0",
- "build": "2016-10-21T15:18:23.187Z",
+ "build": "2016-10-21T15:54:09.573Z",
"newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug"
})
diff --git a/www/js/controllers/app-controllers.js b/www/js/controllers/app-controllers.js
index 98ca8369d..ea88094ed 100644
--- a/www/js/controllers/app-controllers.js
+++ b/www/js/controllers/app-controllers.js
@@ -142,9 +142,9 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
};
$scope.startHelpTour = function() {
- delete $rootScope.tour;
- var helptipScope = $scope.createHelptipScope();
$rootScope.tour = true; // to avoid other helptip to be launched (e.g. wallet)
+ var helptipScope = $scope.$new();
+ $controller('HelpTipCtrl', { '$scope': helptipScope});
return helptipScope.startHelpTour()
.then(function() {
helptipScope.$destroy();
--
GitLab