Skip to content

Commit 74595ef

Browse files
committed
change push to replace
1 parent 9fee3b8 commit 74595ef

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<meta name="google-site-verification" content="6EKYmQgGQXMflnG4iUF-NLqeuMPwiE5pE4LrZL3H9UE" />
1515
<meta name="msvalidate.01" content="12279713F8F9C1C1491999B2B710319A" />
1616
<meta name="description" content="Read and search within Navy and Marine Corps messages.">
17-
<meta name="keywords" content="navy, us navy, navadmin, alnav, maradmin, almar, dod, navadmin viewer">
17+
<meta name="keywords" content="navy, us navy, navadmin, alnav, maradmin, almar, dod, navadmin viewer, navadmin app">
1818
<meta name="author" content="Anson Liu">
1919

2020
<link href="css/style.css" rel="stylesheet" />

js/custom.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ function setTableMessages(msgType, msgYear) {
340340
console.log('setTableMessages' + msgTypeToString(msgType) + ' ' + msgYear);
341341

342342
document.title = shortNameForMessage(msgType, msgYear) + ' - ' + NAVADMIN_VIEWER_TITLE;
343-
window.history.pushState(document.title, NAVADMIN_VIEWER_TITLE, createURLParameters(msgType, msgYear));
343+
window.history.replaceState(document.title, NAVADMIN_VIEWER_TITLE, createURLParameters(msgType, msgYear));
344344

345345
//If msgYear is -1, set the msgYear to the latest year for the message type.
346346
if (msgYear == -1) {
@@ -507,11 +507,11 @@ function showMessageModal(msgType, msgYear, msgNumber, title, body) {
507507
document.title = msgModalTitle.text() + ' - ' + NAVADMIN_VIEWER_TITLE;
508508

509509
//Set window url to new message direct link parameters
510-
window.history.pushState(document.title, title, createURLParameters(msgType, msgYear, msgNumber));
510+
window.history.replaceState(document.title, title, createURLParameters(msgType, msgYear, msgNumber));
511511

512512
msgModal.on('hide.bs.modal', function (e) {
513513
document.title = shortNameForMessage(userSelectedMsgType, userSelectedMsgYear) + ' - ' + NAVADMIN_VIEWER_TITLE;
514-
window.history.pushState(document.title, NAVADMIN_VIEWER_TITLE, createURLParameters(userSelectedMsgType, userSelectedMsgYear, -1));
514+
window.history.replaceState(document.title, NAVADMIN_VIEWER_TITLE, createURLParameters(userSelectedMsgType, userSelectedMsgYear, -1));
515515
})
516516

517517
if (typeof analytics !== 'undefined') {
@@ -530,4 +530,9 @@ function shareUserSelectedMessageLink(e) {
530530
e.preventDefault(); // cancel the link behaviour
531531
var shareLink = createMessageDirectLink(userSelectedMsgType, userSelectedMsgYear, userSelectedMsgNumber, true);
532532
window.prompt("Copy the below share link to clipboard (\u229e Ctrl+C / \uf8ff \u2318+C)", shareLink);
533-
}
533+
}
534+
535+
// $(window).on('popstate',function(event) {
536+
// console.log("pop location: " + document.location);
537+
// console.log(getUrlParameter(window.location.href, 'type'))
538+
// });

0 commit comments

Comments
 (0)