Browse files

Fixed issue 103 Automatically reconnect bookmarked conference rooms

  • Loading branch information...
1 parent 5679116 commit 37d3b2093f2cc3ab2d402cfb4d527721eba30c21 @cbas cbas committed May 13, 2010
Showing with 4 additions and 2 deletions.
  1. +3 −1 Client/js/conference-container.js
  2. +1 −1 Client/src/main/dial_conference.js
View
4 Client/js/conference-container.js
@@ -266,7 +266,7 @@ function SessionTracker ( Address )
{
/* Error
*/
- if ( Event.Type == 'message' && Event.Payload.Type == 'error' )
+ if ( Event.Payload.Type == 'error' )
{
if ( Event.Payload.ErrorMessage.length )
{
@@ -412,7 +412,9 @@ function SessionTracker ( Address )
/* Update
*/
else if ( this.Occupants.Exists( Event.Payload.FromAddress.Resource ) )
+ {
this.Occupants( Event.Payload.FromAddress.Resource ).Update( Event.Payload );
+ }
/* Add
*/
else if ( Event.Payload.FromAddress.Resource.length )
View
2 Client/src/main/dial_conference.js
@@ -16,7 +16,7 @@ function dial_conference ( Address, Password, InviteJid, InviteGroup )
Tracker.Password = Password;
Tracker.SendPresence( external.globals( 'cfg' )( 'lastmode' ), external.globals( 'cfg' )( 'lastmsg' ) );
}
- if ( Tracker.Address.Resource.length && Tracker.Address.Resource != Address.Resource )
+ if ( Address.Resource.length && Tracker.Address.Resource != Address.Resource )
{
Tracker.Address = Address;
Tracker.DrawContainerInfo();

0 comments on commit 37d3b20

Please sign in to comment.