diff --git a/Gruntfile.js b/Gruntfile.js index 52c0f1338..347f7809c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -117,7 +117,6 @@ module.exports = function(grunt) { angular: { src: [ 'bower_components/qrcode-generator/js/qrcode.js', - 'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js', 'bower_components/moment/min/moment-with-locales.js', 'bower_components/angular-moment/angular-moment.js', 'bower_components/ng-lodash/build/ng-lodash.js', diff --git a/src/js/controllers/modals/scanner.js b/src/js/controllers/modals/scanner.js deleted file mode 100644 index 6616d505a..000000000 --- a/src/js/controllers/modals/scanner.js +++ /dev/null @@ -1,131 +0,0 @@ -'use strict'; - -angular.module('copayApp.controllers').controller('scannerController', function($scope, $timeout, storageService, $ionicModal, platformInfo) { - - // 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() { - if (platformInfo.isCordova) scannerInit(); - else checkTips(); - }; - - function checkTips() { - //TODO addapt tips to the new QR plugin (mobile) - storageService.getScanTipsAccepted(function(err, accepted) { - if (err) $log.warn(err); - if (accepted) { - scannerInit(); - return; - } - - $timeout(function() { - $ionicModal.fromTemplateUrl('views/modals/scan-tips.html', { - scope: $scope - }).then(function(modal) { - $scope.scanTipsModal = modal; - $scope.scanTipsModal.show(); - }); - }, 1000); - }); - }; - - $scope.$on('TipsModalClosed', function(event) { - scannerInit(); - }); - - function scannerInit() { - 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/www/views/modals/scanner.html b/www/views/modals/scanner.html deleted file mode 100644 index 1a92705c6..000000000 --- a/www/views/modals/scanner.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -

QR-Scanner

-
- - - - -