diff --git a/bower.json b/bower.json index bc0e1d2..717c192 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "angular-qr-scanner", - "version": "0.1.0", + "version": "0.1.1", "homepage": "https://github.com/sembrestels/angular-qr-scanner", "authors": [ "Sem " diff --git a/qr-scanner.js b/qr-scanner.js index 6f3a309..d27552c 100644 --- a/qr-scanner.js +++ b/qr-scanner.js @@ -1,8 +1,3 @@ -if (require){ - if (!angular) var angular = require('angular'); - if (!qrcode) var qrcode = require('jsqrcode'); -} - (function() { 'use strict'; @@ -15,13 +10,13 @@ angular.module('qrScanner', ["ng"]).directive('qrScanner', ['$interval', '$windo ngVideoError: '&ngVideoError' }, link: function(scope, element, attrs) { - + window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL; navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia; - + var height = attrs.height || 300; var width = attrs.width || 250; - + var video = $window.document.createElement('video'); video.setAttribute('width', width); video.setAttribute('height', height); @@ -30,13 +25,13 @@ angular.module('qrScanner', ["ng"]).directive('qrScanner', ['$interval', '$windo canvas.setAttribute('id', 'qr-canvas'); canvas.setAttribute('width', width); canvas.setAttribute('height', height); - canvas.setAttribute('style', 'display:none;'); - + canvas.setAttribute('style', 'display:none;'); + angular.element(element).append(video); angular.element(element).append(canvas); - var context = canvas.getContext('2d'); + var context = canvas.getContext('2d'); var stopScan; - + var scan = function() { if ($window.localMediaStream) { context.drawImage(video, 0, 0, 307,250); @@ -72,7 +67,14 @@ angular.module('qrScanner', ["ng"]).directive('qrScanner', ['$interval', '$windo element.bind('$destroy', function() { if ($window.localMediaStream) { - $window.localMediaStream.stop(); + if ($window.localMediaStream.stop) { + $window.localMediaStream.stop(); + } else if ($window.localMediaStream.getVideoTracks) { + var videoTracks = $window.localMediaStream.getVideoTracks(); + if (videoTracks && videoTracks.length > 0) { + videoTracks[0].stop(); + } + } } if (stopScan) { $interval.cancel(stopScan);