diff --git a/clientapp/models/message.js b/clientapp/models/message.js
index 9481da9..f989c11 100644
--- a/clientapp/models/message.js
+++ b/clientapp/models/message.js
@@ -102,7 +102,8 @@ var Message = module.exports = HumanModel.define({
body = htmlify.toHTML(body);
if (this.mentions) {
var existing = htmlify.toHTML(this.mentions);
- body = body.replace(existing, '' + existing + '');
+ var parts = body.split(existing);
+ body = parts.join('' + existing + '');
}
return body;
}
diff --git a/public/css/otalk.css b/public/css/otalk.css
index 9474d2f..765207f 100644
--- a/public/css/otalk.css
+++ b/public/css/otalk.css
@@ -1157,6 +1157,10 @@ button.secondary:hover:not(:disabled) {
height: 30px;
padding: 6px 10px;
}
+.chatBox textarea:focus {
+ transition: none;
+ -webkit-transition: none;
+}
.chatBox textarea.editing {
background-color: #fffcea;
border: 1px solid #efe391;
diff --git a/public/css/pages/chat.styl b/public/css/pages/chat.styl
index b68b91f..0afb1bc 100644
--- a/public/css/pages/chat.styl
+++ b/public/css/pages/chat.styl
@@ -262,6 +262,10 @@
height: 30px
padding: 6px 10px
+ &:focus
+ transition: none
+ -webkit-transition: none
+
&.editing
background-color: #fffcea
border: 1px solid #efe391
diff --git a/public/x-manifest.cache b/public/x-manifest.cache
index 7f71117..b8f0df2 100644
--- a/public/x-manifest.cache
+++ b/public/x-manifest.cache
@@ -1,5 +1,5 @@
CACHE MANIFEST
-# 0.0.1 1387404089194
+# 0.0.1 1387474672583
CACHE:
/app.js