Merge pull request #374 from QuickBlox/development

EugenStrukov · web-flow · commit be68eaec184f · 2019-06-11T12:01:48.000+03:00
Bug with join into private chat fixed;
diff --git a/samples/chat/README.md b/samples/chat/README.md
@@ -23,4 +23,4 @@ It allows:
 
 # Documentation
 
-Original sample description & setup guide - [JS Chat Sample](https://quickblox.com/developers/Web_XMPP_Chat_Sample#Guide:_Getting_Started_with_Chat_API)
+Original sample description & setup guide - [JS Chat Sample](https://quickblox.com/developers/Web_XMPP_Chat_Sample#Guide:_Getting_Started_with_Chat_API)
diff --git a/samples/chat/js/dialog.js b/samples/chat/js/dialog.js
@@ -368,6 +368,9 @@ Dialog.prototype.createDialog = function (params) {
             }
 
             (new Promise(function (resolve){
+                if(createdDialog.type===CONSTANTS.DIALOG_TYPES.CHAT){
+                    resolve();
+                }
                 self.joinToDialog(id).then(function(){
                     if(createdDialog.type === CONSTANTS.DIALOG_TYPES.GROUPCHAT){
                         messageModule.sendMessage(id, notificationMessage);

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,4 @@ It allows:`
`23`	`23`
`24`	`24`	`# Documentation`
`25`	`25`
`26`		`-Original sample description & setup guide - [JS Chat Sample](https://quickblox.com/developers/Web_XMPP_Chat_Sample#Guide:_Getting_Started_with_Chat_API)`
	`26`	`+Original sample description & setup guide - [JS Chat Sample](https://quickblox.com/developers/Web_XMPP_Chat_Sample#Guide:_Getting_Started_with_Chat_API)`
Original file line number	Diff line number	Diff line change
`@@ -368,6 +368,9 @@ Dialog.prototype.createDialog = function (params) {`
`368`	`368`	`}`
`369`	`369`
`370`	`370`	`(new Promise(function (resolve){`
	`371`	`+ if(createdDialog.type===CONSTANTS.DIALOG_TYPES.CHAT){`
	`372`	`+ resolve();`
	`373`	`+ }`
`371`	`374`	`self.joinToDialog(id).then(function(){`
`372`	`375`	`if(createdDialog.type === CONSTANTS.DIALOG_TYPES.GROUPCHAT){`
`373`	`376`	`messageModule.sendMessage(id, notificationMessage);`