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

MDL-70580 core: Tree nodes should check if they were clicked directly

Browse Source
This commit is contained in:
Andrew Nicols 2021-01-11 13:33:22 +08:00 committed by Paul Holden
parent ed2400457b
commit d0bc893972
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/amd/build/tree.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/amd/build/tree.min.js.map
View File

File diff suppressed because one or more lines are too long

34
lib/amd/src/tree.js
View File

@ -349,12 +349,12 @@ define(['jquery'], function($) {
* Handle a key down event - ie navigate the tree.
*
* @method handleKeyDown
* @param {Object} item is the jquery id of the parent item of the group.
* @param {Event} e The event.
*/
// This function should be simplified. In the meantime..
// eslint-disable-next-line complexity
Tree.prototype.handleKeyDown = function(item, e) {
Tree.prototype.handleKeyDown = function(e) {
var item = $(e.target);
var currentIndex = this.getVisibleItems().index(item);
if ((e.altKey || e.ctrlKey || e.metaKey) || (e.shiftKey && e.keyCode != this.keys.tab)) {
@ -483,16 +483,20 @@ define(['jquery'], function($) {
* Handle a click (select).
*
* @method handleClick
* @param {Object} item The jquery id of the parent item of the group.
* @param {Event} e The event.
*/
Tree.prototype.handleClick = function(item, e) {
Tree.prototype.handleClick = function(e) {
if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) {
// Do nothing.
return;
}
var item = $(e.target);
if (e.target !== e.currentTarget) {
return;
}
// Update the active item.
item.focus();
@ -506,12 +510,10 @@ define(['jquery'], function($) {
* Handle a focus event.
*
* @method handleFocus
* @param {Object} item The jquery id of the parent item of the group.
* @param {Event} e The event.
*/
Tree.prototype.handleFocus = function(item) {
this.setActiveItem(item);
Tree.prototype.handleFocus = function(e) {
this.setActiveItem($(e.target));
};
/**
@ -520,20 +522,12 @@ define(['jquery'], function($) {
* @method bindEventHandlers
*/
Tree.prototype.bindEventHandlers = function() {
var thisObj = this;
// Bind event handlers to the tree items. Use event delegates to allow
// for dynamically loaded parts of the tree.
this.treeRoot.on({
click: function(e) {
return thisObj.handleClick($(this), e);
},
keydown: function(e) {
return thisObj.handleKeyDown($(this), e);
},
focus: function() {
return thisObj.handleFocus($(this));
},
click: this.handleClick.bind(this),
keydown: this.handleKeyDown.bind(this),
focus: this.handleFocus.bind(this),
}, SELECTORS.ITEM);
};