Merge branch 'MDL-50312_master' of https://github.com/jinhofer/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 08:07:13 +0000 (08:07 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 08:07:13 +0000 (08:07 +0000)
grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-debug.js
grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-min.js
grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable.js
grade/report/grader/yui/src/gradereporttable/js/floatingheaders.js

index eee8576..bb75576 100644 (file)
Binary files a/grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-debug.js and b/grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-debug.js differ
index 1ad586e..a151a1b 100644 (file)
Binary files a/grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-min.js and b/grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-min.js differ
index 9636d4e..6fcd0dd 100644 (file)
Binary files a/grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable.js and b/grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable.js differ
index e4e78f2..6d496bb 100644 (file)
@@ -932,9 +932,24 @@ FloatingHeaders.prototype = {
         var userCells = Y.all(SELECTORS.USERCELL);
         this.userColumnHeader.one('.cell').setStyle('width', userWidth);
         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({
                 width: userWidth,
-                height: userCells.item(idx).getComputedStyle(HEIGHT)
+                height: height
             });
         }, this);