Merge branch 'whiteboard-modifications' of https://github.com/OZhurbenko/bigbluebutton into chat-quotes

This commit is contained in:
Anton Georgiev 2015-02-05 20:07:13 +00:00
commit 08e0ada372
4 changed files with 21 additions and 2 deletions

View File

@ -198,6 +198,9 @@ body {
padding-top: 50px;
padding-left: 0.25%;
padding-right: 0.25%;
display: -moz-flex;
display: -ms-flexbox;
display: -ms-flex;
display: -webkit-flex;
display: flex;
}

View File

@ -3,6 +3,8 @@
margin-left: 0.25%;
margin-right: 0.25%;
-webkit-flex: 3 1 53%;
-moz-flex: 3 1 53%;
-ms-flex: 3 1 53%;
flex: 3 1 53%;
}
@ -11,7 +13,6 @@
/*height: auto !important;*/
margin-left: auto;
margin-right: auto;
margin-top:5px;
#svggroup {
display: block;
height: 100% !important;

View File

@ -2,5 +2,21 @@
#whiteboard {
-webkit-order: 2;
order: 2;
display: -moz-flex;
display: -ms-flexbox;
display: -ms-flex;
display: -webkit-flex;
display: flex;
}
#whiteboard-paper {
position: relative;
top: 50%;
-webkit-transform: translateY(calc(~'-50% - 19px'));
-ms-transform: translateY(calc(~'-50% - 19px'));
transform: translateY(calc(~'-50% - 19px'));
}
}

View File

@ -172,7 +172,6 @@ class @WhiteboardTextModel extends WhiteboardToolModel
#creating a textNode and adding it to the cell to check the width
tempSpanEl.firstChild.nodeValue = temp[num]
cell.appendChild tempSpanEl
console.log tempSpanEl.getComputedTextLength()
#if width is bigger than maxWidth + whitespace between textBox borders and a word
if tempSpanEl.getComputedTextLength()+10 > maxWidth
tempWord = temp[num]