e2m/dispatch
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update client dependencies

Browse source
This commit is contained in:
Ken-Håvard Lieng 2017-02-16 03:55:50 +01:00
parent c5062066cb
commit 77b53bfc5e
23 changed files with 1858 additions and 1363 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/src/js/util/messageHeight.js
View file

@ -8,7 +8,7 @@ export default function messageHeight(message, width, charWidth, indent = 0) {
width -= 200;
}
if (pad + message.message.length * charWidth < width) {
if (pad + (message.message.length * charWidth) < width) {
return height;
}
@ -21,7 +21,7 @@ export default function messageHeight(message, width, charWidth, indent = 0) {
if (c === ' ' || c === '-') {
const end = c === ' ' ? i : i + 1;
if (pad + (end - prevBreak) * charWidth >= width) {
if (pad + ((end - prevBreak) * charWidth) >= width) {
prevBreak = prevPos;
pad = indent;
height += lineHeight;
@ -29,7 +29,7 @@ export default function messageHeight(message, width, charWidth, indent = 0) {
prevPos = i + 1;
} else if (i === len - 1) {
if (pad + (len - prevBreak) * charWidth >= width) {
if (pad + ((len - prevBreak) * charWidth) >= width) {
height += lineHeight;
}
}