Skip to content

Fixes #35; avoids namespace conflicts in localStorage keys #36

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

Open
cspotcode wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes #35; avoids namespace conflicts in localStorage keys #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc58cdf
Fixes #35; avoids namespace conflicts in localStorage keys
cspotcode Apr 13, 2017
46a3143
Migrates legacy localStorage keys to new naming convention
cspotcode Apr 13, 2017
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
18 changes: 15 additions & 3 deletions background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,21 @@ _gaq.push(['_setCustomVar', 1, 'windowCount', savedWindowNames.length, 1]);
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();

// v1.4: Migrate from old localStorage keys to new
for(var i in savedWindowNames) {
var name = savedWindowNames[i];
if(!localStorage[savedWindowStorageKey(name)] && localStorage[name]) {
localStorage[savedWindowStorageKey(name)] = localStorage[name];
delete localStorage[name];
}
}

// populate savedWindows from local storage
// as we go, try matching them to open windows
chrome.windows.getAll({populate:true}, function(browserWindows) {
for (var i in savedWindowNames) {
var name = savedWindowNames[i];
var savedWindow = restoreFromLocalStorage(name);
var savedWindow = restoreFromLocalStorage(savedWindowStorageKey(name));
if (!savedWindow) {
console.error("Window " + name + " was not found in localStorage.");
savedWindowNames.splice(savedWindowNames.indexOf(name), 1);
Expand Down Expand Up @@ -146,7 +154,7 @@ function storeWindow(browserWindow, name, displayName) {
browserWindow.displayName = displayName;

savedWindows[name] = browserWindow;
localStorage[name] = JSON.stringify(browserWindow);
localStorage[savedWindowStorageKey(name)] = JSON.stringify(browserWindow);

return browserWindow;
}
Expand Down Expand Up @@ -225,8 +233,12 @@ function deleteSavedWindow(name) {
}

delete closedWindows[savedWindow.name];
delete localStorage[name];
delete localStorage[savedWindowStorageKey(name)];
delete savedWindows[name];
savedWindowNames.splice(savedWindowNames.indexOf(name), 1);
localStorage.savedWindowNames = JSON.stringify(savedWindowNames);
}

function savedWindowStorageKey(name) {
return 'savedWindow:' + name;
}