The horizontal scrollbar was not showing up when viewing an email (#2028)

This commit is contained in:
Robert Stanfield 2016-05-06 19:44:30 -04:00 committed by Ben Gotow
parent e1f689de6f
commit be48fc4305
2 changed files with 9 additions and 3 deletions

View file

@ -97,13 +97,18 @@ export default class EmailFrame extends React.Component {
} }
_getFrameHeight = (doc) => { _getFrameHeight = (doc) => {
let height = 0;
if (doc && doc.body) { if (doc && doc.body) {
return doc.body.scrollHeight; height = doc.body.scrollHeight;
} }
if (doc && doc.documentElement) { if (doc && doc.documentElement) {
return doc.documentElement.scrollHeight; height = doc.documentElement.scrollHeight;
} }
return 0;
// scrollHeight does not include space required by scrollbar
return height + 25;
} }
_setFrameHeight = () => { _setFrameHeight = () => {

View file

@ -57,6 +57,7 @@
border: 0; border: 0;
margin: 0; margin: 0;
padding: 0; padding: 0;
overflow-x: auto;
-webkit-text-size-adjust: auto; -webkit-text-size-adjust: auto;
word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;