From 7bb5d89fadf726ba052d9fa10de3fd0c646efce9 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 7 Oct 2015 11:56:37 -0300 Subject: [PATCH 1/3] disables TREZOR --- public/views/create.html | 10 +++++----- public/views/import.html | 24 ++++++++---------------- public/views/join.html | 12 ++++++------ 3 files changed, 19 insertions(+), 27 deletions(-) diff --git a/public/views/create.html b/public/views/create.html index fb5ef4b47..b77b44332 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -107,11 +107,11 @@ Use Ledger hardware wallet - - + + + + + - - - + + + + + + + + diff --git a/public/views/join.html b/public/views/join.html index cc3999a04..096e0257d 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -81,12 +81,12 @@ Use Ledger hardware wallet - - - + + + + + + - - - - - - - +
+
+ + +
+
From 1e55e465ca1f3cfd530b6ee7e56a6f3a0890dff5 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 7 Oct 2015 12:17:13 -0300 Subject: [PATCH 3/3] refactor isCordova --- public/views/export.html | 6 +++--- public/views/import.html | 4 ++-- public/views/preferencesLogs.html | 2 +- src/js/controllers/export.js | 4 +--- src/js/controllers/import.js | 3 +-- src/js/controllers/index.js | 3 ++- src/js/controllers/preferencesBwsUrl.js | 4 +--- src/js/controllers/preferencesLogs.js | 3 +-- 8 files changed, 12 insertions(+), 17 deletions(-) diff --git a/public/views/export.html b/public/views/export.html index b399c4541..cb27ffff2 100644 --- a/public/views/export.html +++ b/public/views/export.html @@ -68,14 +68,14 @@ -
+

Export options

-
+
@@ -120,7 +120,7 @@ name="backupFile" ng-model="import.backupFile" ng-file-select>
-
+
diff --git a/public/views/preferencesLogs.html b/public/views/preferencesLogs.html index d579c9922..459c354f7 100644 --- a/public/views/preferencesLogs.html +++ b/public/views/preferencesLogs.html @@ -9,7 +9,7 @@
- diff --git a/src/js/controllers/export.js b/src/js/controllers/export.js index 3a125cc25..185ee2505 100644 --- a/src/js/controllers/export.js +++ b/src/js/controllers/export.js @@ -1,9 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('backupController', - function($rootScope, $scope, $timeout, backupService, profileService, isMobile, isCordova, notification, go, gettext, gettextCatalog) { - this.isSafari = isMobile.Safari(); - this.isCordova = isCordova; + function($rootScope, $scope, $timeout, backupService, profileService, isMobile, notification, go, gettext, gettextCatalog) { this.error = null; this.success = null; diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index 31242e8d4..81359e7ed 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -1,11 +1,10 @@ 'use strict'; angular.module('copayApp.controllers').controller('importController', - function($scope, $rootScope, $location, $timeout, $log, profileService, notification, go, isMobile, sjcl, gettext, lodash, ledger, trezor) { + function($scope, $rootScope, $location, $timeout, $log, profileService, notification, go, sjcl, gettext, lodash, ledger, trezor) { var self = this; - this.isSafari = isMobile.Safari(); var reader = new FileReader(); window.ignoreMobilePause = true; diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 245b5ba82..4f3019b1a 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1,9 +1,10 @@ 'use strict'; -angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettext, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, txFormatService, uxLanguage, $state, glideraService) { +angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettext, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, txFormatService, uxLanguage, $state, glideraService, isMobile) { var self = this; self.isCordova = isCordova; self.isChromeApp = isChromeApp; + self.isSafari = isMobile.Safari(); self.onGoingProcess = {}; self.limitHistory = 5; diff --git a/src/js/controllers/preferencesBwsUrl.js b/src/js/controllers/preferencesBwsUrl.js index c28f26033..2a6abe30b 100644 --- a/src/js/controllers/preferencesBwsUrl.js +++ b/src/js/controllers/preferencesBwsUrl.js @@ -1,9 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesBwsUrlController', - function($scope,$log, configService, isMobile, isCordova, go, applicationService ) { - this.isSafari = isMobile.Safari(); - this.isCordova = isCordova; + function($scope,$log, configService, go, applicationService ) { this.error = null; this.success = null; diff --git a/src/js/controllers/preferencesLogs.js b/src/js/controllers/preferencesLogs.js index 8444c3ae0..e933a112b 100644 --- a/src/js/controllers/preferencesLogs.js +++ b/src/js/controllers/preferencesLogs.js @@ -1,9 +1,8 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesLogs', -function(historicLog, isCordova) { +function(historicLog) { this.logs = historicLog.get(); - this.isCordova = isCordova; this.sendLogs = function() { var body = 'Copay Session Logs\n Be careful, this could contain sensitive private data\n\n';