diff --git a/amd/build/collapse.min.js b/amd/build/collapse.min.js index 981fac1aff87b4ebe01ebaa58177303b65199116..28224c9eb73560accb632dfce1ae99bf089a974f 100644 --- a/amd/build/collapse.min.js +++ b/amd/build/collapse.min.js @@ -1,2 +1,2 @@ -/*! hsh_boostnavigation 2018-06-11 */ -define(["jquery"],function(a){"use strict";function b(b,c){b.click(function(d){d.preventDefault(),"mycourses"==c?0==b.attr("data-collapse")?e.forEach(function(b){a(".list-group-item[data-key="+b+"]").attr("data-collapse","1"),a(".list-group-item[data-key="+b+"]").attr("data-hidden","0")}):1==b.attr("data-collapse")&&(e.forEach(function(b){a(".list-group-item[data-parent-key="+b+"]").attr("data-hidden","1"),a(".list-group-item[data-parent-key="+b+"]").attr("data-collapse","1")}),e.forEach(function(b){a(".list-group-item[data-key="+b+"]").attr("data-collapse","1"),a(".list-group-item[data-key="+b+"]").attr("data-hidden","1")})):0==b.attr("data-collapse")?(a(".list-group-item[data-parent-key="+c+"]").attr("data-hidden","1"),b.attr("data-collapse","1")):1==b.attr("data-collapse")&&(a(".list-group-item[data-parent-key="+c+"]").attr("data-hidden","0"),b.attr("data-collapse","0"))})}function c(c){""===e[0]&&(e=new Array);var d=a('.list-group-item[data-key="'+c+'"]');if("mycourses"===c?d.attr("data-collapse","0"):d.attr("data-collapse","1"),""!==c&&"mycourses"!==c){d.addClass("list-group-item-action semesternode"),d.attr("data-isexpandable","1");var f=a(".list-group-item[data-parent-key="+c+"]");f.attr("data-hidden","1"),f.attr("data-collapse","1"),e.includes(c)||e.push(c)}b(d,c)}function d(b){var c=a('.list-group-item[data-key="'+b+'"]');c.attr("data-hidden","0"),c.attr("data-collapse","0"),a(".list-group-item[data-parent-key="+b+"]").attr("data-hidden","0"),a(".list-group-item[data-parent-key="+b+"]").attr("data-collapse","0")}var e=[];return{init:function(a){for(var b=0,d=a.length;b<d;b++)c(a[b])},openSemester:function(a){d(a)}}}); \ No newline at end of file +/*! hsh_boostnavigation 2018-06-20 */ +define(["jquery"],function(a){"use strict";function b(b,c){b.click(function(d){d.preventDefault(),"mycourses"==c?0==b.attr("data-collapse")?e.forEach(function(b){a(".list-group-item[data-key="+b+"]").attr("data-collapse","1"),a(".list-group-item[data-key="+b+"]").attr("data-hidden","0")}):1==b.attr("data-collapse")&&(e.forEach(function(b){a(".list-group-item[data-parent-key="+b+"]").attr("data-hidden","1"),a(".list-group-item[data-parent-key="+b+"]").attr("data-collapse","1")}),e.forEach(function(b){a(".list-group-item[data-key="+b+"]").attr("data-collapse","1"),a(".list-group-item[data-key="+b+"]").attr("data-hidden","1")})):0==b.attr("data-collapse")?(a(".list-group-item[data-parent-key="+c+"]").attr("data-hidden","1"),b.attr("data-collapse","1")):1==b.attr("data-collapse")&&(a(".list-group-item[data-parent-key="+c+"]").attr("data-hidden","0"),b.attr("data-collapse","0"))})}function c(c){""===e[0]&&(e=new Array);var d=a('.list-group-item[data-key="'+c+'"]');if("mycourses"===c?d.attr("data-collapse","0"):d.attr("data-collapse","1"),""!==c&&"mycourses"!==c){d.addClass("list-group-item-action semesternode"),d.attr("data-isexpandable","1");var f=a(".list-group-item[data-parent-key="+c+"]");f.attr("data-hidden","1"),f.attr("data-collapse","1"),f.addClass("coursenode"),e.includes(c)||e.push(c)}b(d,c)}function d(b){var c=a('.list-group-item[data-key="'+b+'"]');c.attr("data-hidden","0"),c.attr("data-collapse","0"),a(".list-group-item[data-parent-key="+b+"]").attr("data-hidden","0"),a(".list-group-item[data-parent-key="+b+"]").attr("data-collapse","0")}var e=[];return{init:function(a){for(var b=0,d=a.length;b<d;b++)c(a[b])},openSemester:function(a){d(a)}}}); \ No newline at end of file diff --git a/amd/src/collapse.js b/amd/src/collapse.js index bbceb57a16382ca35ad2e1f9d4fbfdcaabcb3ce8..1c87d86f75b609c1346431a8c2bba67aceaad5bd 100644 --- a/amd/src/collapse.js +++ b/amd/src/collapse.js @@ -1,20 +1,20 @@ // JavaScript Code genommen und angepasst von local/boostnavigation/amd/src // User-Preferences erstmal entfernt -define(['jquery'], function($) { +define(['jquery'], function ($) { "use strict"; var nodesArray = []; function toggleClickHandler(node, nodename) { - node.click(function(e) { + node.click(function (e) { // Prevent that the browser opens the node's default action link (if existing). e.preventDefault(); - if(nodename == "mycourses") { + if (nodename == "mycourses") { // "MyCourses" angeklickt um diesen einzuklappen if (node.attr('data-collapse') == 0) { // Alle Semester verstecken - nodesArray.forEach(function(semster){ + nodesArray.forEach(function (semster) { $('.list-group-item[data-key=' + semster + ']').attr("data-collapse", "1"); $('.list-group-item[data-key=' + semster + ']').attr("data-hidden", "0"); }); @@ -24,14 +24,14 @@ define(['jquery'], function($) { // If the parent node is currently collapsed. } else if (node.attr('data-collapse') == 1) { // Alle Kurse verstecken - nodesArray.forEach(function(nodekey) { + nodesArray.forEach(function (nodekey) { // Set the hidden attribute to true for all elements which have the nodename as their data-parent-key attribute. $('.list-group-item[data-parent-key=' + nodekey + ']').attr("data-hidden", "1"); $('.list-group-item[data-parent-key=' + nodekey + ']').attr("data-collapse", "1"); }); // Semester wieder sichtbar machen, Kurse weiterhin verstecken - nodesArray.forEach(function(semster){ + nodesArray.forEach(function (semster) { $('.list-group-item[data-key=' + semster + ']').attr("data-collapse", "1"); $('.list-group-item[data-key=' + semster + ']').attr("data-hidden", "1"); }); @@ -64,27 +64,28 @@ define(['jquery'], function($) { } function initToggleNodes(nodename) { - if(nodesArray[0] === "") { + if (nodesArray[0] === "") { nodesArray = new Array(); } // Search node to be collapsible. var node = $('.list-group-item[data-key="' + nodename + '"]'); - if(nodename === "mycourses") { + if (nodename === "mycourses") { node.attr("data-collapse", "0"); } else { node.attr("data-collapse", "1"); } - if(nodename !== "" && nodename !== "mycourses") { + if (nodename !== "" && nodename !== "mycourses") { node.addClass('list-group-item-action semesternode'); node.attr("data-isexpandable", "1"); var childNode = $('.list-group-item[data-parent-key=' + nodename + ']'); childNode.attr("data-hidden", "1"); childNode.attr("data-collapse", "1"); - if(!nodesArray.includes(nodename)) { + childNode.addClass("coursenode"); + if (!nodesArray.includes(nodename)) { nodesArray.push(nodename); } } @@ -103,7 +104,7 @@ define(['jquery'], function($) { return { - init: function(params) { + init: function (params) { for (var i = 0, len = params.length; i < len; i++) { initToggleNodes(params[i]); } diff --git a/styles.css b/styles.css index ee5342171a16b7e07507f0cc626e6f4927058992..7dc3c5c846d0670a77e3cc14da0363cc27b977c1 100644 --- a/styles.css +++ b/styles.css @@ -15,7 +15,7 @@ right: .75rem; } /* Set the cursor for the collapsible nodes. */ -.jsenabled .list-group-item .semesternode[data-isexpandable="1"] { +.semesternode { cursor: pointer; } @@ -23,12 +23,16 @@ margin-left: 1rem !important; } -#nav-drawer .list-group-item[data-key|="mycourses"] ~ a.list-group-item[href*="course/view.php?id="] > div.m-l-2 { +#nav-drawer .list-group-item[data-key|="mycourses"] ~ a.list-group-item[href*="course/view.php?id="].coursenode > div.m-l-1 { margin-left: 2rem !important; } -.semesternode { - cursor: pointer; +#nav-drawer .list-group-item[data-parent-key="mycourses"].semesternode > div.m-l-1 { + margin-left: 0 !important; +} + +#nav-drawer .list-group-item[data-key|="mycourses"] ~ a.list-group-item[href*="course/view.php?id="] > div.m-l-2 { + margin-left: 2rem !important; } .list-group-item[data-hidden="1"] { diff --git a/version.php b/version.php index 536a0cf5e5f8d4ac049b09bb46064e35811fa05d..fe2b91d606361fb23bb0a6cf1a817ccbe426f0a6 100644 --- a/version.php +++ b/version.php @@ -25,8 +25,8 @@ defined('MOODLE_INTERNAL') || die(); $plugin->component = 'local_hsh_boostnavigation'; -$plugin->version = 2018061300; -$plugin->release = 'v1.1-r1'; +$plugin->version = 2018062000; +$plugin->release = 'v1.1-r2'; $plugin->requires = 2016120500; #$plugin->maturity = MATURITY_STABLE;