mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-65484-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Adrian Greeve 2019-05-08 11:21:59 +08:00
commit bf23d85bf7
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js vendored
View File

@ -1576,8 +1576,9 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x, this.y));
node = Y.Node.create('<div/>');
// If these are absolutely positioned, they escape their scroll container.
node.setStyles({
'position': 'absolute',
'position': 'relative',
'display': 'inline-block',
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(this.path) + ')',
'width': (this.endx - this.x),
@ -2587,7 +2588,7 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
});
drawingregion.append(container);
container.setStyle('position', 'absolute');
container.setStyle('position', 'relative');
container.setX(position.x);
container.setY(position.y);
drawable.store_position(container, position.x, position.y);

4
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js vendored
View File

File diff suppressed because one or more lines are too long

5
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js vendored
View File

@ -1576,8 +1576,9 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x, this.y));
node = Y.Node.create('<div/>');
// If these are absolutely positioned, they escape their scroll container.
node.setStyles({
'position': 'absolute',
'position': 'relative',
'display': 'inline-block',
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(this.path) + ')',
'width': (this.endx - this.x),
@ -2587,7 +2588,7 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
});
drawingregion.append(container);
container.setStyle('position', 'absolute');
container.setStyle('position', 'relative');
container.setX(position.x);
container.setY(position.y);
drawable.store_position(container, position.x, position.y);

3
mod/assign/feedback/editpdf/yui/src/editor/js/annotationstamp.js vendored
View File

@ -49,8 +49,9 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x, this.y));
node = Y.Node.create('<div/>');
// If these are absolutely positioned, they escape their scroll container.
node.setStyles({
'position': 'absolute',
'position': 'relative',
'display': 'inline-block',
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(this.path) + ')',
'width': (this.endx - this.x),

2
mod/assign/feedback/editpdf/yui/src/editor/js/comment.js vendored
View File

@ -204,7 +204,7 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
});
drawingregion.append(container);
container.setStyle('position', 'absolute');
container.setStyle('position', 'relative');
container.setX(position.x);
container.setY(position.y);
drawable.store_position(container, position.x, position.y);