Fix #175: Unify URL fragment updates.

The URL fragment needs to always reflect the current room.
This means it must also be updated in response to external events -
failure to join a room, being kicked from it, etc.

Additionally, the /join command had a bug that failed to strip a space
preceding the room name in the URL fragment.

js/core/chat.js

@@ -264,9 +264,9 @@ var chat = {
         var room = chat.getRoomFromTitle(name);
         if (room)
           return ui.messageAddInfo(strings.error.roomExists, {room: room}, 'error');
-        ui.urlFragment = '#' + name;
-        window.location.hash = '#' + name;
         xmpp.joinNewRoom(name);
+        ui.updateFragment(name);
+        chat.setSetting('xmpp.room', room);
       };
       if (!chat.getRoomFromTitle(name)) create();
       else xmpp.discoverRooms(create);
@@ -287,8 +287,7 @@ var chat = {
         }
         room = room ? room.id : name;
         xmpp.joinExistingRoom(room);
-        ui.urlFragment = '#' + arg;
-        window.location.hash = '#' + arg;
+        ui.updateFragment(room);
         chat.setSetting('xmpp.room', room);
       };
       // If the room is known, join it now. Otherwise, refresh before joining.
@@ -373,8 +372,7 @@ var chat = {
      */
     part: function() {
       if (xmpp.room.current) xmpp.leaveRoom(xmpp.room.current);
-      ui.urlFragment = '';
-      window.location.hash = '';
+      ui.updateFragment(null);
     },
 
     /**

js/core/ui.js

@@ -529,6 +529,14 @@ var ui = {
     }
   },
 
+  /**
+   * Update the current URL fragment.
+   */
+  updateFragment: function(room) {
+    ui.urlFragment = '#' + (room || '');
+    window.location.hash = ui.urlFragment;
+  },
+
   /**
    * Remove the online list with a new roster, and set the room selection menu.
    */

js/core/xmpp.js

@@ -170,6 +170,7 @@ var xmpp = {
 
   prejoin: function() {
     this.room.current = null;
+    ui.updateFragment(null);
     this.status = 'prejoin';
     ui.setStatus(this.status);
     chat.commands.list();
@@ -234,7 +235,11 @@ var xmpp = {
     }.bind(this);
 
     this.getRoomInfo(room, function(roomInfo) {
-      if (!roomInfo) return ui.messageAddInfo(strings.error.unknownRoom, {name: room}, 'error');
+      if (!roomInfo) {
+        console.log("Room does not exist");
+        ui.updateFragment(xmpp.room.current);
+        return ui.messageAddInfo(strings.error.unknownRoom, {name: room}, 'error');
+      }
       this.room.available[room] = roomInfo;
       ui.refreshRooms(this.room.available);
       ui.messageAddInfo(strings.info.joining, {
@@ -588,6 +593,7 @@ var xmpp = {
       // Cancel any join attempt:
       this.room.target = this.room.current;
       ui.updateRoom(this.room.current);
+      ui.updateFragment(this.room.current);
     }
   },