From 3c7f5e8472c83568fe51208ba35d6b46a0601682 Mon Sep 17 00:00:00 2001 From: Paul Holden 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 | 2 +- .../dataprivacy/amd/src/expand_contract.js | 20 +++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/admin/tool/dataprivacy/amd/build/expand_contract.min.js b/admin/tool/dataprivacy/amd/build/expand_contract.min.js index 3419d58da10..4bd453b6870 100644 --- a/admin/tool/dataprivacy/amd/build/expand_contract.min.js +++ b/admin/tool/dataprivacy/amd/build/expand_contract.min.js @@ -1 +1 @@ -define(["jquery","core/url","core/str"],function(a,b,c){var d=a(''),e=a('');return{expandCollapse:function(a,b){a.hasClass("hide")?(a.removeClass("hide"),a.addClass("visible"),a.attr("aria-expanded",!0),b.find(":header i.fa").removeClass("fa-plus-square"),b.find(":header i.fa").addClass("fa-minus-square"),b.find(":header img.icon").attr("src",d.attr("src"))):(a.removeClass("visible"),a.addClass("hide"),a.attr("aria-expanded",!1),b.find(":header i.fa").removeClass("fa-minus-square"),b.find(":header i.fa").addClass("fa-plus-square"),b.find(":header img.icon").attr("src",e.attr("src")))},expandCollapseAll:function(b){var f="visible"==b?"hide":"visible",g="visible"==b,h="visible"==b?"fa-plus-square":"fa-minus-square",i="visible"==b?"fa-minus-square":"fa-plus-square",j="visible"==b?d.attr("src"):e.attr("src");a("."+f).each(function(){a(this).removeClass(f),a(this).addClass(b),a(this).attr("aria-expanded",g)}),a(".tool_dataprivacy-expand-all").data("visibilityState",f),c.get_string(f,"tool_dataprivacy").then(function(b){a(".tool_dataprivacy-expand-all").html(b)})["catch"](Notification.exception),a(":header i.fa").each(function(){a(this).removeClass(h),a(this).addClass(i)}),a(":header img.icon").each(function(){a(this).attr("src",j)})}}}); \ No newline at end of file +define(["jquery","core/url","core/str"],function(a,b,c){var d=a(''),e=a(''),f={EXPAND:"fa-caret-right",COLLAPSE:"fa-caret-down"};return{expandCollapse:function(a,b){a.hasClass("hide")?(a.removeClass("hide"),a.addClass("visible"),a.attr("aria-expanded",!0),b.find(":header i.fa").removeClass(f.EXPAND),b.find(":header i.fa").addClass(f.COLLAPSE),b.find(":header img.icon").attr("src",d.attr("src"))):(a.removeClass("visible"),a.addClass("hide"),a.attr("aria-expanded",!1),b.find(":header i.fa").removeClass(f.COLLAPSE),b.find(":header i.fa").addClass(f.EXPAND),b.find(":header img.icon").attr("src",e.attr("src")))},expandCollapseAll:function(b){var g="visible"==b?"hide":"visible",h="visible"==b,i="visible"==b?f.EXPAND:f.COLLAPSE,j="visible"==b?f.COLLAPSE:f.EXPAND,k="visible"==b?d.attr("src"):e.attr("src");a("."+g).each(function(){a(this).removeClass(g),a(this).addClass(b),a(this).attr("aria-expanded",h)}),a(".tool_dataprivacy-expand-all").data("visibilityState",g),c.get_string(g,"tool_dataprivacy").then(function(b){a(".tool_dataprivacy-expand-all").html(b)})["catch"](Notification.exception),a(":header i.fa").each(function(){a(this).removeClass(i),a(this).addClass(j)}),a(":header img.icon").each(function(){a(this).attr("src",k)})}}}); \ No newline at end of file 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 = $(''); var collapsedImage = $(''); + /* + * 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);