diff --git a/www/js/config.js b/www/js/config.js index 10c36a9f47bfa22dba8ce41bd3c2ffa33bf4ebe8..9e52d3054cb8f2876e47322b8cf51907d47fdf6b 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 98ca8369d31a745c97bf5e7c866806a3d39d3cfa..ea88094edcf6f53fe477ecf1d633bc7c0f76ab67 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();