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-44760 editor_atto: Address issues with focus when closing menus

Browse Source 
Safari fires it's events in a slightly different order for the focusoutside
event which causes the focusAfterHide to be called *after* we change focus.

As a result, we must keep track of the menus which are currently open and
remove their focusAfterHide.
This commit is contained in:
Andrew Nicols 2014-04-09 15:26:32 +08:00
parent 28c247a735
commit c63f90539a
13 changed files with 105 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js vendored
View File

@ -626,15 +626,27 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
this._hideInvalidEntries(boundingBox);
// Clear the focusAfterHide for any other menus which may be open.
Y.Array.each(this.get('host').openMenus, function(menu) {
menu.set('focusAfterHide', null);
});
// Ensure that we focus on the button in the toolbar when we tab back to the menu.
var creatorButton = this.buttons[this.name];
this.get('host')._setTabFocus(creatorButton);
// Show the context menu, and align to the current position.
this._contextMenu.show();
this._contextMenu.align(this.buttons.table, [Y.WidgetPositionAlign.TL, Y.WidgetPositionAlign.BL]);
this._contextMenu.set('focusAfterHide', this.buttons[this.name]);
this._contextMenu.set('focusAfterHide', creatorButton);
// If there are any anchors in the bounding box, focus on the first.
if (boundingBox.one('a')) {
boundingBox.one('a').focus();
}
// Add this menu to the list of open menus.
this.get('host').openMenus = [this._contextMenu];
},
/**

4
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js vendored
View File

File diff suppressed because one or more lines are too long

14
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js vendored
View File

@ -626,15 +626,27 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
this._hideInvalidEntries(boundingBox);
// Clear the focusAfterHide for any other menus which may be open.
Y.Array.each(this.get('host').openMenus, function(menu) {
menu.set('focusAfterHide', null);
});
// Ensure that we focus on the button in the toolbar when we tab back to the menu.
var creatorButton = this.buttons[this.name];
this.get('host')._setTabFocus(creatorButton);
// Show the context menu, and align to the current position.
this._contextMenu.show();
this._contextMenu.align(this.buttons.table, [Y.WidgetPositionAlign.TL, Y.WidgetPositionAlign.BL]);
this._contextMenu.set('focusAfterHide', this.buttons[this.name]);
this._contextMenu.set('focusAfterHide', creatorButton);
// If there are any anchors in the bounding box, focus on the first.
if (boundingBox.one('a')) {
boundingBox.one('a').focus();
}
// Add this menu to the list of open menus.
this.get('host').openMenus = [this._contextMenu];
},
/**

14
lib/editor/atto/plugins/table/yui/src/button/js/button.js vendored
View File

@ -624,15 +624,27 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
this._hideInvalidEntries(boundingBox);
// Clear the focusAfterHide for any other menus which may be open.
Y.Array.each(this.get('host').openMenus, function(menu) {
menu.set('focusAfterHide', null);
});
// Ensure that we focus on the button in the toolbar when we tab back to the menu.
var creatorButton = this.buttons[this.name];
this.get('host')._setTabFocus(creatorButton);
// Show the context menu, and align to the current position.
this._contextMenu.show();
this._contextMenu.align(this.buttons.table, [Y.WidgetPositionAlign.TL, Y.WidgetPositionAlign.BL]);
this._contextMenu.set('focusAfterHide', this.buttons[this.name]);
this._contextMenu.set('focusAfterHide', creatorButton);
// If there are any anchors in the bounding box, focus on the first.
if (boundingBox.one('a')) {
boundingBox.one('a').focus();
}
// Add this menu to the list of open menus.
this.get('host').openMenus = [this._contextMenu];
},
/**

13
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js vendored
View File

@ -652,6 +652,14 @@ EditorToolbar.prototype = {
*/
toolbar: null,
/**
* A reference to any currently open menus in the toolbar.
*
* @property openMenus
* @type Array
*/
openMenus: null,
/**
* Setup the toolbar on the editor.
*
@ -660,6 +668,7 @@ EditorToolbar.prototype = {
*/
setupToolbar: function() {
this.toolbar = Y.Node.create('<div class="' + CSS.TOOLBAR + '" role="toolbar" aria-live="off"/>');
this.openMenus = [];
this._wrapper.appendChild(this.toolbar);
if (this.textareaLabel) {
@ -732,6 +741,10 @@ EditorToolbarNav.prototype = {
'down:37,39',
'.' + CSS.TOOLBAR,
this);
this._wrapper.delegate('focus',
function(e) {
this._setTabFocus(e.currentTarget);
}, '.' + CSS.TOOLBAR + ' button', this);
return this;
},

4
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js vendored
View File

File diff suppressed because one or more lines are too long

13
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js vendored
View File

@ -649,6 +649,14 @@ EditorToolbar.prototype = {
*/
toolbar: null,
/**
* A reference to any currently open menus in the toolbar.
*
* @property openMenus
* @type Array
*/
openMenus: null,
/**
* Setup the toolbar on the editor.
*
@ -657,6 +665,7 @@ EditorToolbar.prototype = {
*/
setupToolbar: function() {
this.toolbar = Y.Node.create('<div class="' + CSS.TOOLBAR + '" role="toolbar" aria-live="off"/>');
this.openMenus = [];
this._wrapper.appendChild(this.toolbar);
if (this.textareaLabel) {
@ -729,6 +738,10 @@ EditorToolbarNav.prototype = {
'down:37,39',
'.' + CSS.TOOLBAR,
this);
this._wrapper.delegate('focus',
function(e) {
this._setTabFocus(e.currentTarget);
}, '.' + CSS.TOOLBAR + ' button', this);
return this;
},

10
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-debug.js vendored
View File

@ -575,6 +575,11 @@ EditorPluginButtons.prototype = {
this._chooseMenuItem, '.atto_menuentry a', this, config);
}
// Clear the focusAfterHide for any other menus which may be open.
Y.Array.each(this.get('host').openMenus, function(menu) {
menu.set('focusAfterHide', null);
});
// Ensure that we focus on this button next time.
var creatorButton = this.buttons[config.buttonName];
creatorButton.focus();
@ -585,15 +590,14 @@ EditorPluginButtons.prototype = {
// Focus on the button by default after hiding this menu.
menuDialogue.set('focusAfterHide', creatorButton);
menuDialogue.on('focusAfterHide', function(e) {
console.log(e);
});
// Display the menu.
menuDialogue.show();
// Position it next to the button which opened it.
menuDialogue.align(this.buttons[config.buttonName], [Y.WidgetPositionAlign.TL, Y.WidgetPositionAlign.BL]);
this.get('host').openMenus = [menuDialogue];
},
/**

4
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js vendored
View File

File diff suppressed because one or more lines are too long

10
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin.js vendored
View File

@ -573,6 +573,11 @@ EditorPluginButtons.prototype = {
this._chooseMenuItem, '.atto_menuentry a', this, config);
}
// Clear the focusAfterHide for any other menus which may be open.
Y.Array.each(this.get('host').openMenus, function(menu) {
menu.set('focusAfterHide', null);
});
// Ensure that we focus on this button next time.
var creatorButton = this.buttons[config.buttonName];
creatorButton.focus();
@ -583,15 +588,14 @@ EditorPluginButtons.prototype = {
// Focus on the button by default after hiding this menu.
menuDialogue.set('focusAfterHide', creatorButton);
menuDialogue.on('focusAfterHide', function(e) {
console.log(e);
});
// Display the menu.
menuDialogue.show();
// Position it next to the button which opened it.
menuDialogue.align(this.buttons[config.buttonName], [Y.WidgetPositionAlign.TL, Y.WidgetPositionAlign.BL]);
this.get('host').openMenus = [menuDialogue];
},
/**

10
lib/editor/atto/yui/src/editor/js/editor-plugin-buttons.js vendored
View File

@ -427,6 +427,11 @@ EditorPluginButtons.prototype = {
this._chooseMenuItem, '.atto_menuentry a', this, config);
}
// Clear the focusAfterHide for any other menus which may be open.
Y.Array.each(this.get('host').openMenus, function(menu) {
menu.set('focusAfterHide', null);
});
// Ensure that we focus on this button next time.
var creatorButton = this.buttons[config.buttonName];
creatorButton.focus();
@ -437,15 +442,14 @@ EditorPluginButtons.prototype = {
// Focus on the button by default after hiding this menu.
menuDialogue.set('focusAfterHide', creatorButton);
menuDialogue.on('focusAfterHide', function(e) {
console.log(e);
});
// Display the menu.
menuDialogue.show();
// Position it next to the button which opened it.
menuDialogue.align(this.buttons[config.buttonName], [Y.WidgetPositionAlign.TL, Y.WidgetPositionAlign.BL]);
this.get('host').openMenus = [menuDialogue];
},
/**

4
lib/editor/atto/yui/src/editor/js/toolbar-keyboardnav.js vendored
View File

@ -56,6 +56,10 @@ EditorToolbarNav.prototype = {
'down:37,39',
'.' + CSS.TOOLBAR,
this);
this._wrapper.delegate('focus',
function(e) {
this._setTabFocus(e.currentTarget);
}, '.' + CSS.TOOLBAR + ' button', this);
return this;
},

9
lib/editor/atto/yui/src/editor/js/toolbar.js vendored
View File

@ -41,6 +41,14 @@ EditorToolbar.prototype = {
*/
toolbar: null,
/**
* A reference to any currently open menus in the toolbar.
*
* @property openMenus
* @type Array
*/
openMenus: null,
/**
* Setup the toolbar on the editor.
*
@ -49,6 +57,7 @@ EditorToolbar.prototype = {
*/
setupToolbar: function() {
this.toolbar = Y.Node.create('<div class="' + CSS.TOOLBAR + '" role="toolbar" aria-live="off"/>');
this.openMenus = [];
this._wrapper.appendChild(this.toolbar);
if (this.textareaLabel) {