Skip to content

Commit d92b3f2

Browse files
junpataletajunpataleta
committed
Merge branch 'MDL-65679-37-fix' of git://github.com/andrewnicols/moodle into MOODLE_37_STABLE
2 parents 1e364a4 + d798b75 commit d92b3f2

File tree

6 files changed

+36
-26
lines changed

6 files changed

+36
-26
lines changed

‎mod/assign/feedback/editpdf/styles.css‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,16 @@ ul.assignfeedback_editpdf_menu {
343343

344344
.assignfeedback_editpdf_widget .commentdrawable {
345345
display: flex;
346-
z-index: 50;
346+
z-index: 52;
347347
height: 0;
348348
}
349+
.assignfeedback_editpdf_widget .annotation {
350+
z-index: 51;
351+
}
352+
353+
.assignfeedback_editpdf_widget .deleteannotationbutton {
354+
z-index: 51;
355+
}
349356

350357
.assignfeedback_editpdf_widget .commentdrawable label {
351358
display: inline-block;

‎mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,6 @@ Y.extend(ANNOTATION, Y.Base, {
732732

733733
drawingregion.append(deletelink);
734734
deletelink.setData('annotation', this);
735-
deletelink.setStyle('zIndex', '200');
736735

737736
deletelink.on('click', this.remove, this);
738737
deletelink.on('key', this.remove, 'space,enter', this);
@@ -1576,14 +1575,15 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
15761575

15771576
position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x, this.y));
15781577
node = Y.Node.create('<div/>');
1578+
node.addClass('annotation');
1579+
node.addClass('stamp');
15791580
node.setStyles({
15801581
'position': 'absolute',
15811582
'display': 'inline-block',
15821583
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(this.path) + ')',
15831584
'width': (this.endx - this.x),
15841585
'height': (this.endy - this.y),
1585-
'backgroundSize': '100% 100%',
1586-
'zIndex': 50
1586+
'backgroundSize': '100% 100%'
15871587
});
15881588

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

16251625
node = Y.Node.create('<div/>');
1626+
node.addClass('annotation');
1627+
node.addClass('stamp');
16261628
node.setStyles({
16271629
'position': 'absolute',
16281630
'display': 'inline-block',
16291631
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(edit.stamp) + ')',
16301632
'width': bounds.width,
16311633
'height': bounds.height,
1632-
'backgroundSize': '100% 100%',
1633-
'zIndex': 50
1634+
'backgroundSize': '100% 100%'
16341635
});
16351636

16361637
drawingregion.append(node);

‎mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,6 @@ Y.extend(ANNOTATION, Y.Base, {
732732

733733
drawingregion.append(deletelink);
734734
deletelink.setData('annotation', this);
735-
deletelink.setStyle('zIndex', '200');
736735

737736
deletelink.on('click', this.remove, this);
738737
deletelink.on('key', this.remove, 'space,enter', this);
@@ -1576,14 +1575,15 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
15761575

15771576
position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x, this.y));
15781577
node = Y.Node.create('<div/>');
1578+
node.addClass('annotation');
1579+
node.addClass('stamp');
15791580
node.setStyles({
15801581
'position': 'absolute',
15811582
'display': 'inline-block',
15821583
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(this.path) + ')',
15831584
'width': (this.endx - this.x),
15841585
'height': (this.endy - this.y),
1585-
'backgroundSize': '100% 100%',
1586-
'zIndex': 50
1586+
'backgroundSize': '100% 100%'
15871587
});
15881588

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

16251625
node = Y.Node.create('<div/>');
1626+
node.addClass('annotation');
1627+
node.addClass('stamp');
16261628
node.setStyles({
16271629
'position': 'absolute',
16281630
'display': 'inline-block',
16291631
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(edit.stamp) + ')',
16301632
'width': bounds.width,
16311633
'height': bounds.height,
1632-
'backgroundSize': '100% 100%',
1633-
'zIndex': 50
1634+
'backgroundSize': '100% 100%'
16341635
});
16351636

16361637
drawingregion.append(node);

‎mod/assign/feedback/editpdf/yui/src/editor/js/annotation.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ Y.extend(ANNOTATION, Y.Base, {
212212

213213
drawingregion.append(deletelink);
214214
deletelink.setData('annotation', this);
215-
deletelink.setStyle('zIndex', '200');
216215

217216
deletelink.on('click', this.remove, this);
218217
deletelink.on('key', this.remove, 'space,enter', this);

‎mod/assign/feedback/editpdf/yui/src/editor/js/annotationstamp.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,15 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
4949

5050
position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x, this.y));
5151
node = Y.Node.create('<div/>');
52+
node.addClass('annotation');
53+
node.addClass('stamp');
5254
node.setStyles({
5355
'position': 'absolute',
5456
'display': 'inline-block',
5557
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(this.path) + ')',
5658
'width': (this.endx - this.x),
5759
'height': (this.endy - this.y),
58-
'backgroundSize': '100% 100%',
59-
'zIndex': 50
60+
'backgroundSize': '100% 100%'
6061
});
6162

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

9899
node = Y.Node.create('<div/>');
100+
node.addClass('annotation');
101+
node.addClass('stamp');
99102
node.setStyles({
100103
'position': 'absolute',
101104
'display': 'inline-block',
102105
'backgroundImage': 'url(' + this.editor.get_stamp_image_url(edit.stamp) + ')',
103106
'width': bounds.width,
104107
'height': bounds.height,
105-
'backgroundSize': '100% 100%',
106-
'zIndex': 50
108+
'backgroundSize': '100% 100%'
107109
});
108110

109111
drawingregion.append(node);

0 commit comments

Comments
 (0)