fixed one more time

Author: dimaspirit

samples/webrtc/index.html

@@ -220,8 +220,8 @@ <h4>Call from <strong class="j-ic_initiator"></strong></h4>
     </script>
 
     <script type="text/template" id="device_not_found">
-        <span>Error: devices (camera or microphone) are not found.</span>
-        &emsp;Login&nbsp;in&nbsp;as&nbsp;<%=name%>
+        Error: devices (camera or microphone) are not found.
+        <span class="text">&emsp;Login&nbsp;in&nbsp;as&nbsp;<%=name%></span>
         <button class='fw-link j-logout'>Logout</button>
     </script>
 

samples/webrtc/js/app.js

@@ -249,10 +249,17 @@
 
               app.currentSession.getUserMedia(mediaParams, function(err, stream) {
                 if (err || !stream.getAudioTracks().length || !stream.getVideoTracks().length) {
-                  showErrorAccessPermission(err);
+                  var errorMsg = '';
 
-                  qbApp.MsgBoard.update('device_not_found', {name: app.caller.full_name}, true);
+                  if(err && err.message) {
+                    errorMsg += 'Error: ' + err.message;
+                  } else {
+                    errorMsg += 'device_not_found';
+                  }
                   app.currentSession.stop({});
+
+                  showErrorAccessPermission(err);
+                  qbApp.MsgBoard.update(errorMsg, {name: app.caller.full_name}, true);
                 } else {
                   app.currentSession.call({}, function(error) {
                     if(error) {
@@ -309,9 +316,17 @@
 
             app.currentSession.getUserMedia(mediaParams, function(err, stream) {
                 if (err || !stream.getAudioTracks().length || !stream.getVideoTracks().length) {
+                  var errorMsg = '';
+
+                  if(err && err.message) {
+                    errorMsg += 'Error: ' + err.message;
+                  } else {
+                    errorMsg += 'device_not_found';
+                  }
+
                   showErrorAccessPermission(err);
 
-                  qbApp.MsgBoard.update('device_not_found', {name: app.caller.full_name}, true);
+                  qbApp.MsgBoard.update(errorMsg, {name: app.caller.full_name}, true);
                   isDeviceAccess = false;
                   app.currentSession.stop({});
                 } else {

samples/webrtc/js/msgBoard.js

@@ -31,12 +31,14 @@
              * In first we trying found msg in MESSAGES object
              * then tpl with id like msg_title
              */
-            if(MESSAGES[msg_title]) {
-                msg = MESSAGES[msg_title];
-            } else if(!!document.querySelector('#' + msg_title)) {
-                msg = _.template( document.querySelector('#' + msg_title).innerHTML )(params);
-            } else {
-                throw new Error('[msgBoard] Not found msg with name '+ msg_title);
+            try {
+              msg = _.template( document.querySelector('#' + msg_title).innerHTML )(params);
+            } catch(e) {
+              if(MESSAGES[msg_title]) {
+                  msg = MESSAGES[msg_title];
+              } else {
+                msg = msg_title;
+              }
             }
 
             msgBoardEl.innerHTML = '';

samples/webrtc/styles.css

@@ -172,9 +172,12 @@ body {
     color: #808080;
 }
 
-.msg_board .error span {
+.msg_board .error {
   color: #ff2d55;
 }
+  .msg_board span.text {
+    color: #808080;
+  }
 
 .msg_board .fw-link {
     padding: 0;