Skip to content

Import bug fixes #3915

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

Closed
JohnMcLear wants to merge 5 commits into from
+16 −1
Closed

Import bug fixes #3915

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36eadb3
pad_impexp: close modal on succesful import
JohnMcLear Apr 21, 2020
2b0231b
pad_impexp: handle the string
JohnMcLear Apr 21, 2020
136faa4
pad_impexp: refresh the page instead, ungraceful but works
JohnMcLear Apr 21, 2020
fea74cc
Merge pull request #11 from ether/develop
JohnMcLear Apr 25, 2020
d5a22b2
ace2_inner: reformatting, no functional changes
JohnMcLear Apr 21, 2020
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
17 changes: 16 additions & 1 deletion src/static/js/pad_impexp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,22 @@ var padimpexp = (function()
{
importFailed(status);
}
if(directDatabaseAccess) pad.switchToPad(clientVars.padId);
Comment thread
muxator marked this conversation as resolved.
else
{
$('#import_export').removeClass('popup-show');
}

// directDatabaseAccess is a string not a boolean
if (directDatabaseAccess !== 'undefined') {
// commented out for now. This needs a proper fix after 1.8.3
// TODO: pad.switchToPad() should not require a reload of the page.
// Switch to the pad without redrawing the page
// pad.switchToPad(clientVars.padId);

location.reload();
Comment thread
muxator marked this conversation as resolved.
$('#import_export').removeClass('popup-show');
}

importDone();
},
disable: function()
Expand Down