mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-46962 gradereport_grader: Correct positioning when using RTL languages

Browse Source 
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
This commit is contained in:
Frederic Massart 2014-08-27 16:47:45 +08:00 committed by Andrew Nicols
parent 10ce95aae3
commit 7dc48b4629
4 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-debug.js vendored
View File

@ -479,7 +479,7 @@ FloatingHeaders.prototype = {
var userCellList = Y.all(SELECTORS.USERCELL);
// The left of the user cells matches the left of the headerRow.
this.firstUserCellLeft = this.headerRow.getX();
this.firstUserCellLeft = this.firstUserCell.getX();
if (userCellList.size() > 1) {
// Use the top of the second cell for the bottom of the first cell.
@ -839,7 +839,11 @@ FloatingHeaders.prototype = {
userColumnHeaderStyles = {},
userColumnStyles = {},
footerStyles = {},
coord = 0;
coord = 0,
userCellWidth = 0,
floatUserColumn = false, // Whether or not the user column should float.
floatingUserTriggerPoint = 0, // The X position at which the floating should start.
floatingUserRelativePoint = 0; // The point to use when calculating the new position.
// Header position.
gradeItemHeadingContainerStyles.left = this._getRelativeXFromX(this.headerRow.getX());
@ -860,8 +864,18 @@ FloatingHeaders.prototype = {
}
// User column position.
if (Y.config.win.pageXOffset > this.firstUserCellLeft) {
coord = this._getRelativeXFromX(Y.config.win.pageXOffset);
if (right_to_left()) {
userCellWidth = this.firstUserCell.get(OFFSETWIDTH);
floatingUserTriggerPoint = Y.config.win.innerWidth + Y.config.win.pageXOffset;
floatingUserRelativePoint = floatingUserTriggerPoint - userCellWidth;
floatUserColumn = floatingUserTriggerPoint < (this.firstUserCellLeft + userCellWidth);
} else {
floatingUserTriggerPoint = Y.config.win.pageXOffset;
floatingUserRelativePoint = floatingUserTriggerPoint;
floatUserColumn = floatingUserTriggerPoint > this.firstUserCellLeft;
}
if (floatUserColumn) {
coord = this._getRelativeXFromX(floatingUserRelativePoint);
userColumnStyles.left = coord + 'px';
userColumnHeaderStyles.left = coord + 'px';
} else {

4
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

22
grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable.js vendored
View File

@ -479,7 +479,7 @@ FloatingHeaders.prototype = {
var userCellList = Y.all(SELECTORS.USERCELL);
// The left of the user cells matches the left of the headerRow.
this.firstUserCellLeft = this.headerRow.getX();
this.firstUserCellLeft = this.firstUserCell.getX();
if (userCellList.size() > 1) {
// Use the top of the second cell for the bottom of the first cell.
@ -838,7 +838,11 @@ FloatingHeaders.prototype = {
userColumnHeaderStyles = {},
userColumnStyles = {},
footerStyles = {},
coord = 0;
coord = 0,
userCellWidth = 0,
floatUserColumn = false, // Whether or not the user column should float.
floatingUserTriggerPoint = 0, // The X position at which the floating should start.
floatingUserRelativePoint = 0; // The point to use when calculating the new position.
// Header position.
gradeItemHeadingContainerStyles.left = this._getRelativeXFromX(this.headerRow.getX());
@ -859,8 +863,18 @@ FloatingHeaders.prototype = {
}
// User column position.
if (Y.config.win.pageXOffset > this.firstUserCellLeft) {
coord = this._getRelativeXFromX(Y.config.win.pageXOffset);
if (right_to_left()) {
userCellWidth = this.firstUserCell.get(OFFSETWIDTH);
floatingUserTriggerPoint = Y.config.win.innerWidth + Y.config.win.pageXOffset;
floatingUserRelativePoint = floatingUserTriggerPoint - userCellWidth;
floatUserColumn = floatingUserTriggerPoint < (this.firstUserCellLeft + userCellWidth);
} else {
floatingUserTriggerPoint = Y.config.win.pageXOffset;
floatingUserRelativePoint = floatingUserTriggerPoint;
floatUserColumn = floatingUserTriggerPoint > this.firstUserCellLeft;
}
if (floatUserColumn) {
coord = this._getRelativeXFromX(floatingUserRelativePoint);
userColumnStyles.left = coord + 'px';
userColumnHeaderStyles.left = coord + 'px';
} else {

22
grade/report/grader/yui/src/gradereporttable/js/floatingheaders.js vendored
View File

@ -231,7 +231,7 @@ FloatingHeaders.prototype = {
var userCellList = Y.all(SELECTORS.USERCELL);
// The left of the user cells matches the left of the headerRow.
this.firstUserCellLeft = this.headerRow.getX();
this.firstUserCellLeft = this.firstUserCell.getX();
if (userCellList.size() > 1) {
// Use the top of the second cell for the bottom of the first cell.
@ -591,7 +591,11 @@ FloatingHeaders.prototype = {
userColumnHeaderStyles = {},
userColumnStyles = {},
footerStyles = {},
coord = 0;
coord = 0,
userCellWidth = 0,
floatUserColumn = false, // Whether or not the user column should float.
floatingUserTriggerPoint = 0, // The X position at which the floating should start.
floatingUserRelativePoint = 0; // The point to use when calculating the new position.
// Header position.
gradeItemHeadingContainerStyles.left = this._getRelativeXFromX(this.headerRow.getX());
@ -612,8 +616,18 @@ FloatingHeaders.prototype = {
}
// User column position.
if (Y.config.win.pageXOffset > this.firstUserCellLeft) {
coord = this._getRelativeXFromX(Y.config.win.pageXOffset);
if (right_to_left()) {
userCellWidth = this.firstUserCell.get(OFFSETWIDTH);
floatingUserTriggerPoint = Y.config.win.innerWidth + Y.config.win.pageXOffset;
floatingUserRelativePoint = floatingUserTriggerPoint - userCellWidth;
floatUserColumn = floatingUserTriggerPoint < (this.firstUserCellLeft + userCellWidth);
} else {
floatingUserTriggerPoint = Y.config.win.pageXOffset;
floatingUserRelativePoint = floatingUserTriggerPoint;
floatUserColumn = floatingUserTriggerPoint > this.firstUserCellLeft;
}
if (floatUserColumn) {
coord = this._getRelativeXFromX(floatingUserRelativePoint);
userColumnStyles.left = coord + 'px';
userColumnHeaderStyles.left = coord + 'px';
} else {