Merge pull request #395 from matiu/feature/index2

better tx sent look
This commit is contained in:
Manuel Aráoz 2014-05-16 14:58:15 -03:00
commit d74afaa997
4 changed files with 27 additions and 28 deletions

View file

@ -1,5 +1,20 @@
'use strict';
var config = defaultConfig;
var localConfig = JSON.parse(localStorage.getItem('config'));
if (localConfig) {
var count = 0;
for (name in localConfig) {
if (localConfig.hasOwnProperty(name)) {
config[name] = localConfig[name];
}
}
}
var log = function() {
if (config.verbose) console.log(arguments);
}
var copay = require('copay');

View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copay.settings').controller('SettingsController',
function($scope, $rootScope, $window) {
function($scope, $rootScope, $window, $location) {
$scope.title = 'Settings';
$scope.networkName = config.networkName;
@ -31,6 +31,6 @@ angular.module('copay.settings').controller('SettingsController',
})
);
$window.location.reload();
$window.location.href= $window.location.origin + $window.location.pathname;
};
});