Merge branch 'MDL-56768-master-fix1' of http://github.com/damyon/moodle

robjoyce · Nov 11, 2016 · 9c56f90 · 9c56f90
2 parents 3ecf492 + 7becb39
commit 9c56f90
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...e-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-debug.js b/...e-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-debug.js
@@ -973,7 +973,7 @@ FloatingHeaders.prototype = {
         } else {
             floatingUserRelativePoint = Y.config.win.pageXOffset + bodyMargin;
             floatingUserTriggerPoint = floatingUserRelativePoint + this.dockWidth + bodyMargin;
-            userFloats = floatingUserTriggerPoint > this.firstUserCellLeft;
+            userFloats = floatingUserTriggerPoint > this.firstUserCellLeft + bodyMargin;
             leftTitleFloats = floatingUserTriggerPoint > (this.firstNonUserCellLeft - this.firstUserCellWidth);
         }
 

diff --git a/...dle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-min.js b/...dle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-min.js
diff --git a/.../moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable.js b/.../moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable.js
@@ -972,7 +972,7 @@ FloatingHeaders.prototype = {
         } else {
             floatingUserRelativePoint = Y.config.win.pageXOffset + bodyMargin;
             floatingUserTriggerPoint = floatingUserRelativePoint + this.dockWidth + bodyMargin;
-            userFloats = floatingUserTriggerPoint > this.firstUserCellLeft;
+            userFloats = floatingUserTriggerPoint > this.firstUserCellLeft + bodyMargin;
             leftTitleFloats = floatingUserTriggerPoint > (this.firstNonUserCellLeft - this.firstUserCellWidth);
         }
 

diff --git a/grade/report/grader/yui/src/gradereporttable/js/floatingheaders.js b/grade/report/grader/yui/src/gradereporttable/js/floatingheaders.js
@@ -829,7 +829,7 @@ FloatingHeaders.prototype = {
         } else {
             floatingUserRelativePoint = Y.config.win.pageXOffset + bodyMargin;
             floatingUserTriggerPoint = floatingUserRelativePoint + this.dockWidth + bodyMargin;
-            userFloats = floatingUserTriggerPoint > this.firstUserCellLeft;
+            userFloats = floatingUserTriggerPoint > this.firstUserCellLeft + bodyMargin;
             leftTitleFloats = floatingUserTriggerPoint > (this.firstNonUserCellLeft - this.firstUserCellWidth);
         }