Update to template for HTML in topic.

akavlie · Jul 23, 2012 · a0394a1 · a0394a1
1 parent 6ce8c45
commit a0394a1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/assets/js/client.js b/assets/js/client.js
@@ -88,7 +88,7 @@ $(function() {
       var channelTabs = irc.appView.channelList.channelTabs;
       var channelTab = channelTabs[channelTabs.length-1];
       channel.set({
-        topic: utils.linkify(value['topic']),
+        topic: value['topic'],
         unread: value['unread_messages'],
         unreadMentions: value['unread_mentions']
       });
@@ -223,7 +223,7 @@ $(function() {
 
   irc.socket.on('topic', function(data) {
     var channel = irc.chatWindows.getByName(data.channel.toLowerCase());
-    channel.set({topic: utils.linkify(data.topic)});
+    channel.set({topic: data.topic});
     var topicMessage = new Message({type: 'topic', nick: data.nick, topic: utils.linkify(data.topic)});
     channel.stream.add(topicMessage);
   });

diff --git a/assets/js/views/chat.js b/assets/js/views/chat.js
@@ -17,7 +17,7 @@ var ChatView = Backbone.View.extend({
     var topic = this.model.get('topic') || '';
     var context = {
       title: this.model.get('name'),
-      topic: topic
+      topic: utils.linkify(topic)
     };
     this.$('#chat-bar').html(ich.titlebar(context));
   },

diff --git a/views/templates.jade b/views/templates.jade
@@ -108,7 +108,7 @@ script(id="overview_register", type="text/html")
 script(id="titlebar", type="text/html")
   .titlebar
     span(class="window_title") {{title}}
-    span(id="topic") {{topic}}
+    span(id="topic") {{{topic}}}
 
 script(id="chat", type="text/html")
   #main-window