Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-22 15:15:12 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(email-frame): Prioritize documentElement for scroll height

Browse source
This commit is contained in:
Jackie Luo 2016-11-02 15:28:18 -07:00
parent ff2e626037
commit e1a5e6e1ea
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal_packages/message-list/lib/email-frame.jsx
View file

@ -110,11 +110,13 @@ export default class EmailFrame extends React.Component {
if (style.height === '0px') { if (style.height === '0px') {
doc.body.style.height = "auto" doc.body.style.height = "auto"
} }
height = doc.body.scrollHeight;
} }
if (doc && doc.documentElement) { if (doc && doc.documentElement) {
height = Math.max(height, doc.documentElement.scrollHeight); height = doc.documentElement.scrollHeight;
console.log("documentElement.scrollHeight = " + doc.documentElement.scrollHeight)
} else {
height = doc.body.scrollHeight;
} }
// scrollHeight does not include space required by scrollbar // scrollHeight does not include space required by scrollbar