Commit 4ebadc4b by talequale

merge

parents 310be1d0 5d0b3f30
...@@ -39,7 +39,7 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => { ...@@ -39,7 +39,7 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
let fromLeft = dom.scrollLeft; let fromLeft = dom.scrollLeft;
let firstItem = Math.round( fromLeft / ( cardWidth + padding )); let firstItem = Math.round( fromLeft / ( cardWidth + padding ));
leftButtonDisabled.set(firstItem===0); leftButtonDisabled.set(firstItem===0);
rightButtonDisabled.set(firstItem+fullCardsCount===items.length); rightButtonDisabled.set(firstItem+fullCardsCount>=items.length);
}; };
let untune = function() { let untune = function() {
...@@ -105,7 +105,7 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => { ...@@ -105,7 +105,7 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
waitTimeout = setTimeout(tuneScrollPosition, 80); waitTimeout = setTimeout(tuneScrollPosition, 80);
}; };
let dom; let dom;
let theDOM = <div class="card-slider"> let theDOM = <div class={D.cls('card-slider', {'card-slider__no-arrow-next': rightButtonDisabled})}>
<button class={D.cls( <button class={D.cls(
'button', 'button',
'button--round', 'button--round',
......
...@@ -34,7 +34,8 @@ const Account = D.declare('view.page.Account', () => { ...@@ -34,7 +34,8 @@ const Account = D.declare('view.page.Account', () => {
_(cards _(cards
.getArray() .getArray()
.filter(card=>card.seen === false) .filter(card=>card.seen === false)
.sort((a,b)=>a.id-b.id), w+(w<1024?0:320+30*2+30*2) .sort((a,b)=>a.id-b.id),
w+(w<1024?0:320+30*2+30*2)
) )
})} })}
/> />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment