Merge pull request #291 from QuickBlox/dev

Sprint 14

Author: Vladlukhanin

package.json

@@ -58,7 +58,6 @@
     "jaguarjs-jsdoc": "^1.0.1",
     "jasmine": "^2.5.2",
     "jasmine-core": "^2.6.0",
-    "jquery-custom": "^1.1.1",
     "jsdoc": "^3.5.5",
     "jshint": "^2.9.3",
     "jshint-stylish": "^2.2.1",

quickblox.min.js

@@ -308,8 +308,8 @@
     margin: 0 0 16px 0;
 }
 
-.message__wrap.m-notification_message {
-    display: block;
+.message__wrap .m-notification_message {
+    width: 100%;
     color: #778594;
     font-size: 13px;
     font-weight: 500;

samples/chat/css/dashboard.css

@@ -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>
@@ -238,8 +242,8 @@ <h1 class="dialog__title j-dialog__title"><%- title %></h1>
     </script>
 
     <script type="text/template" id="tpl_notificationMessage">
-        <div class="message__wrap m-notification_message" id="<%= _id %>">
-            <%= message || body %>
+        <div class="message__wrap" id="<%= id %>">
+            <p class="m-notification_message"><%= text %></p>
         </div>
     </script>
 

samples/chat/index.html

@@ -58,15 +58,20 @@ 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;
             }
+            
             loginModule.isLogin = false;
             app.isDashboardLoaded = false;
 
             localStorage.removeItem('user');
             helpers.clearCache();
+
             QB.chat.disconnect();
+            
             router.navigate('#!/login');
         });
     });

samples/chat/js/app.js

@@ -226,13 +226,13 @@ Dialog.prototype.renderMessages = function (dialogId) {
             self.sidebar.classList.add('active');
         }.bind(self));
 
