forked from mozilla-mobile/fenix
-
Notifications
You must be signed in to change notification settings - Fork 217
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
For mozilla-mobile#16248 - Cleanup error pages of inlined code (mozil…
…la-mobile#16834) Also streamlined the js code. The errorPageScripts.js from AC had too much or too little of what we needed.
- Loading branch information
Showing
7 changed files
with
167 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
/* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
||
/** | ||
* Handles the parsing of the ErrorPages URI and then passes them to injectValues | ||
*/ | ||
function parseQuery(queryString) { | ||
if (queryString[0] === '?') { | ||
queryString = queryString.substr(1); | ||
} | ||
const query = Object.fromEntries(new URLSearchParams(queryString).entries()); | ||
injectValues(query); | ||
}; | ||
|
||
/** | ||
* Updates the HTML elements based on the queryMap | ||
*/ | ||
function injectValues(queryMap) { | ||
// Go through each element and inject the values | ||
document.title = queryMap.title; | ||
document.getElementById('errorTitleText').innerHTML = queryMap.title; | ||
document.getElementById('errorShortDesc').innerHTML = queryMap.description; | ||
|
||
// If no image is passed in, remove the element so as not to leave an empty iframe | ||
const errorImage = document.getElementById('errorImage'); | ||
if (!queryMap.image) { | ||
errorImage.remove(); | ||
} else { | ||
errorImage.src = "resource://android/assets/" + queryMap.image; | ||
} | ||
} | ||
|
||
document.addEventListener('DOMContentLoaded', function () { | ||
if (window.history.length == 1) { | ||
document.getElementById('backButton').style.display = 'none'; | ||
} else { | ||
document.getElementById('backButton').addEventListener('click', () => window.history.back() ); | ||
} | ||
}); | ||
|
||
parseQuery(document.documentURI); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,116 @@ | ||
/* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
||
/** | ||
* Handles the parsing of the ErrorPages URI and then passes them to injectValues | ||
*/ | ||
function parseQuery(queryString) { | ||
if (queryString[0] === '?') { | ||
queryString = queryString.substr(1); | ||
} | ||
const query = Object.fromEntries(new URLSearchParams(queryString).entries()); | ||
injectValues(query); | ||
updateShowSSL(query); | ||
}; | ||
|
||
/** | ||
* Updates the HTML elements based on the queryMap | ||
*/ | ||
function injectValues(queryMap) { | ||
// Go through each element and inject the values | ||
document.title = queryMap.title; | ||
document.getElementById('errorTitleText').innerHTML = queryMap.title; | ||
document.getElementById('errorShortDesc').innerHTML = queryMap.description; | ||
document.getElementById('errorTryAgain').innerHTML = queryMap.button; | ||
document.getElementById('advancedButton').innerHTML = queryMap.badCertAdvanced; | ||
document.getElementById('badCertTechnicalInfo').innerHTML = queryMap.badCertTechInfo; | ||
document.getElementById('advancedPanelBackButton').innerHTML = queryMap.badCertGoBack; | ||
document.getElementById('advancedPanelAcceptButton').innerHTML = queryMap.badCertAcceptTemporary; | ||
|
||
// If no image is passed in, remove the element so as not to leave an empty iframe | ||
const errorImage = document.getElementById('errorImage'); | ||
if (!queryMap.image) { | ||
errorImage.remove(); | ||
} else { | ||
errorImage.src = "resource://android/assets/" + queryMap.image; | ||
} | ||
}; | ||
|
||
let advancedVisible = false; | ||
|
||
/** | ||
* Used to show or hide the "advanced" button based on the validity of the SSL certificate | ||
*/ | ||
function updateShowSSL(queryMap) { | ||
/** @type {'true' | 'false'} */ | ||
const showSSL = queryMap.showSSL; | ||
if (typeof document.addCertException === 'undefined') { | ||
document.getElementById('advancedButton').style.display='none'; | ||
} else { | ||
if (showSSL === 'true') { | ||
document.getElementById('advancedButton').style.display='block'; | ||
} else { | ||
document.getElementById('advancedButton').style.display='none'; | ||
} | ||
} | ||
}; | ||
|
||
/** | ||
* Used to display information about the SSL certificate in `error_pages.html` | ||
*/ | ||
function toggleAdvancedAndScroll() { | ||
const advancedPanel = document.getElementById('badCertAdvancedPanel'); | ||
if (advancedVisible) { | ||
advancedPanel.style.display='none'; | ||
} else { | ||
advancedPanel.style.display='block'; | ||
} | ||
advancedVisible = !advancedVisible; | ||
|
||
const horizontalLine = document.getElementById("horizontalLine"); | ||
const advancedPanelAcceptButton = document.getElementById( | ||
"advancedPanelAcceptButton" | ||
); | ||
const badCertAdvancedPanel = document.getElementById( | ||
"badCertAdvancedPanel" | ||
); | ||
|
||
// We know that the button is being displayed | ||
if (badCertAdvancedPanel.style.display === "block") { | ||
horizontalLine.hidden = false; | ||
advancedPanelAcceptButton.scrollIntoView({ | ||
behavior: "smooth", | ||
block: "center", | ||
inline: "nearest", | ||
}); | ||
} else { | ||
horizontalLine.hidden = true; | ||
} | ||
}; | ||
|
||
/** | ||
* Used to bypass an SSL pages in `error_pages.html` | ||
*/ | ||
async function acceptAndContinue(temporary) { | ||
try { | ||
await document.addCertException(temporary); | ||
location.reload(); | ||
} catch (error) { | ||
console.error("Unexpected error: " + error); | ||
} | ||
}; | ||
|
||
document.addEventListener('DOMContentLoaded', function () { | ||
if (window.history.length == 1) { | ||
document.getElementById('advancedPanelBackButton').style.display = 'none'; | ||
} else { | ||
document.getElementById('advancedPanelBackButton').addEventListener('click', () => window.history.back()); | ||
} | ||
|
||
document.getElementById('errorTryAgain').addEventListener('click', () => window.location.reload()); | ||
document.getElementById('advancedButton').addEventListener('click', toggleAdvancedAndScroll); | ||
document.getElementById('advancedPanelAcceptButton').addEventListener('click', () => acceptAndContinue(true)); | ||
}); | ||
|
||
parseQuery(document.documentURI); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters