Merge pull request #124 from QuickBlox/develop.bug.QBWEBSDK-247

Fixed bugs for sprint 1

Author: dimaspirit

samples/webrtc/index.html

@@ -35,15 +35,16 @@ <h2 class="header__title">JavaScript WebRTC Sample</h2>
                     <h3 class="join__title">
                         <p>Please enter your username and chat room name.</p>
                         <p>You can join existed chat room.</p>
+                        <p class="join__notice">Use several browsers to simulate several users.</p>
                     </h3>
 
                     <div class="join__body">
                         <div class="join__row">
-                            <input type="text" class="join__input" name="username" placeholder="Username" autofocus required title="Should contain only latin characters and alphanumeric characters in a range from 3 to 20, starts with a letter." pattern="^[a-zA-Z][a-zA-Z0-9-_\.]{1,20}$">
+                            <input type="text" class="join__input" name="username" placeholder="Username" autofocus required title="Should contain only latin characters and alphanumeric characters in a range from 3 to 20, starts with a letter." pattern="^[a-zA-Z\s][a-zA-Z\d-_\.\s]{3,20}$">
                         </div>
 
                         <div class="join__row">
-                            <input type="text" class="join__input" name="room" placeholder="Chat room name" required title="Should contain only latin characters and alphanumeric characters in a range from 3 to 15, without space." pattern="^[a-zA-Z0-9]{3,15}">
+                            <input type="text" class="join__input" name="room" placeholder="Chat room name" required title="Should contain only latin characters and alphanumeric characters in a range from 3 to 15, without space." pattern="^[a-zA-Z\s][a-zA-Z\d\s]{3,15}$">
                         </div>
 
                         <div class="join__row">

samples/webrtc/js/app.js

@@ -37,7 +37,7 @@
             },
             'container': $('.page'),
             'relocated': function() {
-                var path = app.user ? 'dashboard' : 'join';
+                var path = app.caller ? 'dashboard' : 'join';
 
                 app.router.navigate(path, {'trigger': true});
             },
@@ -471,13 +471,18 @@
 
         /** LOGOUT */
         $(document).on('click', '.j-logout', function() {
-            app.user = null;
-            app.users = [];
+            QB.users.delete(app.caller.id, function(err, user){
+                if (user) {
+                    app.caller = {};
+                    app.users = [];
 
-            QB.chat.disconnect();
-            app.router.navigate('join', {'trigger': true});
-
-            app.helpers.setFooterPosition();
+                    QB.chat.disconnect();
+                    app.router.navigate('join', {'trigger': true});
+                    app.helpers.setFooterPosition();
+                } else  {
+                    console.error('Logout failed:', err);
+                }
+            });
         });
 
         /**

samples/webrtc/styles.css

@@ -235,6 +235,11 @@ b {
     text-align: center;
 }
 
+.join__notice {
+    margin: 10px 0 0 0;
+    font-size: 14px;
+}
+
 .join__body {
     width: 90%;
     max-width: 410px;