radex
/
jspaint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't close Load from URL if URL invalid

main
Isaiah Odhner 2019-09-17 18:51:10 -04:00
parent 07a37d944e
commit 35c2af0143
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/functions.js
View File

@ -203,13 +203,13 @@ function file_load_from_url(){
$w.$main.html("<label>URL: <input type='url' required value='' class='url-input'/></label>");
var $input = $w.$main.find(".url-input");
$w.$Button("Load", function(){
$w.close();
// TODO: retry loading if same URL entered
// actually, make it change the hash only after loading successfully
// (but still load from the hash when necessary)
// make sure it doesn't overwrite the old session before switching
var uris = get_URIs($input.val());
if (uris.length > 0) {
// TODO: retry loading if same URL entered
// actually, make it change the hash only after loading successfully
// (but still load from the hash when necessary)
// make sure it doesn't overwrite the old session before switching
$w.close();
location.hash = "load:" + encodeURIComponent(uris[0]);
} else {
show_error_message("Invalid URL. It must include a protocol (https:// or http://)");

1
src/sessions.js
View File

@ -425,6 +425,7 @@
}
end_current_session();
// TODO: fix loading duplicately, from popstate and hashchange
open_from_URI(url, function(err){
if(err){
show_resource_load_error_message();