-        self.quitLink.addEventListener('click', function(e){
-           e.preventDefault();
+        messageModule.init();
+
+        self.quitLink.addEventListener('click', function(e) {
+            e.preventDefault();
             if(dialog.type === CONSTANTS.DIALOG_TYPES.PUBLICCHAT) return;
-            self.quitFromTheDialog(dialogId)
+            self.quitFromTheDialog(this.dataset.dialog);
         });
-
-        messageModule.init();
     } else {
         if (self.prevDialogId) {
             messageModule.sendStopTypingStatus(self.prevDialogId);
@@ -252,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');
         }
@@ -329,14 +331,19 @@ Dialog.prototype.createDialog = function (params) {
         if (err) {
             console.error(err);
         } else {
-            var id = createdDialog._id;
-            var occupants = createdDialog.occupants_ids,
+            var occupants_names = [],
+                id = createdDialog._id,
+                occupants = createdDialog.occupants_ids,
                 message_body = (app.user.name || app.user.login) + ' created new dialog with: ';
 
             _.each(occupants, function (occupantId) {
-                message_body += (userModule._cache[occupantId].name || userModule._cache[occupantId].login) + " ";
+                var occupant_name = userModule._cache[occupantId].name || userModule._cache[occupantId].login;
+
+                occupants_names.push(occupant_name);
             });
 
+            message_body += occupants_names.join(', ');
+
             var systemMessage = {
                 extension: {
                     notification_type: 1,
@@ -461,7 +468,7 @@ Dialog.prototype.updateDialog = function (updates) {
         if(updates.title !== dialog.name){
             toUpdateParams.name = updates.title;
             updatedMsg.extension.dialog_name = updates.title;
-            updatedMsg.body = app.user.name + ' changed the conversation name to "' + updates.title + '".'
+            updatedMsg.body = app.user.name + ' changed the conversation name to "' + updates.title + '".';
         }
     }
 
@@ -479,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);
@@ -531,7 +538,7 @@ Dialog.prototype.updateDialog = function (updates) {
 
         _.each(users, function(user){
             QB.chat.sendSystemMessage(+user, msg);
-        })
+        });
     }
 };
 

samples/chat/js/dialog.js

@@ -136,9 +136,10 @@ Helpers.prototype.fillMessagePrams = function (message) {
     if (message.message === CONSTANTS.ATTACHMENT.BODY) {
         message.message = '';
     }
+
     if(!selfDelevered){
         messageModule.sendDeliveredStatus(message._id, message.sender_id, message.chat_dialog_id);
-    };
+    }
 
     message.selfReaded = selfReaded;
 
@@ -163,25 +164,26 @@ Helpers.prototype.getMessageStatus = function(message){
 };
 
 Helpers.prototype.fillMessageBody = function (str) {
-    var url, url_text,
-        URL_REGEXP = /\b((?:https?:\/\/|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/gi;
+    var self = this,
+        url,
+        URL_REGEXP = /https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s\^\'\"\<\>\(\)]{2,}|www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s\^\'\"\<\>\(\)]{2,}|https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9]\.[^\s\^\'\"\<\>\(\)]{2,}|www\.[a-zA-Z0-9]\.[^\s\^\'\"\<\>\(\)]{2,}/g;
 
-    str = escapeHTML(str);
+    str = self.escapeHTML(str);
 
     // parser of paragraphs
     str = str.replace(/\n/g, '<br>');
     // parser of links
     str = str.replace(URL_REGEXP, function(match) {
-        url = (/^[a-z]+:/i).test(match) ? match : 'http://' + match;
-        url_text = match;
-        return '<a href="' + escapeHTML(url) + '" target="_blank">' + escapeHTML(url_text) + '</a>';
+        url = (/^[a-z]+:/i).test(match) ? match : 'https://' + match;
+
+        return '<a href="' + self.escapeHTML(url) + '" target="_blank">' + self.escapeHTML(match) + '</a>';
     });
 
     return str;
+};
 
-    function escapeHTML(s) {
-        return s.replace(/</g, "&lt;").replace(/>/g, "&gt;");
-    }
+Helpers.prototype.escapeHTML = function (str) {
+    return str.replace(/</g, "&lt;").replace(/>/g, "&gt;");
 };
 
 Helpers.prototype.getSrcFromAttachmentId = function (id) {

samples/chat/js/helpers.js

@@ -78,15 +78,20 @@ Listeners.prototype.onNotificationMessage = function(userId, message){
         msg = helpers.fillNewMessageParams(userId, message),
         dialog = dialogModule._cache[message.dialog_id],
         extension = message.extension,
-        dialogId = message.dialog_id;
+        dialogId = message.dialog_id,
+        occupantsIdsAdded = extension.occupants_ids_added && extension.occupants_ids_added.split(',');
 
     if(extension.notification_type === CONSTANTS.NOTIFICATION_TYPES.UPDATE_DIALOG){
         if (extension.occupants_ids_removed) {
             dialogModule._cache[dialogId].users = dialogModule._cache[dialogId].users.filter(function(user){
                 return user !== userId;
             });
         } else if(extension.occupants_ids_added) {
-            dialog.users.push(userId);
+            _.each(occupantsIdsAdded, function(userId) {
+                if (dialog.users.indexOf(+userId) === -1) {
+                    dialog.users.push(+userId);
+                }
+            });
         } else if(extension.dialog_name){
             dialog.name = extension.dialog_name;
             dialogModule.updateDialogUi(dialogId, extension.dialog_name);

samples/chat/js/listeners.js

@@ -101,13 +101,14 @@ Login.prototype.login = function (user) {
             reject(error);
         }
     });
+    
 };
 
 Login.prototype.renderLoginPage = function(){
     helpers.clearView(app.page);
 
     app.page.innerHTML = helpers.fillTemplate('tpl_login', {
-        version: QB.version
+        version: QB.version + ':' + QB.buildNumber
     });
     this.isLoginPageRendered = true;
     this.setListeners();

samples/chat/js/login.js

@@ -184,10 +184,10 @@ Message.prototype.getMessages = function (dialogId) {
     self.container.classList.add('loading');
 
     QB.chat.message.list(params, function (err, messages) {
-        if (!err) {
+        if (messages) {
             var dialog = dialogModule._cache[dialogId];
             dialog.messages = dialog.messages.concat(messages.items);
-
+            
             if (messages.items.length < self.limit) {
                 dialog.full = true;
             }
@@ -266,8 +266,9 @@ Message.prototype.sendReadStatus = function(messageId, userId, dialogId){
 Message.prototype.renderMessage = function (message, setAsFirst) {
     var self = this,
         sender = userModule._cache[message.sender_id],
+        dialogId = message.chat_dialog_id,
         messagesHtml,
-        dialogId = message.chat_dialog_id;
+        messageText;
 
     if(!message.selfReaded){
         self.sendReadStatus(message._id, message.sender_id, dialogId);
@@ -276,11 +277,14 @@ Message.prototype.renderMessage = function (message, setAsFirst) {
     }
 
     if(message.notification_type || (message.extension && message.extension.notification_type)) {
-        messagesHtml = helpers.fillTemplate('tpl_notificationMessage', message);
+        messageText = message.message ? helpers.escapeHTML(message.message) : helpers.escapeHTML(message.body);
+
+        messagesHtml = helpers.fillTemplate('tpl_notificationMessage', {
+            id: message._id,
+            text: messageText
+        });
     } else {
-        var messageText = message.message ?
-            helpers.fillMessageBody(message.message || '') :
-            helpers.fillMessageBody(message.body || '');
+        messageText = message.message ? helpers.fillMessageBody(message.message || '') : helpers.fillMessageBody(message.body || '');
 
         messagesHtml = helpers.fillTemplate('tpl_message', {
             message: {