TagesschuleElementa/www.tagesschule-elementa.ch
3
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Simon Caminada
2018-03-22 22:33:32 +01:00
parent b652882bd0
commit 06f6692f12
14 changed files with 423 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
private/js/modules/control-panel.js
View File

@@ -21,7 +21,7 @@ $(function() {
$control_item.addClass('active');
window.on_transitionend($control_item_content, function(event) {
if (!event || event.target === $control_item_content[0]) {
if (!event || event.target === this) {
$control_item_content.off(window.transitionend);
$control_item_content.removeAttr('style');
$control_item.removeClass('loading');
@@ -40,7 +40,7 @@ $(function() {
$control_item_content.height($control_item_content_main.outerHeight(true));
window.on_transitionend($control_item_content, function(event) {
if (!event || event.target === $control_item_content[0]) {
if (!event || event.target === this) {
$control_item_content.off(window.transitionend);
$control_item_content_main.html('');
}

7
private/js/modules/plugins/slider.js
View File

@@ -35,6 +35,13 @@ $(function() {
}
});
$body.on('click', '.slider__next', function(event) {
event.preventDefault();
var $this = $(this);
var $slider = $this.parents('.slider');
slider_next_item($slider);
});
window.enable_touch_swipe('.slider', slider_prev_item, slider_next_item);
window.enable_touch_swipe('.text_slider', slider_prev_item, slider_next_item);
});