BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add copay version to backup

This commit is contained in:
Manuel Araoz 2014-08-27 17:09:29 -03:00
parent dfa383b351
commit bff5585230
3 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/app.js
View File

@ -1,16 +1,17 @@
'use strict'; 'use strict';
var copay = require('copay');
var config = defaultConfig; var config = defaultConfig;
var localConfig = JSON.parse(localStorage.getItem('config')); var localConfig = JSON.parse(localStorage.getItem('config'));
if (localConfig) { if (localConfig) {
var count = 0; if (localConfig.version === copay.version) {
for (name in localConfig) { for (name in localConfig) {
if (localConfig.hasOwnProperty(name)) { if (localConfig.hasOwnProperty(name)) {
if (name === 'networkName' && config['forceNetwork']) { if (name === 'networkName' && config['forceNetwork']) {
continue; continue;
}
config[name] = localConfig[name];
} }
config[name] = localConfig[name];
} }
} }
} }
@ -19,8 +20,6 @@ var log = function() {
if (config.verbose) console.log(arguments); if (config.verbose) console.log(arguments);
} }
// From the bundle
var copay = require('copay');
var copayApp = window.copayApp = angular.module('copayApp', [ var copayApp = window.copayApp = angular.module('copayApp', [
'ngRoute', 'ngRoute',
@ -35,9 +34,9 @@ var copayApp = window.copayApp = angular.module('copayApp', [
]); ]);
copayApp.config(function($sceDelegateProvider) { copayApp.config(function($sceDelegateProvider) {
$sceDelegateProvider.resourceUrlWhitelist([ $sceDelegateProvider.resourceUrlWhitelist([
'self', 'self',
'mailto:**' 'mailto:**'
]); ]);
}); });

5
js/controllers/settings.js
View File

@ -8,10 +8,6 @@ angular.module('copayApp.controllers').controller('SettingsController', function
$scope.insightHost = config.blockchain.host; $scope.insightHost = config.blockchain.host;
$scope.insightPort = config.blockchain.port; $scope.insightPort = config.blockchain.port;
$scope.insightSecure = config.blockchain.schema === 'https'; $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.disableVideo = typeof config.disableVideo === undefined ? true : config.disableVideo;
$scope.forceNetwork = config.forceNetwork; $scope.forceNetwork = config.forceNetwork;
@ -72,6 +68,7 @@ angular.module('copayApp.controllers').controller('SettingsController', function
disableVideo: $scope.disableVideo, disableVideo: $scope.disableVideo,
unitName: $scope.selectedUnit.shortName, unitName: $scope.selectedUnit.shortName,
unitToSatoshi: $scope.selectedUnit.value, unitToSatoshi: $scope.selectedUnit.value,
version: copay.version,
})); }));
// Go home reloading the application // Go home reloading the application

13
js/models/network/Async.js
View File

@ -9,19 +9,6 @@ var extend = nodeUtil._extend;
var io = require('socket.io-client'); var io = require('socket.io-client');
var preconditions = require('preconditions').singleton(); 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) { function Network(opts) {
var self = this; var self = this;
opts = opts || {}; opts = opts || {};