diff --git a/Gruntfile.js b/Gruntfile.js index 42d6384af..0bf495857 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -94,7 +94,6 @@ module.exports = function(grunt) { 'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js', 'bower_components/moment/min/moment-with-locales.js', 'bower_components/angular-ui-router/release/angular-ui-router.js', - 'bower_components/angular-foundation/mm-foundation-tpls.js', 'bower_components/angular-moment/angular-moment.js', 'bower_components/ng-lodash/build/ng-lodash.js', 'bower_components/angular-qrcode/angular-qrcode.js', diff --git a/bower.json b/bower.json index 15f45d9e6..871393726 100644 --- a/bower.json +++ b/bower.json @@ -8,7 +8,6 @@ ], "dependencies": { "angular-mocks": "1.4.10", - "angular-foundation": "0.8.0", "angular-gettext": "2.2.1", "angular-moment": "0.10.1", "angular-qrcode": "monospaced/angular-qrcode#~6.2.1", @@ -24,8 +23,6 @@ "ng-csv": "~0.3.6" }, "resolutions": { - "angular": "1.5.3", - "qrcode-generator": "0.1.0", - "angular-ui-router": "0.2.13" + "angular": "1.5.3" } } diff --git a/public/views/modals/scanner.html b/public/views/modals/scanner.html index f82a3e8a8..03752e79d 100644 --- a/public/views/modals/scanner.html +++ b/public/views/modals/scanner.html @@ -1,16 +1,14 @@ - -
- - -
+ + +
+ + Close + +
+

QR-Scanner

