mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-29 20:41:03 +00:00
Code Issues Projects Releases Wiki Activity

fix next/prev page

Browse source
This commit is contained in:
Thomas Citharel 2016-11-05 16:06:13 +01:00
parent 5637a26e9a
commit c930992348
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Resources/static/themes/_global/js/shortcuts/main.js
View file

@ -1,6 +1,5 @@
import Mousetrap from 'mousetrap'; import Mousetrap from 'mousetrap';
/** Shortcuts **/ /** Shortcuts **/
/* Go to */ /* Go to */

18
app/Resources/static/themes/material/js/shortcuts/main.js
View file

@ -6,16 +6,12 @@ function toggleFocus(cardToToogleFocus) {
$(cardToToogleFocus).toggleClass('z-depth-4'); $(cardToToogleFocus).toggleClass('z-depth-4');
} }
} }
let card;
let cardIndex;
let cardNumber;
let pagination;
$(document).ready(() => { $(document).ready(() => {
cardIndex = 0; let cardIndex = 0;
cardNumber = $('#content ul.data > li').length; const cardNumber = $('#content ul.data > li').length;
card = $('#content ul.data > li')[cardIndex]; let card = $('#content ul.data > li')[cardIndex];
pagination = $('.pagination'); const pagination = $('.pagination');
/* If we come from next page */ /* If we come from next page */
if (window.location.hash === '#prev') { if (window.location.hash === '#prev') {
@ -44,9 +40,8 @@ $(document).ready(() => {
toggleFocus(card); toggleFocus(card);
return; return;
} }
if (pagination != null && pagination.find('li.next') && cardIndex === cardNumber - 1) { if (pagination.length > 0 && pagination.find('li.next:not(.disabled)').length > 0 && cardIndex === cardNumber - 1) {
window.location.href = window.location.origin + $(pagination).find('li.next a').attr('href'); window.location.href = window.location.origin + $(pagination).find('li.next a').attr('href');
return;
} }
}); });
@ -59,9 +54,8 @@ $(document).ready(() => {
toggleFocus(card); toggleFocus(card);
return; return;
} }
if (pagination !== null && $(pagination).find('li.prev') && cardIndex === 0) { if (pagination.length > 0 && $(pagination).find('li.prev:not(.disabled)').length > 0 && cardIndex === 0) {
window.location.href = `${window.location.origin + $(pagination).find('li.prev a').attr('href')}#prev`; window.location.href = `${window.location.origin + $(pagination).find('li.prev a').attr('href')}#prev`;
return;
} }
}); });

4
web/bundles/wallabagcore/themes/material/js/material.min.js vendored
View file

File diff suppressed because one or more lines are too long