Merge pull request #1076 from dpalou/MOBILE-839

Mobile 839

Author: jleyva

resources/desktop/Square150x150Logo.png

@@ -50,16 +50,19 @@ angular.module('mm.core.emulator')
     function captureMedia(type, successCallback, errorCallback, options) {
         options = options || {};
 
+        var loadingModal;
+
         try {
             var scope = $rootScope.$new(),
-                loadingModal = $mmUtil.showModalLoading(),
                 facingMode = 'environment',
                 mimetype,
                 extension,
                 quality = 0.92, // Image only.
                 returnData = false, // Image only.
                 isCaptureImage = false; // To identify if it's capturing an image using media capture plugin (instead of camera).
 
+            loadingModal = $mmUtil.showModalLoading();
+
             if (type == 'captureimage') {
                 isCaptureImage = true;
                 type = 'image';
@@ -117,7 +120,7 @@ angular.module('mm.core.emulator')
                     audio: !scope.isImage
                 };
 
-                navigator.mediaDevices.getUserMedia(constraints).then(function(localMediaStream) {
+                return navigator.mediaDevices.getUserMedia(constraints).then(function(localMediaStream) {
                     var streamVideo,
                         previewMedia,
                         canvas,
@@ -159,17 +162,37 @@ angular.module('mm.core.emulator')
                     }
 
                     if (scope.isImage || scope.isVideo) {
+                        var hasLoaded = false,
+                            waitTimeout;
+
                         // Set the stream as the source of the video.
                         streamVideo = modal.modalEl.querySelector('video.mm-webcam-stream');
                         streamVideo.src = $window.URL.createObjectURL(localMediaStream);
 
                         // Stream ready, show modal.
                         streamVideo.onloadedmetadata = function() {
+                            if (hasLoaded) {
+                                // Already loaded or timeout triggered, stop.
+                                return;
+                            }
+
+                            hasLoaded = true;
+                            $timeout.cancel(waitTimeout);
                             loadingModal.dismiss();
                             modal.show();
                             scope.readyToCapture = true;
                             streamVideo.onloadedmetadata = null;
                         };
+
+                        // If stream isn't ready in a while, show error.
+                        waitTimeout = $timeout(function() {
+                            if (!hasLoaded) {
+                                // Show error.
+                                hasLoaded = true;
+                                loadingModal.dismiss();
+                                errorCallback && errorCallback({code: -1, message: 'Cannot connect to webcam.'});
+                            }
+                        }, 10000);
                     } else {
                         // No need to wait to show the modal.
                         loadingModal.dismiss();
@@ -304,10 +327,14 @@ angular.module('mm.core.emulator')
                     scope.$on('$destroy', function() {
                         scope.modal.remove();
                     });
-                  }).catch(errorCallback);
-            }, errorCallback);
+                });
+            }).catch(function(err) {
+                loadingModal && loadingModal.dismiss();
+                errorCallback && errorCallback(err);
+            });
         } catch(ex) {
-            errorCallback(ex.toString());
+            loadingModal && loadingModal.dismiss();
+            errorCallback && errorCallback(ex.toString());
         }
     }
 

resources/desktop/Wide310x150Logo.png

@@ -376,14 +376,8 @@ angular.module('mm.core.login', [])
         url = url.replace(ssoScheme, '');
 
         // Some platforms like Windows add a slash at the end. Remove it.
-        if (url.slice(-1) == '/') {
-            url = url.substring(0, url.length - 1);
-        }
-
         // Some sites add a # at the end of the URL. If it's there, remove it.
-        if (url.slice(-1) == '#') {
-            url = url.substring(0, url.length - 1);
-        }
+        url = url.replace(/\/?#?\/?$/, '');
 
         // Decode from base64.
         try {

www/core/components/emulator/services/mediacapture.js

@@ -296,6 +296,7 @@ angular.module('mm.core')
                 // It's a desktop app, send an event so the file is opened. It has to be done with an event
                 // because opening the file from here (renderer process) doesn't focus the opened app.
                 require('electron').ipcRenderer.send('openItem', path);
+                deferred.resolve();
             } else if (window.plugins) {
                 var extension = $mmFS.getFileExtension(path),
                     mimetype = $mmFS.getMimeType(extension);

www/core/components/login/main.js

@@ -1655,3 +1655,7 @@ h2.invert {
   border-color: transparent;
   background: none;
 }
+
+::-webkit-calendar-picker-indicator, ::-webkit-inner-spin-button, ::-webkit-clear-button {
+  display: none;
+}