Skip to content

Commit

Permalink
Merge branch 'MDL-65679-37-fix' of git://github.com/andrewnicols/mood…
Browse files Browse the repository at this point in the history 
…le into MOODLE_37_STABLE
  • Loading branch information
@junpataleta
junpataleta committed Aug 9, 2019
2 parents 1e364a4 + d798b75 commit d92b3f2
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 26 deletions.
9 changes: 8 additions & 1 deletion mod/assign/feedback/editpdf/styles.css
View file
Expand Up @@ -343,9 +343,16 @@ ul.assignfeedback_editpdf_menu {

.assignfeedback_editpdf_widget .commentdrawable {
display: flex;
z-index: 50;
z-index: 52;
height: 0;
}
.assignfeedback_editpdf_widget .annotation {
z-index: 51;
}

.assignfeedback_editpdf_widget .deleteannotationbutton {
z-index: 51;
}

.assignfeedback_editpdf_widget .commentdrawable label {
display: inline-block;
Expand Down
11 changes: 6 additions & 5 deletions .../build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
View file
Expand Up @@ -732,7 +732,6 @@ Y.extend(ANNOTATION, Y.Base, {

drawingregion.append(deletelink);
deletelink.setData('annotation', this);
deletelink.setStyle('zIndex', '200');

deletelink.on('click', this.remove, this);
deletelink.on('key', this.remove, 'space,enter', this);
Expand Down Expand Up @@ -1576,14 +1575,15 @@ 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/>');
node.addClass('annotation');
node.addClass('stamp');
node.setStyles({
'position': 'absolute',
'display': 'inline-block',
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(this.path) + ')',
'width': (this.endx - this.x),
'height': (this.endy - this.y),
'backgroundSize': '100% 100%',
'zIndex': 50
'backgroundSize': '100% 100%'
});

drawingcanvas.append(node);
Expand Down Expand Up @@ -1623,14 +1623,15 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(bounds.x, bounds.y));

node = Y.Node.create('<div/>');
node.addClass('annotation');
node.addClass('stamp');
node.setStyles({
'position': 'absolute',
'display': 'inline-block',
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(edit.stamp) + ')',
'width': bounds.width,
'height': bounds.height,
'backgroundSize': '100% 100%',
'zIndex': 50
'backgroundSize': '100% 100%'
});

drawingregion.append(node);
Expand Down
20 changes: 10 additions & 10 deletions ...ui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
View file

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions ...df/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
View file
Expand Up @@ -732,7 +732,6 @@ Y.extend(ANNOTATION, Y.Base, {

drawingregion.append(deletelink);
deletelink.setData('annotation', this);
deletelink.setStyle('zIndex', '200');

deletelink.on('click', this.remove, this);
deletelink.on('key', this.remove, 'space,enter', this);
Expand Down Expand Up @@ -1576,14 +1575,15 @@ 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/>');
node.addClass('annotation');
node.addClass('stamp');
node.setStyles({
'position': 'absolute',
'display': 'inline-block',
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(this.path) + ')',
'width': (this.endx - this.x),
'height': (this.endy - this.y),
'backgroundSize': '100% 100%',
'zIndex': 50
'backgroundSize': '100% 100%'
});

drawingcanvas.append(node);
Expand Down Expand Up @@ -1623,14 +1623,15 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(bounds.x, bounds.y));

node = Y.Node.create('<div/>');
node.addClass('annotation');
node.addClass('stamp');
node.setStyles({
'position': 'absolute',
'display': 'inline-block',
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(edit.stamp) + ')',
'width': bounds.width,
'height': bounds.height,
'backgroundSize': '100% 100%',
'zIndex': 50
'backgroundSize': '100% 100%'
});

drawingregion.append(node);
Expand Down
1 change: 0 additions & 1 deletion mod/assign/feedback/editpdf/yui/src/editor/js/annotation.js
View file
Expand Up @@ -212,7 +212,6 @@ Y.extend(ANNOTATION, Y.Base, {

drawingregion.append(deletelink);
deletelink.setData('annotation', this);
deletelink.setStyle('zIndex', '200');

deletelink.on('click', this.remove, this);
deletelink.on('key', this.remove, 'space,enter', this);
Expand Down
10 changes: 6 additions & 4 deletions mod/assign/feedback/editpdf/yui/src/editor/js/annotationstamp.js
View file
Expand Up @@ -49,14 +49,15 @@ 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/>');
node.addClass('annotation');
node.addClass('stamp');
node.setStyles({
'position': 'absolute',
'display': 'inline-block',
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(this.path) + ')',
'width': (this.endx - this.x),
'height': (this.endy - this.y),
'backgroundSize': '100% 100%',
'zIndex': 50
'backgroundSize': '100% 100%'
});

drawingcanvas.append(node);
Expand Down Expand Up @@ -96,14 +97,15 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(bounds.x, bounds.y));

node = Y.Node.create('<div/>');
node.addClass('annotation');
node.addClass('stamp');
node.setStyles({
'position': 'absolute',
'display': 'inline-block',
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(edit.stamp) + ')',
'width': bounds.width,
'height': bounds.height,
'backgroundSize': '100% 100%',
'zIndex': 50
'backgroundSize': '100% 100%'
});

drawingregion.append(node);
Expand Down

0 comments on commit d92b3f2

Please sign in to comment.