Fixes for chat sample

Author: Vladlukhanin

samples/chat/index.html

@@ -146,8 +146,12 @@ <h2 class="dashboard__title"><%- user.user_tags %></h2>
             <button class="open_sidebar j-open_sidebar"></button>
             <h1 class="dialog__title j-dialog__title"><%- title %></h1>
             <div class="action_links">
-                <a href="#!/dialog/<%- _id %>/edit" class="add_to_dialog j-add_to_dialog <% type !== 2 ? print('hidden') : ''%>"><i class="material-icons">person_add</i></a>
-                <a href="#" class="quit_fom_dialog_link j-quit_fom_dialog_link <% type === 1 ? print('hidden') : ''%>"><i class="material-icons">delete</i></a>
+                <a href="#!/dialog/<%- _id %>/edit" class="add_to_dialog j-add_to_dialog <% type !== 2 ? print('hidden') : ''%>">
+                    <i class="material-icons">person_add</i>
+                </a>
+                <a href="#" class="quit_fom_dialog_link j-quit_fom_dialog_link <% type === 1 ? print('hidden') : ''%>" data-dialog="<%- _id %>">
+                    <i class="material-icons">delete</i>
+                </a>
             </div>
         </div>
         <div class="notifications j-notifications hidden"></div>

samples/chat/js/app.js

@@ -58,9 +58,9 @@ App.prototype.renderDashboard = function (activeTabName) {
 
     logoutBtn.addEventListener('click', function () {
         QB.users.delete(app.user.id, function(err, user){
-            if (!user) {
+            if (err) {
                 console.error('Can\'t delete user by id: '+app.user.id+' ', err);
-
+                
                 return false;
             }
 
@@ -69,7 +69,9 @@ App.prototype.renderDashboard = function (activeTabName) {
 
             localStorage.removeItem('user');
             helpers.clearCache();
+
             QB.chat.disconnect();
+            
             router.navigate('#!/login');
         });
     });

samples/chat/js/dialog.js

@@ -227,6 +227,12 @@ Dialog.prototype.renderMessages = function (dialogId) {
         }.bind(self));
 
         messageModule.init();
+
+        self.quitLink.addEventListener('click', function(e) {
+            e.preventDefault();
+            if(dialog.type === CONSTANTS.DIALOG_TYPES.PUBLICCHAT) return;
+            self.quitFromTheDialog(this.dataset.dialog);
+        });
     } else {
         if (self.prevDialogId) {
             messageModule.sendStopTypingStatus(self.prevDialogId);
@@ -246,9 +252,11 @@ Dialog.prototype.renderMessages = function (dialogId) {
             }
         }
 
+        self.editLink.href = '#!/dialog/' + self.dialogId + '/edit';
+        self.quitLink.dataset.dialog = dialogId;
+
         if(dialog.type === CONSTANTS.DIALOG_TYPES.GROUPCHAT){
             self.editLink.classList.remove('hidden');
-            self.editLink.href = '#!/dialog/' + self.dialogId + '/edit';
         } else {
             self.editLink.classList.add('hidden');
         }
@@ -262,12 +270,6 @@ Dialog.prototype.renderMessages = function (dialogId) {
         helpers.clearView(self.messagesContainer);
         helpers.clearView(self.attachmentsPreviewContainer);
         document.forms.send_message.attach_file.value = null;
-
-        self.quitLink.onclick = function(e){
-            e.preventDefault();
-            if(dialog.type === CONSTANTS.DIALOG_TYPES.PUBLICCHAT) return;
-            self.quitFromTheDialog(dialogId);
-        };
     }
 
     messageModule.setLoadMoreMessagesListener();
@@ -484,7 +486,7 @@ Dialog.prototype.updateDialog = function (updates) {
 
             self._cache[dialogId].users = self._cache[dialogId].users.concat(newUsers);
 
-            updatedMsg.body = app.user.name + ' adds ' + usernames.join(',') + ' to the conversation.';
+            updatedMsg.body = app.user.name + ' adds ' + usernames.join(', ') + ' to the conversation.';
             updatedMsg.extension.occupants_ids_added = newUsers.join(',');
         } else {
             router.navigate('/dialog/' + dialogId);
@@ -536,7 +538,7 @@ Dialog.prototype.updateDialog = function (updates) {
 
         _.each(users, function(user){
             QB.chat.sendSystemMessage(+user, msg);
-        })
+        });
     }
 };