mirror of https://github.com/BTCPrivate/copay.git
commit
d74afaa997
|
@ -1,6 +1,4 @@
|
|||
'use strict';
|
||||
|
||||
var localConfig = JSON.parse(localStorage.getItem('config'));
|
||||
var defaultConfig = {
|
||||
networkName: 'testnet',
|
||||
network: {
|
||||
|
@ -99,25 +97,9 @@ var defaultConfig = {
|
|||
port: 3001
|
||||
},
|
||||
passphrase: {
|
||||
iterations: 1000,
|
||||
iterations: 100,
|
||||
storageSalt: 'mjuBtGybi/4=',
|
||||
},
|
||||
themes: ['default'],
|
||||
verbose: 1,
|
||||
};
|
||||
|
||||
var config = defaultConfig;
|
||||
|
||||
// Merge localConfig
|
||||
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);
|
||||
}
|
||||
|
|
16
index.html
16
index.html
|
@ -27,8 +27,6 @@
|
|||
<a class="button radius small-icon" title="Manual Refresh"
|
||||
ng-disabled="$root.loading"
|
||||
ng-click="refresh()"><i class="fi-refresh"></i></a>
|
||||
<a class="button radius small-icon" title="Settings"
|
||||
ng-disabled="$root.loading" href="#settings"><i class="fi-widget"></i></a>
|
||||
<a class="button radius small-icon" title="Signout"
|
||||
ng-click="signout()"><i class="fi-power"></i></a>
|
||||
</div>
|
||||
|
@ -428,14 +426,18 @@
|
|||
<span ng-show="tx.finallyRejected" class="text-warning">
|
||||
Transaction finally rejected
|
||||
</span>
|
||||
<p class="small" ng-show="!tx.missingSignatures && tx.sentTs">
|
||||
<i class="fi-arrow-right size-40"></i>
|
||||
Sent at {{tx.sentTs | date:'medium'}} |
|
||||
Transaction ID:
|
||||
<div ng-show="!tx.missingSignatures && tx.sentTs">
|
||||
<span>
|
||||
Sent
|
||||
</span>
|
||||
<p class="text-gray small">
|
||||
{{tx.sentTs | date:'medium'}}.
|
||||
ID:
|
||||
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{tx.sentTxid}}" target="blank">
|
||||
{{tx.sentTxid}}
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
<p class="text-gray" ng-show="!tx.finallyRejected && tx.missingSignatures==1">
|
||||
One signature missing
|
||||
</p>
|
||||
|
@ -646,7 +648,7 @@
|
|||
<button type="submit" class="button primary radius right ng-binding" ng-disabled="setupForm.$invalid || loading" disabled="disabled" ng-click="save()">
|
||||
Save
|
||||
</button>
|
||||
<a class="button secondary radius" href="#signin" ng-hide="$root.wallet">Signin</a>
|
||||
<a class="button secondary radius" href="#signin" ng-hide="$root.wallet">Home</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
15
js/app.js
15
js/app.js
|
@ -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');
|
||||
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue