libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-08 03:02:03 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3048 from danfuzz/fix-first-line-margin-top

Browse source 
Account for any top margin on the first line.
This commit is contained in:
Luiza Pagliari 2016-09-08 05:59:36 -03:00 committed by GitHub
commit 5022912895
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/static/js/ace2_inner.js
View file

@ -5459,8 +5459,17 @@ function Ace2Inner(){
// and the line-numbers don't line up unless we pay // and the line-numbers don't line up unless we pay
// attention to where the divs are actually placed... // attention to where the divs are actually placed...
// (also: padding on TTs/SPANs in IE...) // (also: padding on TTs/SPANs in IE...)
if (b === doc.body.firstChild) {
// It's the first line. For line number alignment purposes, its
// height is taken to be the top offset of the next line. If we
// didn't do this special case, we would miss out on any top margin
// included on the first line. The default stylesheet doesn't add
// extra margins, but plugins might.
h = b.nextSibling.offsetTop;
} else {
h = b.nextSibling.offsetTop - b.offsetTop; h = b.nextSibling.offsetTop - b.offsetTop;
} }
}
if (h) if (h)
{ {
var hpx = h + "px"; var hpx = h + "px";