diff --git a/js/app.js b/js/app.js index 058dfbba6..774d3a316 100644 --- a/js/app.js +++ b/js/app.js @@ -1,16 +1,17 @@ '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; + if (localConfig.version === copay.version) { + for (name in localConfig) { + if (localConfig.hasOwnProperty(name)) { + if (name === 'networkName' && config['forceNetwork']) { + continue; + } + config[name] = localConfig[name]; } - config[name] = localConfig[name]; } } } @@ -19,8 +20,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 +34,9 @@ var copayApp = window.copayApp = angular.module('copayApp', [ ]); copayApp.config(function($sceDelegateProvider) { - $sceDelegateProvider.resourceUrlWhitelist([ - 'self', - 'mailto:**' + $sceDelegateProvider.resourceUrlWhitelist([ + 'self', + 'mailto:**' ]); }); diff --git a/js/controllers/settings.js b/js/controllers/settings.js index c8761aa17..49f716519 100644 --- a/js/controllers/settings.js +++ b/js/controllers/settings.js @@ -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 diff --git a/js/models/network/Async.js b/js/models/network/Async.js index e774d2eea..eb53a3c83 100644 --- a/js/models/network/Async.js +++ b/js/models/network/Async.js @@ -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 || {};