From 87a7ea0d4ade90a568ea5214dbdeb67299fb1877 Mon Sep 17 00:00:00 2001 From: opi Date: Sat, 19 Mar 2016 11:58:48 +0100 Subject: [PATCH] [enh] Use less JS for sliding animation. --- src/css/style.less | 5 +---- src/js/yunohost/helpers.js | 5 ++--- src/js/yunohost/main.js | 8 -------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/css/style.less b/src/css/style.less index c6d51609..1915e17d 100644 --- a/src/css/style.less +++ b/src/css/style.less @@ -190,10 +190,7 @@ button { #slider-container { .clearfix; - /*[RFC] why the max-width? */ - /*max-width: 1500px;*/ - /*width: 1500px; */ - width: 100%; + width: 200%; height: 100%; min-height: 150px; } diff --git a/src/js/yunohost/helpers.js b/src/js/yunohost/helpers.js index 94a1c015..cc89bec8 100644 --- a/src/js/yunohost/helpers.js +++ b/src/js/yunohost/helpers.js @@ -206,7 +206,7 @@ if (store.get('slide') == 'back') { store.clear('slide'); $('#slideBack').css('display', 'none'); - $('#slider-container').removeClass('move').css('margin-left', '-'+ blockSize +'px'); + $('#slider-container').removeClass('move').css('margin-left', '-100%'); $('#slideTo').show().html($('#main').html()); leSwap(); $('#slider-container').addClass('move').css('margin-left', '0px'); @@ -215,11 +215,10 @@ } else if (store.get('slide') == 'to') { store.clear('slide'); $('#slideTo').css('display', 'none'); - $('#slider-container').removeClass('move').css('margin-left', '-'+ blockSize +'px'); $('#slider-container').removeClass('move').css('margin-left', '0px'); $('#slideBack').show().html($('#main').html()); leSwap(); - $('#slider-container').addClass('move').css('margin-left', '-'+ blockSize +'px'); + $('#slider-container').addClass('move').css('margin-left', '-100%'); } else { leSwap(); diff --git a/src/js/yunohost/main.js b/src/js/yunohost/main.js index 8675f4a6..11307fc2 100644 --- a/src/js/yunohost/main.js +++ b/src/js/yunohost/main.js @@ -9,14 +9,6 @@ */ sam.bind('run', function () { - // Fixes for sliding effect - $('#slider-container').width(2*$('#slider').width() +'px'); - $(window).resize(function() { - $('#slideBack').css('display', 'none'); - $('#slideTo').css('display', 'none'); - $('#slider-container').width(2*$('#slider').width() +'px').removeClass('move').css('margin-left', '0px'); - }); - // Flash messages var flashMessage = $('#flashMessage'); $('#toggle-btn', flashMessage).click(function(e) {