Fix back camera not working on forked webcam directive ITO-70 #dev-ac…

…cept (#2) * add facingMode constraint * Update app/scripts/webcam.js * update version * Create .npmrc * package and min file updates * remove dupe file, redo version * more readme cleanup * missed 2
ubreakifix · Jun 17, 2022 · 5779bea · 5779bea
1 parent b624942
commit 5779bea
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 87 deletions.
diff --git a/README.md b/README.md
@@ -8,9 +8,6 @@ You can easily add it as a module to your own app.
 
 A complete example can be found at [http://jonashartmann.github.io/webcam-directive](http://jonashartmann.github.io/webcam-directive) (*gh-pages*)
 
-## Download
-[![NPM](https://nodei.co/npm/webcam.png?compact=true)](https://nodei.co/npm/webcam/)
-
 #### Using the command line
 ```shell
 npm install @ubreakifix/webcam
@@ -20,16 +17,6 @@ npm install @ubreakifix/webcam
 "@ubreakifix/webcam": "3.2.13"
 ```
 
-#### There is a tag for each version, with the built javascript file inside the _dist_ directory
-	Ex.: dist/webcam.min.js
-
-## Installation
-
-#### Using script tag
-```html
-<script type="text/javascript" src="webcam.min.js"></script>
-```
-
 ## Usage
 
 #### Add module "webcam" as dependency

diff --git a/app/scripts/webcam.js b/app/scripts/webcam.js
@@ -3,8 +3,6 @@
  *
  * (c) Jonas Hartmann http://jonashartmann.github.io/webcam-directive
  * License: MIT
- *
- * @version: 3.2.1
  */
 'use strict';
 
@@ -146,79 +144,39 @@ angular.module('webcam', [])
             return;
           }
 
-          var mediaConstraint = { video: true, audio: false };
-          var videoOptions;
-
-          navigator.mediaDevices.enumerateDevices().then(function (devices) {
-            var sourceId = null;
-            var source = null;
-            var backCam = null;
-            $scope.config.sourceList = [];
-            $scope.config.sourceDevice = {};
-
-            // enumerate all devices
-            devices.forEach(function (device) {
-              // if there is still no video input, or if this is the rear camera
-              if (device.kind === 'videoinput') {
-                $scope.config.sourceList.push(device);
-                if (device.label.indexOf('back') !== -1) {
-                  backCam = device;
-                }
-                sourceId = device.deviceId;
-                source = device;
-              }
-            });
-            // we didn't find any video input
-            if (!sourceId) {
-              throw 'no video input';
-            }
+          var mediaConstraint = { video: {facingMode: 'environment'}, audio: false };
 
-            $scope.config.sourceDevice = backCam ? backCam : source;
-            $scope.config.source = backCam ? backCam.deviceId : sourceId;
-            // if we got to choose a source
-            if ($scope.config.source !== undefined) {
-              videoOptions = {optional: [{sourceId: $scope.config.source}]};
-            } else {
-              videoOptions = true;
-            }
-            mediaConstraint =
-                {
-                  video: videoOptions,
-                  audio: false
-                };
-
-            if (window.hasModernUserMedia) {
-              // The spec has changed towards a Promise based interface
-              navigator.getMedia(mediaConstraint)
-                  .then(onSuccess)
-                  .catch(onFailure);
-            } else {
-              navigator.getMedia(mediaConstraint, onSuccess, onFailure);
-            }
+          if (window.hasModernUserMedia) {
+            // The spec has changed towards a Promise based interface
+            navigator.getMedia(mediaConstraint)
+              .then(onSuccess)
+              .catch(onFailure);
+          } else {
+            navigator.getMedia(mediaConstraint, onSuccess, onFailure);
+          }
 
-            /* Start streaming the webcam data when the video element can play
-             * It will do it only once
-             */
-            videoElem.addEventListener('canplay', function () {
-              if (!isStreaming) {
-                var scale = width / videoElem.videoWidth;
-                height = (videoElem.videoHeight * scale) ||
-                    $scope.config.videoHeight;
-                videoElem.setAttribute('width', width);
-                videoElem.setAttribute('height', height);
-                isStreaming = true;
-
-                $scope.config.video = videoElem;
-
-                _removeDOMElement(placeholder);
-
-                /* Call custom callback */
-                if ($scope.onStreaming) {
-                  $scope.onStreaming();
-                }
+          /* Start streaming the webcam data when the video element can play
+          * It will do it only once
+          */
+          videoElem.addEventListener('canplay', function() {
+            if (!isStreaming) {
+              var scale = width / videoElem.videoWidth;
+              height = (videoElem.videoHeight * scale) ||
+                        $scope.config.videoHeight;
+              videoElem.setAttribute('width', width);
+              videoElem.setAttribute('height', height);
+              isStreaming = true;
+
+              $scope.config.video = videoElem;
+
+              _removeDOMElement(placeholder);
+
+              /* Call custom callback */
+              if ($scope.onStreaming) {
+                $scope.onStreaming();
               }
-            }, false);
-          });
+            }
+          }, false);
         };
 
         var stopWebcam = function stopWebcam() {

diff --git a/dist/webcam.min.js b/dist/webcam.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ubreakifix/webcam",
   "author": "Jonas Hartmann",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "license": "MIT",
   "main": "app/scripts/webcam.js",
   "dependencies": {},