Added test for releasing camera, fixed code-style

dist/quagga.js

@@ -6899,6 +6899,7 @@ define('events',[],function() {
 
 define('camera_access',[],function() {
     
+    var streamRef;
     
     /**
      * Wraps browser-specific getUserMedia
@@ -6908,6 +6909,7 @@ define('camera_access',[],function() {
      */
     function getUserMedia(constraints, success, failure) {
         navigator.getUserMedia(constraints, function(stream) {
+            streamRef = stream;
             var videoSrc = (window.URL && window.URL.createObjectURL(stream)) || stream;
             success.apply(null, [videoSrc]);
         }, failure);
@@ -6985,6 +6987,13 @@ define('camera_access',[],function() {
     return {
         request : function(video, callback) {
             request(video, callback);
+        },
+        release : function() {
+            var tracks = streamRef && streamRef.getVideoTracks();
+            if (tracks.length) {
+                tracks[0].stop();
+            }
+            streamRef = null;
         }
     };
 }); 
@@ -7181,6 +7190,9 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
         },
         stop : function() {
             _stopped = true;
+            if (_config.inputStream.type === "LiveStream") {
+                CameraAccess.release();
+            }
         },
         onDetected : function(callback) {
             Events.subscribe("detected", callback);

spec/camera_access.spec.js

@@ -0,0 +1,74 @@
+define(['camera_access'], function(CameraAccess){
+    var originalURL,
+        originalUserMedia,
+        originalMediaStreamTrack,
+        video,
+        stream;
+            
+    beforeEach(function() {
+        var tracks = [{
+            stop: function() {}
+        }];
+        
+        originalURL = window.URL;
+        originalUserMedia = window.getUserMedia;
+        originalMediaStreamTrack = window.MediaStreamTrack;
+        window.MediaStreamTrack = {};
+        window.URL = null;
+        
+        
+        stream = {
+            getVideoTracks: function() {
+                return tracks;
+            }
+        };
+        sinon.spy(tracks[0], "stop");
+        navigator.getUserMedia = function(constraints, cb) {
+            cb(stream);
+        };
+        sinon.spy(navigator, "getUserMedia");
+        video = {
+            src: null,
+            addEventListener: function() {
+                
+            },
+            play: function() {
+                
+            },
+            videoWidth: 320,
+            videoHeight: 480
+        };
+        sinon.stub(video, "addEventListener", function(event, cb) {
+            cb();
+        });
+        sinon.stub(video, "play");
+    });
+    
+    afterEach(function() {
+        navigator.getUserMedia = originalUserMedia;
+        window.URL = originalURL;
+        window.MediaStreamTrack = originalMediaStreamTrack;
+    });
+    
+    describe('request', function() {
+        it('should request the camera', function(done) {
+            CameraAccess.request(video, function() {
+                expect(navigator.getUserMedia.calledOnce).to.equal(true);
+                expect(video.src).to.deep.equal(stream);
+                done();
+            });
+        });
+    });
+    
+    describe('release', function() {
+        it('should release the camera', function(done) {
+            CameraAccess.request(video, function() {
+                expect(video.src).to.deep.equal(stream);
+                CameraAccess.release();
+                expect(video.src.getVideoTracks()).to.have.length(1);
+                expect(video.src.getVideoTracks()[0].stop.calledOnce).to.equal(true);
+                done();
+            });
+        });
+    });
+});

src/camera_access.js

@@ -94,8 +94,9 @@ define(function() {
         },
         release : function() {
             var tracks = streamRef && streamRef.getVideoTracks();
-          if (tracks.length)
+            if (tracks.length) {
                 tracks[0].stop();
+            }
             streamRef = null;
         }
     };

src/quagga.js

@@ -191,7 +191,7 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
         },
         stop : function() {
             _stopped = true;
-            if (_config.inputStream.type == "LiveStream") {
+            if (_config.inputStream.type === "LiveStream") {
                 CameraAccess.release();
             }
         },

test-main.js

@@ -19,7 +19,8 @@ require.config({
     'cv_utils': 'src/cv_utils',
     'typedefs': 'src/typedefs',
     'glMatrixAddon': 'src/glMatrixAddon',
-    'cluster': 'src/cluster'
+    'cluster': 'src/cluster',
+    'camera_access': 'src/camera_access'
   },
   deps: allTestFiles,
   callback: window.__karma__.start