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

Fix for #1248; moved returnToCurrentPage function to uiUtil.js #1249

Merged
merged 12 commits into from
May 6, 2024
Merged

Fix for #1248; moved returnToCurrentPage function to uiUtil.js #1249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
62643f0
Fixed, and attempted to work on auto-config page with home button click.
D3V-D Apr 28, 2024
a428c12
Fixed most drag issues, optimized UX for dragging over iframe.
D3V-D Apr 28, 2024
1dc563a
Updated to work with chromium & firefox. UX improved for dragging ite…
D3V-D Apr 28, 2024
7fe5b45
Small syntax and formatting fixes
D3V-D Apr 28, 2024
7596e56
Cleaned up code for PR
D3V-D Apr 29, 2024
d8d6d0e
Merge branch 'main' into main
D3V-D May 1, 2024
0609d11
Drag leave now returns to previous page without loading anything, and…
D3V-D May 4, 2024
7544179
Implemented IE11 support
D3V-D May 4, 2024
a6739e4
Removed unneeded checks and empty line
D3V-D May 4, 2024
34af079
Merge branch 'kiwix:main' into main
D3V-D May 4, 2024
74e9149
Moved returntocurrentpage function to uiUtil as cleanup
D3V-D May 4, 2024
0c5960f
Merge branch 'main' of https://github.com/D3V-D/kiwix-js
D3V-D May 4, 2024
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
12 changes: 1 addition & 11 deletions www/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1659,7 +1659,7 @@ function handleGlobalDragleave (e) {
globalDropZone.classList.remove('dragging-over');
// Only return to page if a ZIM is actually loaded
if (selectedArchive.isReady()) {
returnToCurrentPage();
uiUtil.returnToCurrentPage();
}
}
}
Expand Down Expand Up @@ -1700,16 +1700,6 @@ function hasType (typesList, type) {
return false;
}

// Function to switch back to currently loaded page from config page after dragleave event
function returnToCurrentPage () {
document.getElementById('liConfigureNav').classList.remove('active');
document.getElementById('liHomeNav').classList.add('active');
uiUtil.tabTransitionToSection('home', params.showUIAnimations);
const welcomeText = document.getElementById('welcomeText');
welcomeText.style.display = 'none';
viewArticle.style.display = 'none';
}

async function handleFileDrop (packet) {
packet.stopPropagation();
packet.preventDefault();
Expand Down
23 changes: 13 additions & 10 deletions www/js/lib/uiUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,15 +926,17 @@ function applyAppTheme (theme) {
function showReturnLink () {
var viewArticle = document.getElementById('viewArticle');
viewArticle.style.display = 'block';
viewArticle.addEventListener('click', function (e) {
e.preventDefault();
document.getElementById('liConfigureNav').classList.remove('active');
document.getElementById('liHomeNav').classList.add('active');
tabTransitionToSection('home', params.showUIAnimations);
const welcomeText = document.getElementById('welcomeText');
welcomeText.style.display = 'none';
viewArticle.style.display = 'none';
});
viewArticle.addEventListener('click', returnToCurrentPage);
}

// Function to switch back to currently loaded page
function returnToCurrentPage () {
document.getElementById('liConfigureNav').classList.remove('active');
document.getElementById('liHomeNav').classList.add('active');
tabTransitionToSection('home', params.showUIAnimations);
const welcomeText = document.getElementById('welcomeText');
welcomeText.style.display = 'none';
viewArticle.style.display = 'none';
}

// Reports an error in loading one of the ASM or WASM machines to the UI API Status Panel
Expand Down Expand Up @@ -1077,5 +1079,6 @@ export default {
reportSearchProviderToAPIStatusPanel: reportSearchProviderToAPIStatusPanel,
warnAndOpenExternalLinkInNewTab: warnAndOpenExternalLinkInNewTab,
closestAnchorEnclosingElement: closestAnchorEnclosingElement,
getBrowserLanguage: getBrowserLanguage
getBrowserLanguage: getBrowserLanguage,
returnToCurrentPage: returnToCurrentPage
};
Loading