+ + + + + + diff --git a/public/views/modals/tx-status.html b/public/views/modals/tx-status.html index 47ef59a0c..c242238f5 100644 --- a/public/views/modals/tx-status.html +++ b/public/views/modals/tx-status.html @@ -1,46 +1,47 @@ - -
- -
- {{tx.amountStr}} + +
+ +
+ {{tx.amountStr}} +
+
+ Sent +
+
+ OKAY +
-
- Sent -
-
- OKAY -
-
-
- -
- Payment Proposal Created +
+ +
+ Payment Proposal Created +
+
+ OKAY +
-
- OKAY -
-
-
- -
- Payment Accepted +
+ +
+ Payment Accepted +
+
+ OKAY +
-
- OKAY -
-
-
- -
- Payment Rejected +
+ +
+ Payment Rejected +
+
+ OKAY +
-
- OKAY -
-
+ diff --git a/src/js/app.js b/src/js/app.js index 123642847..d0f6268cd 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -3,7 +3,6 @@ var modules = [ 'ui.router', 'angularMoment', - 'mm.foundation', 'monospaced.qrcode', 'gettext', 'ionic', @@ -25,4 +24,3 @@ angular.module('copayApp.services', []); angular.module('copayApp.controllers', []); angular.module('copayApp.directives', []); angular.module('copayApp.addons', []); - diff --git a/src/js/controllers/buyCoinbase.js b/src/js/controllers/buyCoinbase.js index da1d93533..612d97950 100644 --- a/src/js/controllers/buyCoinbase.js +++ b/src/js/controllers/buyCoinbase.js @@ -1,14 +1,14 @@ 'use strict'; angular.module('copayApp.controllers').controller('buyCoinbaseController', - function($scope, $modal, $log, $ionicModal, $timeout, lodash, profileService, coinbaseService, bwsError, addressService, ongoingProcess) { + function($scope, $log, $ionicModal, $timeout, lodash, profileService, coinbaseService, bwsError, addressService, ongoingProcess) { var self = this; this.init = function(testnet) { self.allWallets = profileService.getWallets(testnet ? 'testnet' : 'livenet'); var client = profileService.focusedClient; - if (client) { + if (client) { $timeout(function() { self.selectedWalletId = client.credentials.walletId; self.selectedWalletName = client.credentials.walletName; diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js index fdced865f..5e587d5a0 100644 --- a/src/js/controllers/buyGlidera.js +++ b/src/js/controllers/buyGlidera.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('buyGlideraController', - function($scope, $timeout, $modal, $ionicModal, profileService, addressService, glideraService, bwsError, lodash, ongoingProcess) { + function($scope, $timeout, $ionicModal, profileService, addressService, glideraService, bwsError, lodash, ongoingProcess) { var self = this; this.show2faCodeInput = null; @@ -12,7 +12,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController', self.allWallets = profileService.getWallets(testnet ? 'testnet' : 'livenet'); var client = profileService.focusedClient; - if (client) { + if (client) { $timeout(function() { self.selectedWalletId = client.credentials.walletId; self.selectedWalletName = client.credentials.walletName; diff --git a/src/js/controllers/coinbase.js b/src/js/controllers/coinbase.js index 9d68404b2..dc1c094c7 100644 --- a/src/js/controllers/coinbase.js +++ b/src/js/controllers/coinbase.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('coinbaseController', - function($rootScope, $scope, $timeout, $modal, $ionicModal, profileService, configService, storageService, coinbaseService, lodash, platformInfo, ongoingProcess) { + function($rootScope, $scope, $timeout, $ionicModal, profileService, configService, storageService, coinbaseService, lodash, platformInfo, ongoingProcess) { var isNW = platformInfo.isNW; diff --git a/src/js/controllers/copayers.js b/src/js/controllers/copayers.js index de9e40172..94f564a82 100644 --- a/src/js/controllers/copayers.js +++ b/src/js/controllers/copayers.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('copayersController', - function($scope, $rootScope, $timeout, $log, $modal, $ionicModal, profileService, go, notification, platformInfo, gettext, gettextCatalog) { + function($scope, $rootScope, $timeout, $log, $ionicModal, profileService, go, notification, platformInfo, gettext, gettextCatalog) { var self = this; var isCordova = platformInfo.isCordova; var isWP = platformInfo.isWP; diff --git a/src/js/controllers/glidera.js b/src/js/controllers/glidera.js index ee51ceed9..e21b20e57 100644 --- a/src/js/controllers/glidera.js +++ b/src/js/controllers/glidera.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('glideraController', - function($rootScope, $scope, $timeout, $modal, $ionicModal, profileService, configService, storageService, glideraService, lodash, ongoingProcess) { + function($rootScope, $scope, $timeout, $ionicModal, profileService, configService, storageService, glideraService, lodash, ongoingProcess) { this.getAuthenticateUrl = function() { return glideraService.getOauthCodeUrl(); diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index 839dd5c0b..99df9c84a 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('joinController', - function($scope, $rootScope, $timeout, go, notification, profileService, configService, storageService, applicationService, $modal, gettext, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess) { + function($scope, $rootScope, $timeout, go, notification, profileService, configService, storageService, applicationService, gettext, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess) { var isChromeApp = platformInfo.isChromeApp; var isDevel = platformInfo.isDevel; diff --git a/src/js/controllers/modals/scanner.js b/src/js/controllers/modals/scanner.js new file mode 100644 index 000000000..c1bccb708 --- /dev/null +++ b/src/js/controllers/modals/scanner.js @@ -0,0 +1,102 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('scannerController', function($scope, $timeout) { + + // QR code Scanner + var video; + var canvas; + var $video; + var context; + var localMediaStream; + var prevResult; + var scanTimer; + + var _scan = function(evt) { + if (localMediaStream) { + context.drawImage(video, 0, 0, 300, 225); + try { + qrcode.decode(); + } catch (e) { + //qrcodeError(e); + } + } + scanTimer = $timeout(_scan, 800); + }; + + var _scanStop = function() { + $timeout.cancel(scanTimer); + if (localMediaStream && localMediaStream.active) { + var localMediaStreamTrack = localMediaStream.getTracks(); + for (var i = 0; i < localMediaStreamTrack.length; i++) { + localMediaStreamTrack[i].stop(); + } + } else { + try { + localMediaStream.stop(); + } catch (e) { + // Older Chromium not support the STOP function + }; + } + localMediaStream = null; + video.src = ''; + }; + + qrcode.callback = function(data) { + if (prevResult != data) { + prevResult = data; + return; + } + _scanStop(); + $scope.cancel(); + $scope.onScan({ + data: data + }); + }; + + var _successCallback = function(stream) { + video.src = (window.URL && window.URL.createObjectURL(stream)) || stream; + localMediaStream = stream; + video.play(); + $timeout(_scan, 1000); + }; + + var _videoError = function(err) { + $scope.cancel(); + }; + + var setScanner = function() { + navigator.getUserMedia = navigator.getUserMedia || + navigator.webkitGetUserMedia || navigator.mozGetUserMedia || + navigator.msGetUserMedia; + window.URL = window.URL || window.webkitURL || + window.mozURL || window.msURL; + }; + + $scope.init = function() { + setScanner(); + $timeout(function() { + if ($scope.beforeScan) { + $scope.beforeScan(); + } + canvas = document.getElementById('qr-canvas'); + context = canvas.getContext('2d'); + + video = document.getElementById('qrcode-scanner-video'); + $video = angular.element(video); + canvas.width = 300; + canvas.height = 225; + context.clearRect(0, 0, 300, 225); + + navigator.getUserMedia({ + video: true + }, _successCallback, _videoError); + }, 500); + }; + + $scope.cancel = function() { + _scanStop(); + $scope.scannerModal.hide(); + $scope.scannerModal.remove(); + }; + +}); diff --git a/src/js/controllers/modals/txStatus.js b/src/js/controllers/modals/txStatus.js new file mode 100644 index 000000000..e9e3aa537 --- /dev/null +++ b/src/js/controllers/modals/txStatus.js @@ -0,0 +1,11 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout) { + + if ($scope.cb) $timeout($scope.cb, 100); + + $scope.cancel = function() { + $scope.txStatusModal.hide(); + }; + +}); diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index c33411338..42b49f5ce 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -223,7 +223,8 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi $scope.close = function(txp) { $scope.loading = null; if (txp) { - txStatus.notify(txp, function() { + var type = txStatus.notify(txp); + $scope.openStatusModal(type, txp, function() { $scope.$emit('Local/TxProposalAction', txp.status == 'broadcasted'); }); } else { @@ -234,6 +235,20 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi $scope.cancel(); }; + $scope.openStatusModal = function(type, txp, cb) { + $scope.type = type; + $scope.tx = txFormatService.processTx(txp); + $scope.cb = cb; + + $ionicModal.fromTemplateUrl('views/modals/tx-status.html', { + scope: $scope, + animation: 'slide-in-up' + }).then(function(modal) { + $scope.txStatusModal = modal; + $scope.txStatusModal.show(); + }); + }; + $scope.cancel = function() { $scope.txpDetailsModal.hide(); }; diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js index c5f244608..bf4c2a938 100644 --- a/src/js/controllers/paperWallet.js +++ b/src/js/controllers/paperWallet.js @@ -1,5 +1,6 @@ angular.module('copayApp.controllers').controller('paperWalletController', function($scope, $timeout, $log, configService, profileService, go, addressService, txStatus, bitcore, ongoingProcess) { + var fc = profileService.focusedClient; var rawTx; @@ -99,15 +100,29 @@ angular.module('copayApp.controllers').controller('paperWalletController', $scope.error = err.message || err.toString(); $log.error(err); } else { - txStatus.notify({ - status: 'broadcasted' - }, function() { + var type = txStatus.notify(txp); + $scope.openStatusModal(type, txp, function() { go.walletHome(); }); } - $scope.$apply(); }); }, 100); }; + + $scope.openStatusModal = function(type, txp, cb) { + $scope.type = type; + $scope.tx = txFormatService.processTx(txp); + $scope.color = fc.backgroundColor; + $scope.cb = cb; + + $ionicModal.fromTemplateUrl('views/modals/tx-status.html', { + scope: $scope, + animation: 'slide-in-up' + }).then(function(modal) { + $scope.txStatusModal = modal; + $scope.txStatusModal.show(); + }); + }; + }); diff --git a/src/js/controllers/preferencesCoinbase.js b/src/js/controllers/preferencesCoinbase.js index acaaa9336..6bca19de6 100644 --- a/src/js/controllers/preferencesCoinbase.js +++ b/src/js/controllers/preferencesCoinbase.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesCoinbaseController', - function($scope, $modal, $timeout, $ionicModal, applicationService, coinbaseService) { + function($scope, $timeout, $ionicModal, applicationService, coinbaseService) { this.revokeToken = function(testnet) { $scope.network = testnet ? 'testnet' : 'livenet'; diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js index 1e411a728..133789e76 100644 --- a/src/js/controllers/preferencesDelete.js +++ b/src/js/controllers/preferencesDelete.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesDeleteWalletController', - function($scope, $rootScope, $filter, $timeout, $modal, $log, $ionicModal, storageService, notification, profileService, platformInfo, go, gettext, gettextCatalog, applicationService, ongoingProcess) { + function($scope, $rootScope, $filter, $timeout, $log, $ionicModal, storageService, notification, profileService, platformInfo, go, gettext, gettextCatalog, applicationService, ongoingProcess) { var isCordova = platformInfo.isCordova; $scope.isCordova = isCordova; $scope.error = null; diff --git a/src/js/controllers/preferencesGlidera.js b/src/js/controllers/preferencesGlidera.js index 5b6f283b3..1428ca933 100644 --- a/src/js/controllers/preferencesGlidera.js +++ b/src/js/controllers/preferencesGlidera.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesGlideraController', - function($scope, $modal, $timeout, $ionicModal, profileService, applicationService, glideraService, storageService) { + function($scope, $timeout, $ionicModal, profileService, applicationService, glideraService, storageService) { this.getEmail = function(token) { var self = this; diff --git a/src/js/controllers/sellCoinbase.js b/src/js/controllers/sellCoinbase.js index e6247e665..455c939ed 100644 --- a/src/js/controllers/sellCoinbase.js +++ b/src/js/controllers/sellCoinbase.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('sellCoinbaseController', - function($rootScope, $scope, $modal, $log, $timeout, $ionicModal, lodash, profileService, coinbaseService, bwsError, configService, walletService, fingerprintService, ongoingProcess, go) { + function($rootScope, $scope, $log, $timeout, $ionicModal, lodash, profileService, coinbaseService, bwsError, configService, walletService, fingerprintService, ongoingProcess, go) { var self = this; var client; diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js index 795cd047c..59717ad4f 100644 --- a/src/js/controllers/sellGlidera.js +++ b/src/js/controllers/sellGlidera.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('sellGlideraController', - function($rootScope, $scope, $timeout, $ionicModal, $log, $modal, configService, profileService, addressService, feeService, glideraService, bwsError, lodash, walletService, fingerprintService, ongoingProcess, go) { + function($rootScope, $scope, $timeout, $ionicModal, $log, configService, profileService, addressService, feeService, glideraService, bwsError, lodash, walletService, fingerprintService, ongoingProcess, go) { var self = this; var config = configService.getSync(); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index fd5c6c2e3..bebb57b0f 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $interval, $timeout, $filter, $modal, $log, $ionicModal, notification, txStatus, profileService, lodash, configService, rateService, storageService, bitcore, gettext, gettextCatalog, platformInfo, addressService, ledger, bwsError, confirmDialog, txFormatService, addressbookService, go, feeService, walletService, fingerprintService, nodeWebkit, ongoingProcess) { +angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, notification, txStatus, profileService, lodash, configService, rateService, storageService, bitcore, gettext, gettextCatalog, platformInfo, addressService, ledger, bwsError, confirmDialog, txFormatService, addressbookService, go, feeService, walletService, fingerprintService, nodeWebkit, ongoingProcess) { var isCordova = platformInfo.isCordova; var isWP = platformInfo.isWP; @@ -464,7 +464,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi if (!client.canSign() && !client.isPrivKeyExternal()) { $log.info('No signing proposal: No private key'); self.resetForm(); - txStatus.notify(createdTxp, function() { + var type = txStatus.notify(createdTxp); + $scope.openStatusModal(type, createdTxp, function() { return $scope.$emit('Local/TxProposalAction'); }); } else { @@ -520,14 +521,16 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi } self.resetForm(); go.walletHome(); - txStatus.notify(broadcastedTxp, function() { + var type = txStatus.notify(broadcastedTxp); + $scope.openStatusModal(type, broadcastedTxp, function() { $scope.$emit('Local/TxProposalAction', broadcastedTxp.status == 'broadcasted'); }); }); } else { self.resetForm(); go.walletHome(); - txStatus.notify(signedTxp, function() { + var type = txStatus.notify(signedTxp); + $scope.openStatusModal(type, signedTxp, function() { $scope.$emit('Local/TxProposalAction'); }); } @@ -537,6 +540,22 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }); }; + $scope.openStatusModal = function(type, txp, cb) { + var fc = profileService.focusedClient; + $scope.type = type; + $scope.tx = txFormatService.processTx(txp); + $scope.color = fc.backgroundColor; + $scope.cb = cb; + + $ionicModal.fromTemplateUrl('views/modals/tx-status.html', { + scope: $scope, + animation: 'slide-in-up' + }).then(function(modal) { + $scope.txStatusModal = modal; + $scope.txStatusModal.show(); + }); + }; + $scope.openSearchModal = function() { var fc = profileService.focusedClient; $scope.color = fc.backgroundColor; diff --git a/src/js/directives/qrScanner.js b/src/js/directives/qrScanner.js index a43ca9b1c..f4fddbc19 100644 --- a/src/js/directives/qrScanner.js +++ b/src/js/directives/qrScanner.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.directives') - .directive('qrScanner', function($rootScope, $timeout, $modal, gettextCatalog, platformInfo) { + .directive('qrScanner', function($rootScope, $timeout, $ionicModal, gettextCatalog, platformInfo) { var isCordova = platformInfo.isCordova; var isWP = platformInfo.isWP; @@ -44,114 +44,13 @@ angular.module('copayApp.directives') }; $scope.modalOpenScanner = function() { - var parentScope = $scope; - var ModalInstanceCtrl = function($scope, $rootScope, $modalInstance) { - // QR code Scanner - var video; - var canvas; - var $video; - var context; - var localMediaStream; - var prevResult; - - var _scan = function(evt) { - if (localMediaStream) { - context.drawImage(video, 0, 0, 300, 225); - try { - qrcode.decode(); - } catch (e) { - //qrcodeError(e); - } - } - $timeout(_scan, 800); - }; - - var _scanStop = function() { - if (localMediaStream && localMediaStream.active) { - var localMediaStreamTrack = localMediaStream.getTracks(); - for (var i = 0; i < localMediaStreamTrack.length; i++) { - localMediaStreamTrack[i].stop(); - } - } else { - try { - localMediaStream.stop(); - } catch (e) { - // Older Chromium not support the STOP function - }; - } - localMediaStream = null; - video.src = ''; - }; - - qrcode.callback = function(data) { - if (prevResult != data) { - prevResult = data; - return; - } - _scanStop(); - $modalInstance.close(data); - }; - - var _successCallback = function(stream) { - video.src = (window.URL && window.URL.createObjectURL(stream)) || stream; - localMediaStream = stream; - video.play(); - $timeout(_scan, 1000); - }; - - var _videoError = function(err) { - $scope.cancel(); - }; - - var setScanner = function() { - navigator.getUserMedia = navigator.getUserMedia || - navigator.webkitGetUserMedia || navigator.mozGetUserMedia || - navigator.msGetUserMedia; - window.URL = window.URL || window.webkitURL || - window.mozURL || window.msURL; - }; - - $scope.init = function() { - setScanner(); - $timeout(function() { - if (parentScope.beforeScan) { - parentScope.beforeScan(); - } - canvas = document.getElementById('qr-canvas'); - context = canvas.getContext('2d'); - - - video = document.getElementById('qrcode-scanner-video'); - $video = angular.element(video); - canvas.width = 300; - canvas.height = 225; - context.clearRect(0, 0, 300, 225); - - navigator.getUserMedia({ - video: true - }, _successCallback, _videoError); - }, 500); - }; - - $scope.cancel = function() { - _scanStop(); - $modalInstance.dismiss('cancel'); - }; - }; - - var modalInstance = $modal.open({ - templateUrl: 'views/modals/scanner.html', - windowClass: 'full', - controller: ModalInstanceCtrl, - backdrop: 'static', - keyboard: false + $ionicModal.fromTemplateUrl('views/modals/scanner.html', { + scope: $scope, + animation: 'slide-in-up' + }).then(function(modal) { + $scope.scannerModal = modal; + $scope.scannerModal.show(); }); - modalInstance.result.then(function(data) { - parentScope.onScan({ - data: data - }); - }); - }; $scope.openScanner = function() { diff --git a/src/js/services/txStatus.js b/src/js/services/txStatus.js index af73da30a..c47cda810 100644 --- a/src/js/services/txStatus.js +++ b/src/js/services/txStatus.js @@ -1,10 +1,10 @@ 'use strict'; -angular.module('copayApp.services').factory('txStatus', function($modal, lodash, profileService, $timeout, txFormatService, platformInfo) { +angular.module('copayApp.services').factory('txStatus', function(lodash, profileService, $timeout, platformInfo) { var root = {}; var isCordova = platformInfo.isCordova; - root.notify = function(txp, cb) { + root.notify = function(txp) { var fc = profileService.focusedClient; var status = txp.status; var type; @@ -19,11 +19,11 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash, copayerId: fc.credentials.copayerId }); - if (!action) { + if (!action) { type = 'created'; } else if (action.type == 'accept') { // created and accepted at the same time? - if ( n == 1 && action.createdOn - txp.createdOn < INMEDIATE_SECS ) { + if (n == 1 && action.createdOn - txp.createdOn < INMEDIATE_SECS) { type = 'created'; } else { type = 'accepted'; @@ -34,41 +34,7 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash, throw new Error('Unknown type:' + type); } } - - openModal(type, txp, cb); - }; - - root._templateUrl = function(type, txp) { - return 'views/modals/tx-status.html'; - }; - - var openModal = function(type, txp, cb) { - var fc = profileService.focusedClient; - var ModalInstanceCtrl = function($scope, $modalInstance) { - $scope.type = type; - $scope.tx = txFormatService.processTx(txp); - $scope.color = fc.backgroundColor; - if (isCordova && StatusBar.isVisible) { - StatusBar.hide(); - } - $scope.cancel = function() { - $modalInstance.dismiss('cancel'); - }; - if (cb) $timeout(cb, 100); - }; - var modalInstance = $modal.open({ - templateUrl: root._templateUrl(type, txp), - windowClass: 'popup-tx-status full', - controller: ModalInstanceCtrl, - }); - - modalInstance.result.finally(function() { - if (isCordova && !StatusBar.isVisible) { - StatusBar.show(); - } - var m = angular.element(document.getElementsByClassName('reveal-modal')); - m.addClass('hideModal'); - }); + return type; }; return root; diff --git a/test/karma.conf.js b/test/karma.conf.js index e94449c8b..ad396bdd6 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -20,7 +20,6 @@ module.exports = function(config) { 'bower_components/moment/min/moment-with-locales.js', 'bower_components/ionic/release/js/ionic.bundle.min.js', 'bower_components/angular-ui-router/release/angular-ui-router.js', - 'bower_components/angular-foundation/mm-foundation-tpls.js', 'bower_components/angular-moment/angular-moment.js', 'bower_components/ng-lodash/build/ng-lodash.js', 'bower_components/angular-qrcode/angular-qrcode.js',