deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-15 20:15:11 +02:00
Code Issues Projects Releases Wiki Activity

Fix message and topic text wrapping

Browse source
This commit is contained in:
Pavel Djundik 2016-03-22 18:04:34 +02:00
parent eadcca0b5e
commit 2bb3951476
2 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
client/css/style.css
View file

@ -607,6 +607,7 @@ button,
#windows .header .topic { #windows .header .topic {
color: #777; color: #777;
margin-left: 8px; margin-left: 8px;
word-break: break-all;
} }
#windows .window .header { #windows .window .header {
@ -699,6 +700,7 @@ button,
#chat .messages { #chat .messages {
display: table; display: table;
table-layout: fixed;
width: 100%; width: 100%;
padding: 10px 0; padding: 10px 0;
} }
@ -754,14 +756,6 @@ button,
padding-right: 6px; padding-right: 6px;
} }
#chat .wrap,
#chat .text a {
font-style: normal;
word-break: break-all;
word-wrap: break-word;
display: inline-block;
}
#chat .self .text { #chat .self .text {
color: #999; color: #999;
} }

18
client/js/libs/handlebars/parse.js
View file

@ -1,29 +1,13 @@
Handlebars.registerHelper( Handlebars.registerHelper(
"parse", function(text) { "parse", function(text) {
var wrap = wraplong(text);
text = Handlebars.Utils.escapeExpression(text); text = Handlebars.Utils.escapeExpression(text);
text = colors(text); text = colors(text);
text = channels(text); text = channels(text);
text = uri(text); text = uri(text);
if (wrap) { return text;
return "<i class='wrap'>" + text + "</i>";
} else {
return text;
}
} }
); );
function wraplong(text) {
var wrap = false;
var split = text.split(" ");
for (var i in split) {
if (split[i].length > 40) {
wrap = true;
}
}
return wrap;
}
function uri(text) { function uri(text) {
return URI.withinString(text, function(url, start, end, source) { return URI.withinString(text, function(url, start, end, source) {
if (url.indexOf("javascript:") === 0) { if (url.indexOf("javascript:") === 0) {