@@ -94,24 +94,18 @@ qx.Class.define("osparc.conversation.MessageList", {
9494 this . getChildControl ( "add-message" ) ;
9595 } ,
9696
97- _applyConversation : function ( conversation , oldConversation ) {
97+ _applyConversation : function ( conversation ) {
9898 this . __reloadMessages ( true ) ;
9999
100- const messageAdded = e => {
101- const data = e . getData ( ) ;
102- this . _messageAdded ( data ) ;
103- } ;
104- const messageDeleted = e => {
105- const data = e . getData ( ) ;
106- this . __messageDeleted ( data ) ;
107- } ;
108100 if ( conversation ) {
109- conversation . addListener ( "messageAdded" , messageAdded ) ;
110- conversation . addListener ( "messageDeleted" , messageDeleted ) ;
111- }
112- if ( oldConversation ) {
113- oldConversation . removeListener ( "messageAdded" , messageAdded ) ;
114- oldConversation . removeListener ( "messageDeleted" , messageDeleted ) ;
101+ conversation . addListener ( "messageAdded" , e => {
102+ const data = e . getData ( ) ;
103+ this . _messageAdded ( data ) ;
104+ } ) ;
105+ conversation . addListener ( "messageDeleted" , e => {
106+ const data = e . getData ( ) ;
107+ this . __messageDeleted ( data ) ;
108+ } ) ;
115109 }
116110 } ,
117111
@@ -177,7 +171,7 @@ qx.Class.define("osparc.conversation.MessageList", {
177171 control = new osparc . conversation . NotificationUI ( message ) ;
178172 break ;
179173 }
180- if ( control ) {
174+ if ( control && this . getConversation ( ) ) {
181175 // insert into the UI at the same position
182176 const insertAt = this . getConversation ( ) . getMessageIndex ( message . getMessageId ( ) ) ;
183177 const messagesContainer = this . getChildControl ( "messages-container" ) ;
0 commit comments