moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-50312_master' of https://github.com/jinhofer/moodle

Browse source
This commit is contained in:
Dan Poltawski 2016-02-23 08:07:13 +00:00
commit 2c720c9772
4 changed files with 50 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-debug.js vendored
View file

@ -1075,9 +1075,24 @@ FloatingHeaders.prototype = {
var userCells = Y.all(SELECTORS.USERCELL); var userCells = Y.all(SELECTORS.USERCELL);
this.userColumnHeader.one('.cell').setStyle('width', userWidth); this.userColumnHeader.one('.cell').setStyle('width', userWidth);
this.userColumn.all('.cell').each(function(cell, idx) { this.userColumn.all('.cell').each(function(cell, idx) {
var height = userCells.item(idx).getComputedStyle(HEIGHT);
// Nasty hack to account for Internet Explorer
if(Y.UA.ie !== 0) {
var node = userCells.item(idx);
var allHeight = node.getDOMNode ?
node.getDOMNode().getBoundingClientRect().height :
node.get('offsetHeight');
var marginHeight = parseInt(node.getComputedStyle('marginTop'),10) +
parseInt(node.getComputedStyle('marginBottom'),10);
var paddingHeight = parseInt(node.getComputedStyle('paddingTop'),10) +
parseInt(node.getComputedStyle('paddingBottom'),10);
var borderHeight = parseInt(node.getComputedStyle('borderTopWidth'),10) +
parseInt(node.getComputedStyle('borderBottomWidth'),10);
height = allHeight - marginHeight - paddingHeight - borderHeight;
}
cell.setStyles({ cell.setStyles({
width: userWidth, width: userWidth,
height: userCells.item(idx).getComputedStyle(HEIGHT) height: height
}); });
}, this); }, this);

3
grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-min.js vendored
View file

File diff suppressed because one or more lines are too long

17
grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable.js vendored
View file

@ -1074,9 +1074,24 @@ FloatingHeaders.prototype = {
var userCells = Y.all(SELECTORS.USERCELL); var userCells = Y.all(SELECTORS.USERCELL);
this.userColumnHeader.one('.cell').setStyle('width', userWidth); this.userColumnHeader.one('.cell').setStyle('width', userWidth);
this.userColumn.all('.cell').each(function(cell, idx) { this.userColumn.all('.cell').each(function(cell, idx) {
var height = userCells.item(idx).getComputedStyle(HEIGHT);
// Nasty hack to account for Internet Explorer
if(Y.UA.ie !== 0) {
var node = userCells.item(idx);
var allHeight = node.getDOMNode ?
node.getDOMNode().getBoundingClientRect().height :
node.get('offsetHeight');
var marginHeight = parseInt(node.getComputedStyle('marginTop'),10) +
parseInt(node.getComputedStyle('marginBottom'),10);
var paddingHeight = parseInt(node.getComputedStyle('paddingTop'),10) +
parseInt(node.getComputedStyle('paddingBottom'),10);
var borderHeight = parseInt(node.getComputedStyle('borderTopWidth'),10) +
parseInt(node.getComputedStyle('borderBottomWidth'),10);
height = allHeight - marginHeight - paddingHeight - borderHeight;
}
cell.setStyles({ cell.setStyles({
width: userWidth, width: userWidth,
height: userCells.item(idx).getComputedStyle(HEIGHT) height: height
}); });
}, this); }, this);

17
grade/report/grader/yui/src/gradereporttable/js/floatingheaders.js vendored
View file

@ -932,9 +932,24 @@ FloatingHeaders.prototype = {
var userCells = Y.all(SELECTORS.USERCELL); var userCells = Y.all(SELECTORS.USERCELL);
this.userColumnHeader.one('.cell').setStyle('width', userWidth); this.userColumnHeader.one('.cell').setStyle('width', userWidth);
this.userColumn.all('.cell').each(function(cell, idx) { this.userColumn.all('.cell').each(function(cell, idx) {
var height = userCells.item(idx).getComputedStyle(HEIGHT);
// Nasty hack to account for Internet Explorer
if(Y.UA.ie !== 0) {
var node = userCells.item(idx);
var allHeight = node.getDOMNode ?
node.getDOMNode().getBoundingClientRect().height :
node.get('offsetHeight');
var marginHeight = parseInt(node.getComputedStyle('marginTop'),10) +
parseInt(node.getComputedStyle('marginBottom'),10);
var paddingHeight = parseInt(node.getComputedStyle('paddingTop'),10) +
parseInt(node.getComputedStyle('paddingBottom'),10);
var borderHeight = parseInt(node.getComputedStyle('borderTopWidth'),10) +
parseInt(node.getComputedStyle('borderBottomWidth'),10);
height = allHeight - marginHeight - paddingHeight - borderHeight;
}
cell.setStyles({ cell.setStyles({
width: userWidth, width: userWidth,
height: userCells.item(idx).getComputedStyle(HEIGHT) height: height
}); });
}, this); }, this);