From 09d34cb2158f0b8d751526424103db2177b426a7 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 11 Jan 2021 13:33:22 +0800
Subject: [PATCH 1/1] MDL-70580 core: Tree nodes should check if they were
 clicked directly

---
 lib/amd/build/tree.min.js     | Bin 6021 -> 6018 bytes
 lib/amd/build/tree.min.js.map | Bin 30237 -> 29952 bytes
 lib/amd/src/tree.js           |  34 ++++++++++++++--------------------
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/lib/amd/build/tree.min.js b/lib/amd/build/tree.min.js
index d92786b39749452b94bc614888b99d90207a48a5..ea1b92d94f5767ee5ea157aa340067776df9e710 100644
GIT binary patch
delta 614
zcmYjO!D`z;5XF?H^kP}IEFYRsD<!Em6-vNRh>f60(=;Ij3Jtxa7io7Ki72vJt(^o#
zgamT#VgDkhKz^aeLO-E@kPql7vz83H3~y)N%)EJfw|=|+@KiTRHuZUzdA?0u;qwy^
z!~swK(mGPp7J7^fq9K<2SRBCR)fIKA;Bg7hK=>t0!)T}&tE*J*Y42-Pj<sEkpA1|6
z(>@fa4v7HXpKTm^Ol~zyow+oOV#Xn{m;GhZXEJQuA^oYbQ)9BHA7Z@GjaSUEHb`C!
z{H?z!vRaXaIE60CR1@2;i;GThzSaEsl9Igax^Dt@HCi^tzpX`#KU(ja4C|^t3vCfb
z>3qdwORYef$q30*#f6KppRlidG#TTjnz4k0w?=n%8ZA%#V;q<0TiZg!+aKk9dvjZP
zOwr?D?y+)p{;)hRaOs4j2jZysf{cTh@Fb`1a6~7mO$IX7*JQ_Bv4T=g3Sx_jXbSrR
z&g{x)`Q3En{}=V^QDSE_j_7HBrawgWF??1DH;58e-0PgeB^#Y5RSy2+4yLNCnT#rD
YSLv!Sawl;2kG>p|d{Aib%Hz)3GrxDuQvd(}

delta 571
zcmZuuO-jQ+6sCfLf=x}D6tRV>P-ifv;zDRux@f5jap$s|>CDswV^WfdwxqS7^aOJN
zuh50K?G@a61VLQ8a?*~7;^y(aH{Z{D%zb%Wp1h}5OakK@6cp(R|4?!j$0M`{Fg$WP
zfLO?7XS6>U5DT-wmGGJ}Bw=VforF;;5q_cUqzE4<O;IOVz~7WziE5eE6y}Pmt2Jz4
z+i^)iJ+OtgU=?$g84KEHrXeV`wR2uKj3sk(9}ed(FKZjgC_NidH>5?eSYlQX{5`d`
zNZ?RXpH(Vmc@2pAs^vv(YuhRo?};w90kfU(+jpvM%xMOOFiu`9+Up{ZoCbc>6$z`^
zBw;sOlt-}a(F{GvzNK#pbf+IKAd^4om1Sggd>n-U^0KBY=-ZX~mzOT(({zFRhLS>j
zWElL>FnN7>edK!}#;${}s-4Kg%<;YAtOact2b4vD=q+1p<<fdW189DP*@i>&iuQ?r
l>-|XO;2*L0qK2UUl8bE*qVPv8xBr{loE;@|;gC0T$6wW*z{mgq

diff --git a/lib/amd/build/tree.min.js.map b/lib/amd/build/tree.min.js.map
index 3eed2c12a9554e2f9901f836b4190e5a583444fb..a78d7469785698b555cde3f2f259cd222c813586 100644
GIT binary patch
delta 2003
zcmb7FO>7%g5Z0y$A(AE{Bxyn%$JyAa9kx#6rb!%#(A&4`wd1B~o3>F=TgmZH?b=>D
zj-A9s;7SNC94a)3165lI3Bd(~6p1@$IP}T^R4yD4LgD}t7s||Rg12A}_2K!w@6F8n
z-nTRJ?){?N{#p6*(UE8CsoITf9lk&EcqZMb)v|W|A|tA%=2Ld2l#Nx=jcr_2Y#h?1
zLb{0mn*}?w|JO4;LtQs?xDy<Kz-WI<YEp=cG+faVLfUeN5g`al&|p;=afXOVkTaLs
zst|Ep8xb8x)0T{1VJ9sqL~>SYSs~77mJkg+A_?0eQ!%gO7XB}^Xc?=}n81_KFxhaT
z)3!{|5i!j~b}J0<kkr<M$Pn7p&$QuHf=}y=%d>5KO*?-OBz>-po+s;AH(95cY#ltF
z=n%t~5yi6;$c6|c>rnKBrwYcw1(4;-I^SkSN6MzS+zz_|)k&{%3x4p-C>7`(8|mq=
zd0|W)XtI)y&PnpOss=pj8G`#`m-^;eiacvo(f6Rs`)Xj$AS*VNr&xQATqGlzA?Xqk
z2@kx3${sYmeq|2sdsQU|Uwey615S)DDN)FezoQ&7JnGvYz$;-)hr~LQm^~!%ys`_w
z`&6X_!xQRKF-E&=B3HDuaIW0ca|GXF3X}=BhlyZt@;IOI@HCiEm6Pz*M5K4Ya3#ee
z{4o($b|9cm_Z2O=1WJk_%Q6brRWEXQQyoX*_tbSI0>7ytly-FT1kZ>2Ory%yPabt=
z@>it@Z}}%XN&l^1LpA>NhkNs;i$?*%Qz5t>@O1L|B%t<hu~P2bhVKF=1G_E(ooeA+
zD*ZcltW(?vQ%ivj5|c9AB>is2DWA)6nxBqS>`FpJP1x!k0yEg3KgHKQC|8ub#(9!(
z>HSm{!<B(Cu?8B_RU4~t_xMXK)8M39V0E9WA&A$JxhdG41#&(RCvA+-lnb5HwUiJx
z->gW6GOA<M$q<QP88+7mYb%`!q<&&K!C7p|jsQG9KJ}cfQ``u5w;~qUh7g>f^SZW<
z*}L#x^{7kb4I;peq^vs%JA6AfJHaU@iCm0MTNhR5`+OE0Y+2aWC?wtndk%+8FLM9N
zps6Sj0lDee5MZ+P3K3=Ff}W(VbCZc~>ol*^+*rlIL`UpdYi-ApbTKbTt%dfEkh|==
zN4_!A&f3H{#H{UH)?LS19gmIEu@0MrHEYqrX#o<=S2l5-Bpoi04wr<s3U5yjbVYOf
zA59;Pz<V_nhOd19@78;d?WAhHLOomdE&KezY}k3fLa)G&(ZT(1u0{IMcmZx#Um#=n
zwAzyY<8al!YWog;g`Dr7P`-)fWnVV@#A68Wzjh4HmAdywwx$$3AkM*ms=e6lq5xkk
zdSP_?LwLCT`Di^~*bX}nsH8VDOfP1T&=5SV51)1IC$mkXvTM66v^Fy$n4=eX$>(z6
MH`(O?A2;6k8|)1|UH||9

delta 2067
zcma)7O>7%g5Z0y;0ZmgWZPPZ19cN>kxOpUQ(%5PGBi=r**N$sjZT<iig~WCpC;mzO
zlf+aIE|ow62{aYrf&@stSMs4f(hH)83UPxITtR@i(*rZJcH_1w!iVR#v-7^0`DVVi
zAN;O;`G<Dr*8}j|fk*n<N->?!giEPfMHhN?EmujduH&v$#3hx_r8XKzU+n7Daxl~{
zcB@J#Dd%a))Odf5_8SJSDyW1dWt7cQlKo9uED@73_O22cDKC*n&G0L-ZP6(iFz^-r
z2l=T;t0~DXW(VMx$`WxY!@I&n&<MHP=BP+YnI>!9nB6nS$UJ4RU0vF<$HiqtA#*CR
zXHAkfTUR*MvMHjJDn?o0lJa5NZ-)hx23%SaJ{>r!mErclm^T}07J~VX8eG-5fytXT
zM|P46@U6$G?Z64gxVI1@Y^)p)OdDZ3efGHrK6dCwwoQs{(;1_!RfPMF{NXd4*&35p
zGPdBn^ZdDq5IL}yI<1JYMKajkNmIxuGXL0RmZB%foZ5nh)2&UwPflG+!#~aqtpeG>
z87&Ck4BpgQ1z4^|M>YgwJ-zUqV?e9H_>iux!<8ZZWR5ACBXBh<Qq9P9BMqMnxgG;N
zME^ScJv7lh6>1xY0QmJWtqRNfslz#o5<(IYsi1=Jh3>>aclE)Jpn^@88y=ynA4Z3L
z9Xkph_Vu5|cuFRS*LV_lD&l7vmN*w;n;umf7c<1;)tsGHRS$;$!s))}9`53~ezIqs
z9)VO$dd9lP+cVBW$z$&4|BFZODRKPv*@q)uzo*7#yOU8$&KAbH*~SFn`rtFKV?XSl
zy)*6w;+AIBBo(YjXi5ta+D}FZzZ8{0c*l2qw_=JVDOsHXL(EAzhk-EY{@OJsZSAsZ
zZ3b+`kyieP;8<9bEV!B?X+@eOvl8)Qz{nNK&&-E#E)^wgg{IifTqs*fbU#?E{wPb4
zdwvlfjC6IT>39uqp*~2w+B2PRtA=oQSbVX0vC@=o!Qg4+j&nTbX90dZcoMdK#{#4f
zQbfH?U^GA27Mz(h?xK=&m<rRa!Ph}50AKqYyBTB?Roh~dI<3|X(p&Njo9!kunhH}N
zu8?!dC|mSz^V^zCS>_`FV}cXmYfzDYgm9y)qXu11jAe?PfuW~ub#Ny+HrBX*Yy?9(
zIC#Z4Z9-A+-Ngh(o3R*&V<iYDxjM%MQ;w#{Vkpv(!aIi03(r&*YOAdJ+{ze#p714d
zq%O(@iwUsr3WYQ*uHwrj8i_T7n!I61ida{1I>cNm9+l0k(fI1rp$T|B5rOYZKKSA4
ztygl@OhLFZKG%)Lhi_Xw`0kK450?``^hkE?y}eq5{>_izjkmfR?&}A&HouW_68>C#
z83v~uFOWanx!{ER<<F08t(0BOFQV%L@6I7gymA-1H;=>nYn_l>?)0}@#_Uh2qHpGi
zdxQ@9C^0<aYWuwhgVhu50FkEvVwrlVv|ao!2=OH3HTrtbxZt|k2l3^XUV93VKkhBK
KXVbY^z40%P^F?j|

diff --git a/lib/amd/src/tree.js b/lib/amd/src/tree.js
index 4ba8615e13a..1a97cac6c06 100644
--- a/lib/amd/src/tree.js
+++ b/lib/amd/src/tree.js
@@ -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);
     };
 
-- 
2.29.2