Skip to content

Adding jsqrcode to bower.json for wiredep to work correctly #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rllola wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Adding jsqrcode to bower.json for wiredep to work correctly #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5b070f
Adding jsqrcode to bower.json for wiredep to work correctly
rllola Jul 2, 2015
743128a
Remove if(require) because require is undefined
rllola Jul 2, 2015
bae8bd4
Fix chrome bug + Android chrome video
rllola Jan 12, 2016
7e3c1c1
Remove bower folder + update version
rllola Jan 12, 2016
8e3d6b9
Update version
rllola Jan 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ results

npm-debug.log
node_modules
bower_components
7 changes: 5 additions & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{
"name": "angular-qr-scanner",
"version": "0.1.0",
"version": "0.1.1",
"homepage": "https://github.com/sembrestels/angular-qr-scanner",
"authors": [
"Sem <sembrestels@riseup.net>"
],
"description": "QR scanner angular directive",
"main": "./qr-scanner.js",
"main": [
"./qr-scanner.js",
"./src/jsqrcode-combined.min.js"
],
"keywords": [
"angular",
"qr",
Expand Down
35 changes: 19 additions & 16 deletions qr-scanner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
if (require){
if (!angular) var angular = require('angular');
if (!qrcode) var qrcode = require('jsqrcode');
}

(function() {
'use strict';

Expand All @@ -15,28 +10,29 @@ 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);
video.setAttribute('autoplay', '');
video.setAttribute('style', '-moz-transform:rotateY(-180deg);-webkit-transform:rotateY(-180deg);transform:rotateY(-180deg);');
var canvas = $window.document.createElement('canvas');
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);
Expand All @@ -46,7 +42,7 @@ angular.module('qrScanner', ["ng"]).directive('qrScanner', ['$interval', '$windo
scope.ngError({error: e});
}
}
}
};

var successCallback = function(stream) {
video.src = (window.URL && window.URL.createObjectURL(stream)) || stream;
Expand All @@ -55,7 +51,7 @@ angular.module('qrScanner', ["ng"]).directive('qrScanner', ['$interval', '$windo
scope.video = video;
video.play();
stopScan = $interval(scan, 500);
}
};

// Call the getUserMedia method with our callback functions
if (navigator.getUserMedia) {
Expand All @@ -72,13 +68,20 @@ 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);
}
});
}
}
};
}]);
})();