diff --git a/app/config.json b/app/config.json index 00661b000dcc72d07c7e9ddbd4517e49e22e32b5..2b2283cf7fc234d728e2ea7271ea92a774231a50 100644 --- a/app/config.json +++ b/app/config.json @@ -19,7 +19,7 @@ "helptip": { "enable": true, "installDocUrl": { - "fr-FR": "https://duniter.org/fr/miner-des-blocs/installer/", + "fr-FR": "https://duniter.fr/wiki/doc/installer/", "en": "https://duniter.org/en/wiki/duniter/install/" } }, @@ -27,7 +27,9 @@ "en": "license/license_g1-en", "fr-FR": "license/license_g1-fr-FR", "es-ES": "license/license_g1-es-ES", - "eo-EO": "license/license_g1-eo-EO" + "eo-EO": "license/license_g1-eo-EO", + "it-IT": "license/license_g1-it-IT", + "pt-PT": "license/license_g1-pt-PT" }, "feed": { "jsonFeed": { @@ -117,15 +119,17 @@ "helptip": { "enable": true, "installDocUrl": { - "fr-FR": "https://duniter.org/fr/miner-des-blocs/installer/", + "fr-FR": "https://duniter.fr/wiki/doc/installer/", "en": "https://duniter.org/en/wiki/duniter/install/" } }, "license": { - "fr-FR": "license/license_g1-fr-FR", "en": "license/license_g1-en", + "fr-FR": "license/license_g1-fr-FR", "es-ES": "license/license_g1-es-ES", - "eo-EO": "license/license_g1-eo-EO" + "eo-EO": "license/license_g1-eo-EO", + "it-IT": "license/license_g1-it-IT", + "pt-PT": "license/license_g1-pt-PT" }, "feed": { "jsonFeed": { @@ -221,7 +225,7 @@ "helptip": { "enable": false, "installDocUrl": { - "fr-FR": "https://duniter.org/fr/miner-des-blocs/installer/", + "fr-FR": "https://duniter.fr/wiki/doc/installer/", "en": "https://duniter.org/en/wiki/duniter/install/" } }, @@ -279,15 +283,17 @@ "helptip": { "enable": false, "installDocUrl": { - "fr-FR": "https://duniter.org/fr/wiki/duniter/installer/", + "fr-FR": "https://duniter.fr/wiki/doc/installer/", "en": "https://duniter.org/en/wiki/duniter/install/" } }, "license": { - "fr-FR": "license/license_g1-fr-FR", "en": "license/license_g1-en", + "fr-FR": "license/license_g1-fr-FR", "es-ES": "license/license_g1-es-ES", - "eo-EO": "license/license_g1-eo-EO" + "eo-EO": "license/license_g1-eo-EO", + "it-IT": "license/license_g1-it-IT", + "pt-PT": "license/license_g1-pt-PT" }, "node": { "host": "g1.e-is.pro", @@ -300,6 +306,10 @@ { "host": "g1.e-is.pro", "port": 443 + }, + { + "host": "g1.librelois.fr", + "port": 443 } ], "plugins":{ @@ -354,13 +364,18 @@ "httpsMode": false, "helptip": { "enable": false, - "installDocUrl": "https://github.com/duniter/duniter/blob/master/doc/install-a-node.md" + "installDocUrl": { + "fr-FR": "https://duniter.fr/wiki/doc/installer/", + "en": "https://duniter.org/en/wiki/duniter/install/" + } }, "license": { - "fr-FR": "license/license_g1-fr-FR.txt", - "en": "license/license_g1-en.txt", + "en": "license/license_g1-en", + "fr-FR": "license/license_g1-fr-FR", "es-ES": "license/license_g1-es-ES", - "eo-EO": "license/license_g1-eo-EO" + "eo-EO": "license/license_g1-eo-EO", + "it-IT": "license/license_g1-it-IT", + "pt-PT": "license/license_g1-pt-PT" }, "node": { "host": "g1.duniter.org", diff --git a/www/js/controllers/network-controllers.js b/www/js/controllers/network-controllers.js index 099bd3b7ef89c1f93ea3fbf2ceb2e87b51ff36a8..a3ab788f6f10081780eac21e3dd1ee119b4f0e1f 100644 --- a/www/js/controllers/network-controllers.js +++ b/www/js/controllers/network-controllers.js @@ -161,34 +161,14 @@ function NetworkLookupController($scope, $state, $location, $ionicPopover, $win // Start network scan csNetwork.start($scope.node, $scope.computeOptions()) - .then(function(){ - if (!$scope.refreshing) { - $scope.refreshing = true; - csWot.extendAll(csNetwork.data.peers) - .then(function() { - // Avoid to refresh if view has been leaving - if ($scope.networkStarted) { - $scope.updateView(csNetwork.data); - } - $scope.refreshing = false; - }); - } + .then(function() { + $scope.refresh(); }); // Catch event on new peers $scope.listeners.push( - csNetwork.api.data.on.changed($scope, function(data){ - if (!$scope.refreshing) { - $scope.refreshing = true; - csWot.extendAll(data.peers) - .then(function() { - // Avoid to refresh if view has been leaving - if ($scope.networkStarted) { - $scope.updateView(data); - } - $scope.refreshing = false; - }); - } + csNetwork.api.data.on.changed($scope, function(data) { + $scope.refresh(data); })); } @@ -196,6 +176,30 @@ function NetworkLookupController($scope, $state, $location, $ionicPopover, $win $scope.showHelpTip(); }; + $scope.refresh = function(data) { + data = csNetwork.data || data; + if (!data || $scope.refreshing /*|| !$scope.networkStarted*/) return; // Skip if no data, or already refreshing + + // Mark as refreshing + $scope.refreshing = true; + + // Add name+avatar to peers + csWot.extendAll(data.peers) + .then(function() { + // Avoid to refresh if view has been leaving + if ($scope.networkStarted) { + $scope.updateView(data); + } + }) + .catch(function(err) { + console.error(err); + // Continue + }) + .then(function() { + $scope.refreshing = false; + }); + } + $scope.updateView = function(data) { console.debug("[peers] Updating UI"); $scope.$broadcast('$$rebind::rebind'); // force data binding