From 166b3bd003e9e33ab2ea3a5748e031574134cb2b Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Sun, 6 Jul 2014 12:40:50 +0200
Subject: [PATCH] Increase the clickable area for restoring a minimized chat

---
 converse.js                     | 8 +++++++-
 css/converse.css                | 1 +
 index.html                      | 2 +-
 less/converse.less              | 1 +
 src/templates/chatroom.html     | 1 -
 src/templates/trimmed_chat.html | 8 +++-----
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/converse.js b/converse.js
index 92fbdc468..438fd6aa5 100644
--- a/converse.js
+++ b/converse.js
@@ -1319,7 +1319,10 @@
                 return this;
             },
 
-            close: function () {
+            close: function (ev) {
+                if (ev && ev.preventDefault) {
+                    ev.preventDefault();
+                }
                 if (converse.connection) {
                     this.model.destroy();
                 } else {
@@ -1339,6 +1342,9 @@
             },
 
             minimize: function (ev) {
+                if (ev && ev.preventDefault) {
+                    ev.preventDefault();
+                }
                 // Minimizes a chat box
                 this.model.minimize();
                 this.$el.hide('fast', converse.refreshwebkit);
diff --git a/css/converse.css b/css/converse.css
index 8d2baeb02..f29ae50c9 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -755,6 +755,7 @@ input.error {
   float: left;
   margin-right: 6px;
 }
+#conversejs .restore-chat,
 #conversejs .chat-title {
   padding: 1px 0;
   color: white;
diff --git a/index.html b/index.html
index d41409f76..a79d1ee7d 100644
--- a/index.html
+++ b/index.html
@@ -11,7 +11,7 @@
     <link type="text/css" rel="stylesheet" media="screen" href="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
     <script data-main="main" src="components/requirejs/require.js"></script>
     <!--
     <script src="builds/converse.min.js"></script>
diff --git a/less/converse.less b/less/converse.less
index 92fda6d6b..e0813bbff 100644
--- a/less/converse.less
+++ b/less/converse.less
@@ -819,6 +819,7 @@ input.error {
     margin-right: 6px;
 }
 
+#conversejs .restore-chat,
 #conversejs .chat-title {
     padding: 1px 0;
     color: white;
diff --git a/src/templates/chatroom.html b/src/templates/chatroom.html
index 027903ed5..9118b0a59 100644
--- a/src/templates/chatroom.html
+++ b/src/templates/chatroom.html
@@ -2,7 +2,6 @@
     {[ if (minimized) { ]} style="display:none" {[ } ]}>
     <div class="dragresize dragresize-tm"></div>
     <div class="chat-head chat-head-chatroom">
-        <div class="chat-head-message-count">0</div>
         <a class="close-chatbox-button icon-close"></a>
         <a class="toggle-chatbox-button icon-minus"></a>
         <a class="configure-chatroom-button icon-wrench" style="display:none"></a>
diff --git a/src/templates/trimmed_chat.html b/src/templates/trimmed_chat.html
index 2b3961e4c..41c875b8b 100644
--- a/src/templates/trimmed_chat.html
+++ b/src/templates/trimmed_chat.html
@@ -2,8 +2,6 @@
 <a class="chat-head-message-count" 
     {[ if (!num_unread) { ]} style="display: none" {[ } ]}
     href="#">{{num_unread}}</a>
-<div class="chat-title">
-    <a href="#" class="restore-chat" title="{{tooltip}}">
-        {{ title }}
-    </a>
-</div>
+<a href="#" class="restore-chat" title="{{tooltip}}">
+    {{ title }}
+</a>