moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-58515-master' of https://github.com/lucisgit/moodle

Browse source
This commit is contained in:
Andrew Nicols 2017-04-20 13:03:34 +08:00
commit 9517ea662d
5 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mod/assign/feedback/editpdf/styles.css
View file

@ -314,6 +314,12 @@ ul.assignfeedback_editpdf_menu {
min-height: 1.2em; min-height: 1.2em;
} }
.assignfeedback_editpdf_widget .commentdrawable textarea:focus {
outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
.assignfeedback_editpdf_widget .commentdrawable { .assignfeedback_editpdf_widget .commentdrawable {
display: inline-block; display: inline-block;
z-index: 1; z-index: 1;

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

@ -2562,6 +2562,7 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
container.setAttribute('tabindex', '-1'); container.setAttribute('tabindex', '-1');
label.setAttribute('tabindex', '0'); label.setAttribute('tabindex', '0');
node.setAttribute('tabindex', '-1'); node.setAttribute('tabindex', '-1');
menu.setAttribute('tabindex', '0');
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
container.append(menu); container.append(menu);
@ -2681,6 +2682,8 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
if (node.collapse.delay) { if (node.collapse.delay) {
node.collapse.delay.cancel(); node.collapse.delay.cancel();
} }
// Give comment a tabindex to prevent focus outline being suppressed.
node.setAttribute('tabindex', '0');
// Expand comment and pass focus to it. // Expand comment and pass focus to it.
node.expand(); node.expand();
node.focus(); node.focus();
@ -2697,7 +2700,10 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
label.setAttribute('tabindex', '0'); label.setAttribute('tabindex', '0');
}, this); }, this);
// Always restore label tabindex when leaving. // Always restore the default tabindex states when moving away.
node.on('blur', function() {
node.setAttribute('tabindex', '-1');
}, this);
label.on('blur', function() { label.on('blur', function() {
label.setAttribute('tabindex', '0'); label.setAttribute('tabindex', '0');
}, this); }, this);

12
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

8
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js vendored
View file

@ -2562,6 +2562,7 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
container.setAttribute('tabindex', '-1'); container.setAttribute('tabindex', '-1');
label.setAttribute('tabindex', '0'); label.setAttribute('tabindex', '0');
node.setAttribute('tabindex', '-1'); node.setAttribute('tabindex', '-1');
menu.setAttribute('tabindex', '0');
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
container.append(menu); container.append(menu);
@ -2681,6 +2682,8 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
if (node.collapse.delay) { if (node.collapse.delay) {
node.collapse.delay.cancel(); node.collapse.delay.cancel();
} }
// Give comment a tabindex to prevent focus outline being suppressed.
node.setAttribute('tabindex', '0');
// Expand comment and pass focus to it. // Expand comment and pass focus to it.
node.expand(); node.expand();
node.focus(); node.focus();
@ -2697,7 +2700,10 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
label.setAttribute('tabindex', '0'); label.setAttribute('tabindex', '0');
}, this); }, this);
// Always restore label tabindex when leaving. // Always restore the default tabindex states when moving away.
node.on('blur', function() {
node.setAttribute('tabindex', '-1');
}, this);
label.on('blur', function() { label.on('blur', function() {
label.setAttribute('tabindex', '0'); label.setAttribute('tabindex', '0');
}, this); }, this);

8
mod/assign/feedback/editpdf/yui/src/editor/js/comment.js vendored
View file

@ -185,6 +185,7 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
container.setAttribute('tabindex', '-1'); container.setAttribute('tabindex', '-1');
label.setAttribute('tabindex', '0'); label.setAttribute('tabindex', '0');
node.setAttribute('tabindex', '-1'); node.setAttribute('tabindex', '-1');
menu.setAttribute('tabindex', '0');
if (!this.editor.get('readonly')) { if (!this.editor.get('readonly')) {
container.append(menu); container.append(menu);
@ -304,6 +305,8 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
if (node.collapse.delay) { if (node.collapse.delay) {
node.collapse.delay.cancel(); node.collapse.delay.cancel();
} }
// Give comment a tabindex to prevent focus outline being suppressed.
node.setAttribute('tabindex', '0');
// Expand comment and pass focus to it. // Expand comment and pass focus to it.
node.expand(); node.expand();
node.focus(); node.focus();
@ -320,7 +323,10 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
label.setAttribute('tabindex', '0'); label.setAttribute('tabindex', '0');
}, this); }, this);
// Always restore label tabindex when leaving. // Always restore the default tabindex states when moving away.
node.on('blur', function() {
node.setAttribute('tabindex', '-1');
}, this);
label.on('blur', function() { label.on('blur', function() {
label.setAttribute('tabindex', '0'); label.setAttribute('tabindex', '0');
}, this); }, this);