浏览代码

Increase the clickable area for restoring a minimized chat

JC Brand 11 年之前
父节点
当前提交
166b3bd003
共有 6 个文件被更改,包括 13 次插入8 次删除
  1. 7 1
      converse.js
  2. 1 0
      css/converse.css
  3. 1 1
      index.html
  4. 1 0
      less/converse.less
  5. 0 1
      src/templates/chatroom.html
  6. 3 5
      src/templates/trimmed_chat.html

+ 7 - 1
converse.js

@@ -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 @@
             },
             },
 
 
             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);

+ 1 - 0
css/converse.css

@@ -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;

+ 1 - 1
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/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>

+ 1 - 0
less/converse.less

@@ -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;

+ 0 - 1
src/templates/chatroom.html

@@ -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>

+ 3 - 5
src/templates/trimmed_chat.html

@@ -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}}">
-        {{ title }}
-    </a>
-</div>
+<a href="#" class="restore-chat" title="{{tooltip}}">
+    {{ title }}
+</a>