Commit 166b3bd0 authored by JC Brand's avatar JC Brand

Increase the clickable area for restoring a minimized chat

parent 38b26784
...@@ -1319,7 +1319,10 @@ ...@@ -1319,7 +1319,10 @@
return this; return this;
}, },
close: function () { close: function (ev) {
if (ev && ev.preventDefault) {
ev.preventDefault();
}
if (converse.connection) { if (converse.connection) {
this.model.destroy(); this.model.destroy();
} else { } else {
...@@ -1339,6 +1342,9 @@ ...@@ -1339,6 +1342,9 @@
}, },
minimize: function (ev) { minimize: function (ev) {
if (ev && ev.preventDefault) {
ev.preventDefault();
}
// Minimizes a chat box // Minimizes a chat box
this.model.minimize(); this.model.minimize();
this.$el.hide('fast', converse.refreshwebkit); this.$el.hide('fast', converse.refreshwebkit);
......
...@@ -755,6 +755,7 @@ input.error { ...@@ -755,6 +755,7 @@ input.error {
float: left; float: left;
margin-right: 6px; margin-right: 6px;
} }
#conversejs .restore-chat,
#conversejs .chat-title { #conversejs .chat-title {
padding: 1px 0; padding: 1px 0;
color: white; color: white;
......
...@@ -11,7 +11,7 @@ ...@@ -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/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="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/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 data-main="main" src="components/requirejs/require.js"></script>
<!-- <!--
<script src="builds/converse.min.js"></script> <script src="builds/converse.min.js"></script>
......
...@@ -819,6 +819,7 @@ input.error { ...@@ -819,6 +819,7 @@ input.error {
margin-right: 6px; margin-right: 6px;
} }
#conversejs .restore-chat,
#conversejs .chat-title { #conversejs .chat-title {
padding: 1px 0; padding: 1px 0;
color: white; color: white;
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
{[ if (minimized) { ]} style="display:none" {[ } ]}> {[ if (minimized) { ]} style="display:none" {[ } ]}>
<div class="dragresize dragresize-tm"></div> <div class="dragresize dragresize-tm"></div>
<div class="chat-head chat-head-chatroom"> <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="close-chatbox-button icon-close"></a>
<a class="toggle-chatbox-button icon-minus"></a> <a class="toggle-chatbox-button icon-minus"></a>
<a class="configure-chatroom-button icon-wrench" style="display:none"></a> <a class="configure-chatroom-button icon-wrench" style="display:none"></a>
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
<a class="chat-head-message-count" <a class="chat-head-message-count"
{[ if (!num_unread) { ]} style="display: none" {[ } ]} {[ if (!num_unread) { ]} style="display: none" {[ } ]}
href="#">{{num_unread}}</a> href="#">{{num_unread}}</a>
<div class="chat-title"> <a href="#" class="restore-chat" title="{{tooltip}}">
<a href="#" class="restore-chat" title="{{tooltip}}"> {{ title }}
{{ title }} </a>
</a>
</div>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment