diff --git a/package.json b/package.json index 491e05ec606d12a9e956d809336692471b8bcd14..8cba068d2a13eacb3ad81174b064fa0a02a1f9df 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cesium", - "version": "0.1.0", + "version": "0.1.1", "description": "A webapp client for Duniter network", "dependencies": { "gulp": "^3.9.1", diff --git a/www/js/config.js b/www/js/config.js index c56c1be4d8bdd83e75b10cfcb2c9977033bbac73..d3dd63b5c171c45bf87022a1e328ff9f1de5fe63 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -14,8 +14,8 @@ angular.module("cesium.config", []) "TIMEOUT": 4000, "DEBUG": false, "NATIVE_TRANSITION": false, - "VERSION": "0.1.0", - "BUILD_DATE": "2016-05-26T20:53:57.821Z" + "VERSION": "0.1.1", + "BUILD_DATE": "2016-05-26T21:43:41.439Z" }) ; \ No newline at end of file diff --git a/www/js/controllers/settings-controllers.js b/www/js/controllers/settings-controllers.js index 986ecb6ade08fd769f405b3a78386d70fd4a1caa..221bc1e5812003dd139902ad742bd51ac8df2524 100644 --- a/www/js/controllers/settings-controllers.js +++ b/www/js/controllers/settings-controllers.js @@ -34,13 +34,16 @@ function SettingsController($scope, $state, UIUtils, Wallet, $translate, BMA, $q $scope.loading = true; $scope.$on('$ionicView.enter', function(e, $state) { + UIUtils.loading.show(); $scope.loading = true; // to avoid the call of Wallet.store() $scope.loadWallet() .then(function(walletData) { $scope.formData.useRelative = walletData.settings.useRelative; $scope.formData.node = walletData.settings.node; $scope.formData.useLocalStorage = walletData.settings.useLocalStorage; - $scope.formData.locale = _.findWhere($scope.locales, {id: walletData.settings.locale.id}); + if (walletData.settings.locale && walletData.settings.locale.id) { + $scope.formData.locale = _.findWhere($scope.locales, {id: walletData.settings.locale.id}); + } UIUtils.loading.hide(); $scope.loading = false; }) diff --git a/www/js/controllers/wallet-controllers.js b/www/js/controllers/wallet-controllers.js index 0038ba10cab36e9e473787a15610412206324b96..04a281fb130a47bcb32dbaefa49e1f8b6fd75f08 100644 --- a/www/js/controllers/wallet-controllers.js +++ b/www/js/controllers/wallet-controllers.js @@ -31,10 +31,8 @@ function WalletController($scope, $state, $q, $ionicPopup, $ionicActionSheet, $t $scope.loadWallet() .then(function(wallet) { $scope.updateWalletView(wallet); + $scope.showFab('fab-transfer'); UIUtils.loading.hide(); - $timeout(function () { - document.getElementById('fab-transfer').classList.toggle('on', true); - }, 900); }); }); diff --git a/www/js/controllers/wot-controllers.js b/www/js/controllers/wot-controllers.js index 807687ccd258803420be414c5e460c933c5b672d..2cd011df70fbc3cc8fafc788d45d9d069306325b 100644 --- a/www/js/controllers/wot-controllers.js +++ b/www/js/controllers/wot-controllers.js @@ -123,10 +123,8 @@ function WotIdentityViewController($scope, $state, BMA, Wallet, UIUtils, $q, $ti }); $scope.loadIdentity = function(pub) { - //UIUtils.loading.show(); var onLoadFinish = function() { $scope.loaded = true; - //UIUtils.loading.hide(); $timeout(function() { UIUtils.motion.fadeSlideInRight({ diff --git a/www/js/services/wallet-services.js b/www/js/services/wallet-services.js index 9de6a2c2b9db6d29703bdf056a353b51008dee08..f312494538c6259570ff7da5c48201a256664170 100644 --- a/www/js/services/wallet-services.js +++ b/www/js/services/wallet-services.js @@ -12,7 +12,8 @@ angular.module('cesium.wallet.services', ['ngResource', 'cesium.bma.services', ' useRelative: true, timeWarningExpire: 129600 /*TODO: =1.5j est-ce suffisant ?*/, useLocalStorage: false, - node: BMA.node.url + node: BMA.node.url, + locale: {id: $translate.use()} }, data = { @@ -39,7 +40,7 @@ angular.module('cesium.wallet.services', ['ngResource', 'cesium.bma.services', ' settings: { useRelative: defaultSettings.useRelative, timeWarningExpire: defaultSettings.timeWarningExpire, - locale: {id: $translate.use()}, + locale: defaultSettings.locale, useLocalStorage: defaultSettings.useLocalStorage, node: defaultSettings.node } @@ -190,7 +191,7 @@ angular.module('cesium.wallet.services', ['ngResource', 'cesium.bma.services', ' } }, - restore = function() { + restore = function(enableLoadData) { return $q(function(resolve, reject){ var settings = localStorage.getObject('CESIUM_SETTINGS'); var dataStr = localStorage.get('CESIUM_DATA'); @@ -212,6 +213,16 @@ angular.module('cesium.wallet.services', ['ngResource', 'cesium.bma.services', ' if (storedData && storedData.keypair && storedData.pubkey) { data.keypair = storedData.keypair; data.pubkey = storedData.pubkey; + data.loaded = false; + if (enableLoadData) { + loadData() + .then(function() { + resolve(); + }) + .catch(function(err) { + reject(err); + }); + } } resolve(); }) @@ -365,6 +376,60 @@ angular.module('cesium.wallet.services', ['ngResource', 'cesium.bma.services', ' }); }, + loadParameters = function() { + return $q(function(resolve, reject) { + BMA.currency.parameters() + .then(function(json){ + data.currency = json.currency; + data.parameters = json; + resolve(); + }) + .catch(function(err) { + data.currency = null; + data.parameters = null; + reject(err); + }); + }); + }, + + loadUDs = function() { + return $q(function(resolve, reject) { + BMA.blockchain.stats.ud() + .then(function(res){ + if (res.result.blocks.length) { + var lastBlockWithUD = res.result.blocks[res.result.blocks.length - 1]; + return BMA.blockchain.block({ block: lastBlockWithUD }) + .then(function(block){ + data.currentUD = block.dividend; + resolve(); + }) + .catch(function(err) { + data.currentUD = null; + reject(err); + }); + } + }) + .catch(function(err) { + data.currentUD = null; + reject(err); + }); + }); + }, + + loadMembers = function() { + return $q(function(resolve, reject) { + BMA.wot.members() + .then(function(json){ + data.members = json.results; + resolve(); + }) + .catch(function(err) { + data.members = []; + reject(err); + }); + }); + }, + loadAvatar = function() { return $q(function(resolve, reject) { if (!Registry) { @@ -400,29 +465,13 @@ angular.module('cesium.wallet.services', ['ngResource', 'cesium.bma.services', ' $q.all([ // Get currency parameters - BMA.currency.parameters() - .then(function(json){ - data.currency = json.currency; - data.parameters = json; - }), + loadParameters(), - // Get the UD informations - BMA.blockchain.stats.ud() - .then(function(res){ - if (res.result.blocks.length) { - var lastBlockWithUD = res.result.blocks[res.result.blocks.length - 1]; - return BMA.blockchain.block({ block: lastBlockWithUD }) - .then(function(block){ - data.currentUD = block.dividend; - }); - } - }), + // Get UDs + loadUDs(), // Get members - BMA.wot.members() - .then(function(json){ - data.members = json.results; - }), + loadMembers(), // Get sources loadSources(false),