Fixed the work around for incomplete implementations of facingMode.

awe-media · Dec 1, 2016 · dbe16b6 · dbe16b6
1 parent d4da2e7
commit dbe16b6
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/js/awe-standard.js b/js/awe-standard.js
@@ -1430,20 +1430,21 @@
           }
 
           if (navigator.mediaDevices && navigator.mediaDevices.enumerateDevices) {
-
             navigator.mediaDevices.enumerateDevices()
             .then(function(devices) {
               var selected_source = null;
+              var last_videoinput_source = null;
               devices.forEach(function(device) {
                 if (device.kind === 'videoinput') {
-                  if (!selected_source) {
-                    selected_source = device.deviceId;
-                  }
-                  else if (device.label.indexOf(' back') > -1) {
+                  if (BODY.facing_mode === 'environment' && device.label.indexOf('back') !== -1) {
                     selected_source = device.deviceId;
                   }
+                  last_videoinput_source = device.deviceId;
                 }
               });
+              if ((!selected_source || BODY.facing_mode === 'environment') && last_videoinput_source) {
+                selected_source = last_videoinput_source;
+              }
               go(selected_source);
             })
             .catch(function(err) {