Skip to content
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

Fix for Excluded URLs not saving while Sync is on #1021

Merged
merged 3 commits into from
Aug 9, 2024
Merged

Fix for Excluded URLs not saving while Sync is on #1021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4bb9b8
should fix issue with Exclude List not saved before window closed
cgorringe Mar 22, 2024
67f22ac
last didn't work, this one works
cgorringe Mar 22, 2024
1012c0c
v3.3.1.1
cgorringe Mar 27, 2024
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
8 changes: 4 additions & 4 deletions safari/Wayback Machine.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MARKETING_VERSION = 3.3.1;
MARKETING_VERSION = 3.3.1.1;
PRODUCT_BUNDLE_IDENTIFIER = archive.org.waybackmachine.mac.extension;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -493,7 +493,7 @@
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MARKETING_VERSION = 3.3.1;
MARKETING_VERSION = 3.3.1.1;
PRODUCT_BUNDLE_IDENTIFIER = archive.org.waybackmachine.mac.extension;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -521,7 +521,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MARKETING_VERSION = 3.3.1;
MARKETING_VERSION = 3.3.1.1;
PRODUCT_BUNDLE_IDENTIFIER = archive.org.waybackmachine.mac;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -548,7 +548,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MARKETING_VERSION = 3.3.1;
MARKETING_VERSION = 3.3.1.1;
PRODUCT_BUNDLE_IDENTIFIER = archive.org.waybackmachine.mac;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand Down
2 changes: 1 addition & 1 deletion webextension/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "Wayback Machine",
"version": "3.3.1",
"version": "3.3.1.1",
"description": "The Official Wayback Machine Extension - by the Internet Archive.",
"icons": {
"16": "images/app-icon/mini-icon16.png",
Expand Down
9 changes: 5 additions & 4 deletions webextension/scripts/exclude-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function loadExcludeList() {
}

// Saves exclude list from textarea to storage.
function saveExcludeList() {
function saveExcludeListAndClose() {
const text = document.getElementById('exclude-list-area').value
const lines = text.split('\n')
let urlSet = new Set()
Expand All @@ -44,7 +44,9 @@ function saveExcludeList() {
}
// save the modified list
const exlist = Array.from(urlSet)
chrome.storage.local.set({ 'auto_exclude_list': exlist })
chrome.storage.local.set({ 'auto_exclude_list': exlist }, () => {
closeWindow()
})
}

function resetExcludeList() {
Expand All @@ -62,8 +64,7 @@ $(function() {
$('#reset-btn').click(resetExcludeList)
$('#cancel-btn').click(closeWindow)
$('#save-btn').click((e) => {
saveExcludeList()
closeWindow()
saveExcludeListAndClose()
})
loadExcludeList()
})
Loading