MDL-47500 scorm: improved height calculation

This commit is contained in:
Brian Barnes 2015-03-13 11:46:32 +13:00 committed by Dan Marsden
parent 577bd70d38
commit ea6763e421
2 changed files with 9 additions and 3 deletions

View file

@ -298,9 +298,11 @@ M.mod_scorm.init = function(Y, nav_display, navposition_left, navposition_top, h
}
// Calculate the rough new height from the viewport height.
newheight = Y.one('body').get('winHeight') - 5;
if (newheight < 600) {
newheight = 600;
var newheight = Y.one('body').get('winHeight') - 5
- Y.one('#scorm_layout').getY()
- window.pageYOffset;
if (newheight < 680 || isNaN(newheight)) {
newheight = 680;
}
Y.one('#scorm_layout').setStyle('height', newheight);

View file

@ -269,6 +269,10 @@
word-spacing: -0.43em;
}
#scorm_layout {
margin-bottom: 50px;
}
/**
* Opera as of 12 on Windows needs word-spacing.
* The ".opera-only" selector is used to prevent actual prefocus styling