mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #1211 from maraoz/support/old-backups
Add copay version to saved settings
This commit is contained in:
commit
4a92342152
25
js/app.js
25
js/app.js
|
@ -1,16 +1,19 @@
|
|||
'use strict';
|
||||
|
||||
var copay = require('copay');
|
||||
var config = defaultConfig;
|
||||
var localConfig = JSON.parse(localStorage.getItem('config'));
|
||||
|
||||
if (localConfig) {
|
||||
var count = 0;
|
||||
for (name in localConfig) {
|
||||
if (localConfig.hasOwnProperty(name)) {
|
||||
if (name === 'networkName' && config['forceNetwork']) {
|
||||
continue;
|
||||
var cmv = copay.version.split('.')[1];
|
||||
var lmv = localConfig.version ? localConfig.version.split('.')[1] : '-1';
|
||||
if (cmv === lmv) {
|
||||
for (name in localConfig) {
|
||||
if (localConfig.hasOwnProperty(name)) {
|
||||
if (name === 'networkName' && config['forceNetwork']) {
|
||||
continue;
|
||||
}
|
||||
config[name] = localConfig[name];
|
||||
}
|
||||
config[name] = localConfig[name];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -19,8 +22,6 @@ var log = function() {
|
|||
if (config.verbose) console.log(arguments);
|
||||
}
|
||||
|
||||
// From the bundle
|
||||
var copay = require('copay');
|
||||
|
||||
var copayApp = window.copayApp = angular.module('copayApp', [
|
||||
'ngRoute',
|
||||
|
@ -35,9 +36,9 @@ var copayApp = window.copayApp = angular.module('copayApp', [
|
|||
]);
|
||||
|
||||
copayApp.config(function($sceDelegateProvider) {
|
||||
$sceDelegateProvider.resourceUrlWhitelist([
|
||||
'self',
|
||||
'mailto:**'
|
||||
$sceDelegateProvider.resourceUrlWhitelist([
|
||||
'self',
|
||||
'mailto:**'
|
||||
]);
|
||||
});
|
||||
|
||||
|
|
|
@ -8,10 +8,6 @@ angular.module('copayApp.controllers').controller('SettingsController', function
|
|||
$scope.insightHost = config.blockchain.host;
|
||||
$scope.insightPort = config.blockchain.port;
|
||||
$scope.insightSecure = config.blockchain.schema === 'https';
|
||||
$scope.networkKey = config.network.key;
|
||||
$scope.networkHost = config.network.host;
|
||||
$scope.networkPort = config.network.port;
|
||||
$scope.networkSecure = config.network.secure || false;
|
||||
$scope.disableVideo = typeof config.disableVideo === undefined ? true : config.disableVideo;
|
||||
$scope.forceNetwork = config.forceNetwork;
|
||||
|
||||
|
@ -72,6 +68,7 @@ angular.module('copayApp.controllers').controller('SettingsController', function
|
|||
disableVideo: $scope.disableVideo,
|
||||
unitName: $scope.selectedUnit.shortName,
|
||||
unitToSatoshi: $scope.selectedUnit.value,
|
||||
version: copay.version,
|
||||
}));
|
||||
|
||||
// Go home reloading the application
|
||||
|
|
|
@ -9,19 +9,6 @@ var extend = nodeUtil._extend;
|
|||
var io = require('socket.io-client');
|
||||
var preconditions = require('preconditions').singleton();
|
||||
|
||||
/*
|
||||
* Emits
|
||||
* 'connect'
|
||||
* when network layout has change (new/lost peers, etc)
|
||||
*
|
||||
* 'data'
|
||||
* when an unknown data type arrives
|
||||
*
|
||||
* Provides
|
||||
* send(toPeerIds, {data}, cb?)
|
||||
*
|
||||
*/
|
||||
|
||||
function Network(opts) {
|
||||
var self = this;
|
||||
opts = opts || {};
|
||||
|
|
Loading…
Reference in New Issue