Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
tails
Commits
f5e9792b
Commit
f5e9792b
authored
Jan 10, 2019
by
sajolida
Browse files
Fix buggy merge conflicts from
aa2e4ead
parent
df3e78b9
Changes
1
Hide whitespace changes
Inline
Side-by-side
wiki/src/install/inc/js/download.js
View file @
f5e9792b
...
...
@@ -271,10 +271,10 @@ document.addEventListener("DOMContentLoaded", function() {
opaque
(
document
.
getElementById
(
"
continue-link-bittorrent
"
));
// Display "Verify with your browser" when image is clicked
document
.
getElementById
(
"
download-img
"
).
onclick
=
function
(
e
)
{
displayVerificationExtension
(
e
);
}
document
.
getElementById
(
"
download-iso
"
).
onclick
=
function
(
e
)
{
displayVerificationExtension
(
e
);
}
document
.
getElementById
(
"
download-img
"
).
onclick
=
function
(
e
)
{
displayVerificationExtension
(
e
,
this
);
}
document
.
getElementById
(
"
download-iso
"
).
onclick
=
function
(
e
)
{
displayVerificationExtension
(
e
,
this
);
}
function
displayVerificationExtension
(
e
)
{
function
displayVerificationExtension
(
e
,
elm
)
{
try
{
e
.
preventDefault
();
hitCounter
(
"
download-image
"
);
...
...
@@ -283,7 +283,7 @@ document.addEventListener("DOMContentLoaded", function() {
}
finally
{
// Setting window.location.href will abort AJAX requests resulting
// in a NetworkError depending on the timing and browser.
window
.
open
(
this
.
getAttribute
(
"
href
"
),
"
_blank
"
);
window
.
open
(
elm
.
getAttribute
(
"
href
"
),
"
_blank
"
);
}
}
...
...
@@ -295,10 +295,10 @@ document.addEventListener("DOMContentLoaded", function() {
}
// Reset verification when downloading again after failure
document
.
getElementById
(
"
download-img-again
"
).
onclick
=
function
(
e
)
{
resetVerification
(
e
);
}
document
.
getElementById
(
"
download-iso-again
"
).
onclick
=
function
(
e
)
{
resetVerification
(
e
);
}
document
.
getElementById
(
"
download-img-again
"
).
onclick
=
function
(
e
)
{
resetVerification
(
e
,
this
);
}
document
.
getElementById
(
"
download-iso-again
"
).
onclick
=
function
(
e
)
{
resetVerification
(
e
,
this
);
}
function
resetVerification
(
e
)
{
function
resetVerification
(
e
,
elm
)
{
try
{
e
.
preventDefault
();
hitCounter
(
"
download-image-again
"
);
...
...
@@ -307,7 +307,7 @@ document.addEventListener("DOMContentLoaded", function() {
}
finally
{
// Setting window.location.href will abort AJAX requests resulting
// in a NetworkError depending on the timing and browser.
window
.
open
(
this
.
getAttribute
(
"
href
"
),
"
_blank
"
);
window
.
open
(
elm
.
getAttribute
(
"
href
"
),
"
_blank
"
);
}
}
...
...
sajolida
@sajolida
mentioned in issue
#16354 (closed)
·
May 14, 2020
mentioned in issue
#16354 (closed)
mentioned in issue #16354
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment