From aa5e150172d7d4b02cb43f2936595cc51306fc8e Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Mon, 30 Sep 2019 23:49:14 +0100
Subject: [PATCH] MDL-66792 tool_dataprivacy: correct fa classes in privacy
 registry.

---
 .../amd/build/expand_contract.min.js          | Bin 1484 -> 1477 bytes
 .../amd/build/expand_contract.min.js.map      | Bin 6759 -> 7114 bytes
 .../dataprivacy/amd/src/expand_contract.js    |  20 ++++++++++++------
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/admin/tool/dataprivacy/amd/build/expand_contract.min.js b/admin/tool/dataprivacy/amd/build/expand_contract.min.js
index ac0d11f5580e49ae3a5407d657a45a4590a9ea8a..7f73e4c65dddaccf1a6e45bf82dd25b3dfd232da 100644
GIT binary patch
delta 313
zcmX@ZeUy8`4O5*o+iKT{07pL;E2XqV-Q>ig)DqpI%=C;BB^_sfA0NknU{@rWl>G8M
zrP_%%wsNHDL9|T{WRje`fQgeUO%J9XC?q`j43p^OAB=UV!eEuiT0!cf7}F=KGt0+h
z*eaD}7H1~qq$=6kCfO?*SScFnWTFbfY_&qzrjv!P1m+H)B8VGxvL_#4HUL`lky#B$
zI<g8+)@D&)%$V%MVk?-gX`QT>o>~%LTvC*om#&dMc^1nu#!QeZwk*wBP3y$T2Z4Uc
NXH{m*o;;b=5&+(VVFUmG

delta 304
zcmX@geTI9&jmf->TLqNT5_Jo5N{e-i3riD=Qk5ppWt5z}pNUftB$1n$ha_`>Nn^4c
zQymr=s2)tiE->XXrcJhEmak8@RVvFY&P>WlRkF2BvR5>)QZ&@bKovxHixq|&bTTn@
zpg0n&1=&A3SzsNL_c3b&UGj=q4M+;I7&E3%c4e^@Ow+VZ)=N(<i7zfG%FIjGNSi#F
XWf@}zP=zpK=43xsTgI%(J*<`h<alLW

diff --git a/admin/tool/dataprivacy/amd/build/expand_contract.min.js.map b/admin/tool/dataprivacy/amd/build/expand_contract.min.js.map
index 9ee561c857aba12b7e5b24aad4b103e2e3ba0a1a..5f7d8ab578a7cd0c778b9ccff48b627ad5ad2783 100644
GIT binary patch
delta 1108
zcmZ`&&1(}u6lc@eB&AVlH2tuFNf4{)Ho;O`2`apuY}>R+n>I96k;1asCe`g`NkY?B
zL<A2Wh4~Y_d6OJGs#k9wMbM)+>q!rSIB#~hiB$LSn4RC(d$T)VXWq{}e|mxDp;S^!
z2|1zOF2YKdFX(DM55<!D>dBICeeE!-$`oJ~%K|U7OyvSV0pC@*s(`>%zPkpn=Ik0U
z4}7&gNqN=gvM89%^7ZOrma<R2A0tI13QsER%&e>eg&h0tC+v4$cx1gxP|-O}1z~{`
zqAcaVICvKc8WwtoZTa8yS_*}0iHZ}JBGa|ROvkc}Zo07CU@uR7zA7?$y0mZ}n4vg|
z+dW1t+PI%fD>{48AD`|~iAEgNbvoZwVgAw{s+QAARbgNH<Ad7>djkyyVwv7{<Q#w?
z)D?Ldz*aapFN_No6@X}sBCoK^^uQHqpS=x?jcW2HfH=&$BEA`y;z?Tq)$wQrx})SU
z|GtBoh)M<v2PY+)eF%<A2do^t6y`7|;co!6&7K7prE3D6W#58otmgKBsH_8sV-n?o
z(q_fb$Uk}#e~jBxL!|2Lbto>i*vHWLSX;q?S|W8?kv9M~c{Vkv7>+lX9Jt|Ysh!%u
zk^gZzdCwyFBndUOW|LUjuF)i|I?-&~JRt3wVG(2B)~w2oRZZ)4)70!HUlOZcF`6k)
zopu&`T7$T^gWMz!U6k897bQa`wzVl;YZ$Gm#!j`?k|*RY$GbzltV+FYO*oWCos}~U
z-)YxA<v6l;L+9D8NNiNARKx(6J=}A18N=)-676gag`~6pVZ??{c>I+y+&PN;lH#7)
e!AQoNH+39nN6)cDG<nSQfF7<R?%2_veSZKdyF2&*

delta 717
zcmX?Q{@i3j%f?0SOak8KE;_!Bj%F@8&W`?7F0PZUnZNPsq&qn}8anH^IyyVLP5!_t
zHaVU}oL46kC|U*)^#F=m@q_?1IVOS#=itd#SoTAdU}^*zhoUh6q$e4y(SNcT+dXNp
zjmAzO5esLKMIM$Qj;Fqp=VVuQMQO0z5P5B9kYcY4XP~^dzLWRl8SILtQ6QaAm*{vp
zI;Md5xlTIXj*fX?Qz3dwT~KU($1W=f)(JAp(HW%CH+`}UhbCju<TV^pjG>bgIm8(=
zKy1lyoj^y&AdtFDCr=QS<pd6&w8?8ZBpD+oALr0!%$nT8DZ^MiS%6cG2kZiOu(^ek
zojE-itH6>5lUH)OGMPI~{=g|ERp<n=G6(FyQYW2IN5^oW24_nrnDzEt;*(c%NIM`~
z9tgD@sL%t*^l$+>!xQRDs6VoS;SGvV2vO`*IC&$N1k_KFlb>?gFj=~6R_1=sviX=m
zCX;}ATB2@2PHC}jabam<QL6gnk3vS1^MyGDK@z!{c_=bElOsgMHlGsaWW*{B)`-nS
koy`%VzZq4~?NYE(z_g`A+zzY|#crrdWQT6PEdHGt0Nl6N0{{R3

diff --git a/admin/tool/dataprivacy/amd/src/expand_contract.js b/admin/tool/dataprivacy/amd/src/expand_contract.js
index cf509b5574a..a369f7c8721 100644
--- a/admin/tool/dataprivacy/amd/src/expand_contract.js
+++ b/admin/tool/dataprivacy/amd/src/expand_contract.js
@@ -28,6 +28,14 @@ define(['jquery', 'core/url', 'core/str'], function($, url, str) {
     var expandedImage = $('<img alt="" src="' + url.imageUrl('t/expanded') + '"/>');
     var collapsedImage = $('<img alt="" src="' + url.imageUrl('t/collapsed') + '"/>');
 
+    /*
+     * Class names to apply when expanding/collapsing nodes.
+     */
+    var CLASSES = {
+        EXPAND: 'fa-caret-right',
+        COLLAPSE: 'fa-caret-down'
+    };
+
     return /** @alias module:tool_dataprivacy/expand-collapse */ {
         /**
          * Expand or collapse a selected node.
@@ -40,15 +48,15 @@ define(['jquery', 'core/url', 'core/str'], function($, url, str) {
                 targetnode.removeClass('hide');
                 targetnode.addClass('visible');
                 targetnode.attr('aria-expanded', true);
-                thisnode.find(':header i.fa').removeClass('fa-plus-square');
-                thisnode.find(':header i.fa').addClass('fa-minus-square');
+                thisnode.find(':header i.fa').removeClass(CLASSES.EXPAND);
+                thisnode.find(':header i.fa').addClass(CLASSES.COLLAPSE);
                 thisnode.find(':header img.icon').attr('src', expandedImage.attr('src'));
             } else {
                 targetnode.removeClass('visible');
                 targetnode.addClass('hide');
                 targetnode.attr('aria-expanded', false);
-                thisnode.find(':header i.fa').removeClass('fa-minus-square');
-                thisnode.find(':header i.fa').addClass('fa-plus-square');
+                thisnode.find(':header i.fa').removeClass(CLASSES.COLLAPSE);
+                thisnode.find(':header i.fa').addClass(CLASSES.EXPAND);
                 thisnode.find(':header img.icon').attr('src', collapsedImage.attr('src'));
             }
         },
@@ -61,8 +69,8 @@ define(['jquery', 'core/url', 'core/str'], function($, url, str) {
         expandCollapseAll: function(nextstate) {
             var currentstate = (nextstate == 'visible') ? 'hide' : 'visible';
             var ariaexpandedstate = (nextstate == 'visible') ? true : false;
-            var iconclassnow = (nextstate == 'visible') ? 'fa-plus-square' : 'fa-minus-square';
-            var iconclassnext = (nextstate == 'visible') ? 'fa-minus-square' : 'fa-plus-square';
+            var iconclassnow = (nextstate == 'visible') ? CLASSES.EXPAND : CLASSES.COLLAPSE;
+            var iconclassnext = (nextstate == 'visible') ? CLASSES.COLLAPSE : CLASSES.EXPAND;
             var imagenow = (nextstate == 'visible') ? expandedImage.attr('src') : collapsedImage.attr('src');
             $('.' + currentstate).each(function() {
                 $(this).removeClass(currentstate);
-- 
2.17.1