mirror of
https://github.com/YunoHost/yunohost-admin.git
synced 2024-09-03 20:06:15 +02:00
Fix the sliders again ... which in turns is a much better fix for the postinstall buggy sliders, and also now we don't really need to be able to diable slider anymore ...
This commit is contained in:
parent
79fc66558c
commit
787204b178
2 changed files with 32 additions and 24 deletions
|
@ -50,7 +50,7 @@
|
||||||
}
|
}
|
||||||
store.set('maindomain', domain);
|
store.set('maindomain', domain);
|
||||||
});
|
});
|
||||||
}, false); // We disable enableSlide because that causes some issues with accordion when using the 'previous' button
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -60,9 +60,7 @@
|
||||||
if (!store.get('maindomain')) {
|
if (!store.get('maindomain')) {
|
||||||
c.redirect_to('#/postinstall/domain');
|
c.redirect_to('#/postinstall/domain');
|
||||||
} else {
|
} else {
|
||||||
c.view('postinstall/postinstall_3', { 'domain': store.get('maindomain').toLowerCase() },
|
c.view('postinstall/postinstall_3', { 'domain': store.get('maindomain').toLowerCase() });
|
||||||
function() { },
|
|
||||||
false); // We disable enableSlide because that causes some issues with accordion when using the 'previous' button
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -29,19 +29,17 @@
|
||||||
$('#slider-container').addClass('notransition');
|
$('#slider-container').addClass('notransition');
|
||||||
// Delete the left/right temporary stuff only used during animation
|
// Delete the left/right temporary stuff only used during animation
|
||||||
$('#slideTo').css('display', 'none');
|
$('#slideTo').css('display', 'none');
|
||||||
|
$('#slideTo').html("");
|
||||||
$('#slideBack').css('display', 'none');
|
$('#slideBack').css('display', 'none');
|
||||||
|
$('#slideBack').html("");
|
||||||
// Set the margin-left back to 0
|
// Set the margin-left back to 0
|
||||||
$('#slider-container').css('margin-left', '0');
|
$('#slider-container').css('margin-left', '0');
|
||||||
// c.f. the stackoverflow thread
|
// c.f. the stackoverflow thread
|
||||||
$('#slider-container')[0].offsetHeight;
|
$('#slider-container')[0].offsetHeight;
|
||||||
// Remove the binding to this event handler for next times
|
// Remove the binding to this event handler for next times
|
||||||
//$("#slider-container").off(transitionEvent);
|
|
||||||
// Re-enable transition effects
|
// Re-enable transition effects
|
||||||
$('#slider-container').removeClass('notransition');
|
$('#slider-container').removeClass('notransition');
|
||||||
}
|
}
|
||||||
// Now we add the transition event to detect the end of the transition effect
|
|
||||||
transitionEvent && $("#slider-container").on(transitionEvent, resetSliders)
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Helpers
|
* Helpers
|
||||||
|
@ -307,12 +305,11 @@
|
||||||
|
|
||||||
|
|
||||||
// Render view (cross-browser)
|
// Render view (cross-browser)
|
||||||
view: function (view, data, callback, enableSlide) {
|
view: function (view, data, callback) {
|
||||||
c = this;
|
c = this;
|
||||||
|
|
||||||
// Default
|
// Default
|
||||||
callback = typeof callback !== 'undefined' ? callback : function() {};
|
callback = typeof callback !== 'undefined' ? callback : function() {};
|
||||||
enableSlide = (typeof enableSlide !== 'undefined') ? enableSlide : true; // Change to false to disable animation
|
|
||||||
|
|
||||||
// Hide loader and modal
|
// Hide loader and modal
|
||||||
c.hideLoader();
|
c.hideLoader();
|
||||||
|
@ -324,17 +321,17 @@
|
||||||
// Update content helper
|
// Update content helper
|
||||||
var leSwap = function() {
|
var leSwap = function() {
|
||||||
rendered.swap(function() {
|
rendered.swap(function() {
|
||||||
// Slide direction
|
// Clicking on those kind of CSS elements will trigger a
|
||||||
if (enableSlide) {
|
// slide effect i.e. the next view rendering will have
|
||||||
$('.slide, .btn-breadcrumb a:not(:last-child)').on('click', function() {
|
// store.get('slide') set to 'back' or 'to'
|
||||||
$(this).addClass('active');
|
$('.slide, .btn-breadcrumb a:not(:last-child)').on('click', function() {
|
||||||
if ($(this).hasClass('back') || $(this).parent('.btn-breadcrumb').length) {
|
$(this).addClass('active');
|
||||||
store.set('slide', 'back');
|
if ($(this).hasClass('back') || $(this).parent('.btn-breadcrumb').length) {
|
||||||
} else {
|
store.set('slide', 'back');
|
||||||
store.set('slide', 'to');
|
} else {
|
||||||
}
|
store.set('slide', 'to');
|
||||||
});
|
}
|
||||||
}
|
});
|
||||||
|
|
||||||
// Paste <pre> helper
|
// Paste <pre> helper
|
||||||
c.prePaste();
|
c.prePaste();
|
||||||
|
@ -348,7 +345,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
// Slide back effect
|
// Slide back effect
|
||||||
if (enableSlide && store.get('slide') == 'back') {
|
if (store.get('slide') == 'back') {
|
||||||
|
|
||||||
store.clear('slide');
|
store.clear('slide');
|
||||||
// Disable transition while we tweak CSS
|
// Disable transition while we tweak CSS
|
||||||
|
@ -378,12 +375,18 @@
|
||||||
|
|
||||||
// Re-add transition effect
|
// Re-add transition effect
|
||||||
$('#slider-container').removeClass('notransition');
|
$('#slider-container').removeClass('notransition');
|
||||||
|
|
||||||
|
// add the transition event to detect the end of the transition effect
|
||||||
|
transitionEvent
|
||||||
|
&& $("#slider-container").off(transitionEvent)
|
||||||
|
&& $("#slider-container").on(transitionEvent, resetSliders);
|
||||||
|
|
||||||
// And actually play the transition effect that will move the container from left to right
|
// And actually play the transition effect that will move the container from left to right
|
||||||
$('#slider-container').css('margin-left', '0px');
|
$('#slider-container').css('margin-left', '0px');
|
||||||
}
|
}
|
||||||
// Slide to effect
|
// Slide to effect
|
||||||
else if (enableSlide && store.get('slide') == 'to') {
|
else if (store.get('slide') == 'to') {
|
||||||
store.clear('slide');
|
|
||||||
// Disable transition while we tweak CSS
|
// Disable transition while we tweak CSS
|
||||||
$('#slider-container').addClass('notransition');
|
$('#slider-container').addClass('notransition');
|
||||||
// "Delete" the right part of the slider
|
// "Delete" the right part of the slider
|
||||||
|
@ -411,6 +414,13 @@
|
||||||
|
|
||||||
// Re-add transition effect
|
// Re-add transition effect
|
||||||
$('#slider-container').removeClass('notransition');
|
$('#slider-container').removeClass('notransition');
|
||||||
|
|
||||||
|
// add the transition event to detect the end of the transition effect
|
||||||
|
var transitionEvent = whichTransitionEvent();
|
||||||
|
transitionEvent
|
||||||
|
&& $("#slider-container").off(transitionEvent)
|
||||||
|
&& $("#slider-container").on(transitionEvent, resetSliders);
|
||||||
|
|
||||||
// And actually play the transition effect that will move the container from right to left
|
// And actually play the transition effect that will move the container from right to left
|
||||||
$('#slider-container').css('margin-left', '-100%');
|
$('#slider-container').css('margin-left', '-100%');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue