diff --git a/amd/build/collapse.min.js b/amd/build/collapse.min.js index cee3d3ab44128b8fb39d223d4aa4eab6968517e2..5ad4e54422ac0392a335c7afff4520a671f2352f 100644 --- a/amd/build/collapse.min.js +++ b/amd/build/collapse.min.js @@ -1,2 +1,2 @@ -/*! hsh_boostnavigation 2018-08-15 */ -define(["jquery"],function(a){"use strict";function b(b,c){b.click(function(d){d.preventDefault(),"mycourses"==c?0==b.attr("data-collapse")?f.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")&&(f.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")}),f.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){""===f[0]&&(f=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 e=a(".list-group-item[data-parent-key="+c+"]");e.attr("data-hidden","1"),e.attr("data-collapse","1"),e.addClass("coursenode"),f.includes(c)||f.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")}function e(){var a=new URL(window.location.href),b=a.searchParams.get("id");null===b&&(b=a.searchParams.get("courseid"));var c=document.querySelectorAll('a.coursenode[href$="'+b+'"]');void 0!==c[0]&&d(c[0].getAttribute("data-parent-key"))}var f=[];return{init:function(a){for(var b=0,d=a.length;b<d;b++)c(a[b]);e()},openSemester:function(a){d(a)}}}); \ No newline at end of file +/*! hsh_boostnavigation 2018-09-13 */ +define(["jquery"],function(a){"use strict";function b(b,c){b.click(function(d){d.preventDefault(),"mycourses"==c?0==b.attr("data-collapse")?f.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")&&(f.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")}),f.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){""===f[0]&&(f=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 e=a(".list-group-item[data-parent-key="+c+"]");e.attr("data-hidden","1"),e.attr("data-collapse","1"),e.addClass("coursenode"),navigator.userAgent.match(/Trident\/7\./)?-1==f.indexOf(c)&&f.push(c):f.includes(c)||f.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")}function e(){var a=new URL(window.location.href),b=a.searchParams.get("id");null===b&&(b=a.searchParams.get("courseid"));var c=document.querySelectorAll('a.coursenode[href$="'+b+'"]');void 0!==c[0]&&d(c[0].getAttribute("data-parent-key"))}var f=[];return{init:function(a){for(var b=0,d=a.length;b<d;b++)c(a[b]);navigator.userAgent.match(/Trident\/7\./)||e()},openSemester:function(a){d(a)}}}); \ No newline at end of file diff --git a/amd/src/collapse.js b/amd/src/collapse.js index 050821c1ec78e335e4f24258e5ce1c313b94629d..91a211a58f5ded3c9c8887517dd48d25529d0e15 100644 --- a/amd/src/collapse.js +++ b/amd/src/collapse.js @@ -12,7 +12,6 @@ define(['jquery'], function ($) { if (nodename == "mycourses") { // "MyCourses" angeklickt um diesen einzuklappen if (node.attr('data-collapse') == 0) { - // Alle Semester verstecken nodesArray.forEach(function (semester) { $('.list-group-item[data-key=' + semester + ']').attr("data-collapse", "1"); @@ -88,11 +87,17 @@ define(['jquery'], function ($) { childNode.attr("data-hidden", "1"); childNode.attr("data-collapse", "1"); childNode.addClass("coursenode"); - if (!nodesArray.includes(nodename)) { - nodesArray.push(nodename); + /** IE11 kennt kein includes. Im Fall von IE11 ohne Includes arbeiten, Array durchlaufen und manuell Prüfen. */ + if (navigator.userAgent.match(/Trident\/7\./)) { + if (nodesArray.indexOf(nodename) == -1) { + nodesArray.push(nodename); + } + } else { + if (!nodesArray.includes(nodename)) { + nodesArray.push(nodename); + } } } - // Add a click handler to this node. toggleClickHandler(node, nodename); } @@ -122,7 +127,9 @@ define(['jquery'], function ($) { for (var i = 0, len = params.length; i < len; i++) { initToggleNodes(params[i]); } - openSemesterFromSelectecCourse(); + if (!navigator.userAgent.match(/Trident\/7\./)) { + openSemesterFromSelectecCourse(); + } }, openSemester: function (nodename) { openNode(nodename); diff --git a/version.php b/version.php index fea4156c40c9825c9838ead2f77d11a8e6d566f2..729efc0b8862074e6a7ddbf0d41a75b387bbc550 100644 --- a/version.php +++ b/version.php @@ -25,11 +25,11 @@ defined('MOODLE_INTERNAL') || die(); $plugin->component = 'local_hsh_boostnavigation'; -$plugin->version = 2018082900; -$plugin->release = 'v1.1-r4'; +$plugin->version = 2018091300; +$plugin->release = 'v1.1-r5'; $plugin->requires = 2016120500; #$plugin->maturity = MATURITY_STABLE; $plugin->dependencies = array('theme_boost' => 2016120500, - 'block_course_overview_campus' => 2017033100, - 'local_boostnavigation' => 2017100901); + 'block_course_overview_campus' => 2017033100, + 'local_boostnavigation' => 2017100901);