Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reopen last article #1090

Closed
wants to merge 41 commits into from
Closed

Reopen last article #1090

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
09f1a74
demo changed
Rbcoder1 Apr 25, 2023
5cd2569
f
Rbcoder1 Apr 25, 2023
e3725f5
Merge branch 'kiwix:main' into main
Rbcoder1 May 6, 2023
f3f0c6c
revert files
Rbcoder1 May 7, 2023
4e3e081
Merge branch 'main' of github.com:kiwix/kiwix-js
Rbcoder1 May 7, 2023
a3caa96
Merge branch 'kiwix:main' into main
Rbcoder1 Jun 3, 2023
f98e1df
Merge branch 'kiwix:main' into main
Rbcoder1 Jun 14, 2023
d199c27
Merge branch 'main' of https://github.com/Rbcoder1/kiwix-js
Rbcoder1 Jul 29, 2023
45616c4
Merge branch 'kiwix:main' into main
Rbcoder1 Aug 10, 2023
0d96e94
Merge branch 'kiwix:main' into main
Rbcoder1 Aug 14, 2023
39b908e
Merge branch 'kiwix:main' into main
Rbcoder1 Aug 28, 2023
99a9abd
Merge branch 'kiwix:main' into main
Rbcoder1 Aug 31, 2023
23a6b02
add functionality reopen last article
Rbcoder1 Aug 31, 2023
12167c7
Merge branch 'main' into reopen_last_article
Rbcoder1 Sep 1, 2023
4c1051a
remove require script
Rbcoder1 Sep 1, 2023
762da87
Merge branch 'main' into reopen_last_article
Rbcoder1 Sep 1, 2023
05b783d
Merge branch 'reopen_last_article' of https://github.com/Rbcoder1/kiw…
Rbcoder1 Sep 1, 2023
71dbb79
Merge branch 'kiwix:main' into main
Rbcoder1 Sep 1, 2023
a01f149
fix animation
Rbcoder1 Sep 1, 2023
decec4b
Merge branch 'main' into reopen_last_article
Rbcoder1 Sep 3, 2023
51750ae
Merge branch 'kiwix:main' into main
Rbcoder1 Sep 7, 2023
8623f24
Code Optimized
Rbcoder1 Sep 7, 2023
8a1b2f1
Merge remote-tracking branch 'origin' into reopen_last_article
Rbcoder1 Sep 7, 2023
c9cf212
viewArticle seperation
Rbcoder1 Sep 8, 2023
3c71aa3
Merge branch 'reopen_last_article' of https://github.com/Rbcoder1/kiw…
Rbcoder1 Sep 8, 2023
cf56e7e
Merge branch 'main' of https://github.com/kiwix/kiwix-js
Rbcoder1 Sep 12, 2023
ae9951d
Merge branch 'main' into reopen_last_article
Rbcoder1 Sep 12, 2023
69647a1
Merge branch 'main' into reopen_last_article
Rbcoder1 Sep 12, 2023
8668566
Merge branch 'main' of https://github.com/Rbcoder1/kiwix-js
Rbcoder1 Sep 13, 2023
8a6fd71
Merge branch 'main' into reopen_last_article
Rbcoder1 Sep 13, 2023
c71fd30
small chage
Rbcoder1 Sep 29, 2023
d778d24
Merge branch 'main' of https://github.com/Rbcoder1/kiwix-js
Rbcoder1 Sep 29, 2023
a4ceb7d
Merge branch 'main' into reopen_last_article
Rbcoder1 Sep 30, 2023
2cfcc25
conflict revolved
Rbcoder1 Sep 30, 2023
955eaf0
Merge branch 'reopen_last_article' of https://github.com/Rbcoder1/kiw…
Rbcoder1 Sep 30, 2023
3b08683
Merge branch 'main' of https://github.com/Rbcoder1/kiwix-js
Rbcoder1 Nov 4, 2023
1ae5794
Merge branch 'main' into reopen_last_article
Rbcoder1 Nov 4, 2023
35d9f8e
button highlighting issue resolved
Rbcoder1 Nov 4, 2023
38abfce
resolved Issue
Rbcoder1 Nov 28, 2023
171f724
Merge branch 'main' of https://github.com/Rbcoder1/kiwix-js
Rbcoder1 Nov 28, 2023
5794f56
Merge branch 'main' into reopen_last_article
Rbcoder1 Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 41 additions & 21 deletions www/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,18 +384,28 @@ document.getElementById('btnConfigure').addEventListener('click', function (even
$('.navbar-collapse').collapse('hide');
// Show the selected content in the page
uiUtil.removeAnimationClasses();
if (params.showUIAnimations) {
uiUtil.applyAnimationToSection('config');
} else {
if(document.getElementById('configuration').style.display == 'none'){
Jaifroid marked this conversation as resolved.
Show resolved Hide resolved
if (params.showUIAnimations) {
uiUtil.applyAnimationToSection('config');
} else {
document.getElementById('about').style.display = 'none';
document.getElementById('configuration').style.display = '';
document.getElementById('articleContent').style.display = 'none';
}
document.getElementById('navigationButtons').style.display = 'none';
document.getElementById('formArticleSearch').style.display = 'none';
document.getElementById('welcomeText').style.display = 'none';
document.getElementById('searchingArticles').style.display = 'none';
document.querySelector('.kiwix-alert').style.display = 'none';
}
else{
Rbcoder1 marked this conversation as resolved.
Show resolved Hide resolved
document.getElementById('about').style.display = 'none';
document.getElementById('configuration').style.display = '';
document.getElementById('articleContent').style.display = 'none';
document.getElementById('configuration').style.display = 'none';
document.getElementById('articleContent').style.display = '';

document.getElementById('navigationButtons').style.display = '';
document.getElementById('formArticleSearch').style.display = '';
}
document.getElementById('navigationButtons').style.display = 'none';
document.getElementById('formArticleSearch').style.display = 'none';
document.getElementById('welcomeText').style.display = 'none';
document.getElementById('searchingArticles').style.display = 'none';
document.querySelector('.kiwix-alert').style.display = 'none';
refreshAPIStatus();
refreshCacheStatus();
uiUtil.checkUpdateStatus(appstate);
Expand All @@ -411,19 +421,29 @@ document.getElementById('btnAbout').addEventListener('click', function (event) {
$('.navbar-collapse').collapse('hide');
// Show the selected content in the page
uiUtil.removeAnimationClasses();
if (params.showUIAnimations) {
uiUtil.applyAnimationToSection('about');
} else {
document.getElementById('about').style.display = '';
if(document.getElementById('about').style.display == 'none'){
Jaifroid marked this conversation as resolved.
Show resolved Hide resolved
if (params.showUIAnimations) {
uiUtil.applyAnimationToSection('about');
} else {
document.getElementById('about').style.display = '';
document.getElementById('configuration').style.display = 'none';
document.getElementById('articleContent').style.display = 'none';
}
document.getElementById('navigationButtons').style.display = 'none';
document.getElementById('formArticleSearch').style.display = 'none';
document.getElementById('welcomeText').style.display = 'none';
document.getElementById('articleListWithHeader').style.display = 'none';
document.getElementById('searchingArticles').style.display = 'none';
document.querySelector('.kiwix-alert').style.display = 'none';
}
else{
Rbcoder1 marked this conversation as resolved.
Show resolved Hide resolved
document.getElementById('about').style.display = 'none';
document.getElementById('configuration').style.display = 'none';
document.getElementById('articleContent').style.display = 'none';
document.getElementById('articleContent').style.display = '';

document.getElementById('navigationButtons').style.display = '';
document.getElementById('formArticleSearch').style.display = '';
}
document.getElementById('navigationButtons').style.display = 'none';
document.getElementById('formArticleSearch').style.display = 'none';
document.getElementById('welcomeText').style.display = 'none';
document.getElementById('articleListWithHeader').style.display = 'none';
document.getElementById('searchingArticles').style.display = 'none';
document.querySelector('.kiwix-alert').style.display = 'none';
// Use a timeout of 400ms because uiUtil.applyAnimationToSection uses a timeout of 300ms
setTimeout(resizeIFrame, 400);
});
Expand Down
Loading
Loading