mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2024-11-23 18:17:20 +00:00
Browser-storage: Only delete our own items
We should only delete our own items because browsers share local storage with all file:// URIs
This commit is contained in:
parent
638eb53429
commit
dd4305d520
@ -40,8 +40,8 @@ exports.startup = function() {
|
|||||||
compileFilter();
|
compileFilter();
|
||||||
// Listen for tm-clear-browser-storage messages
|
// Listen for tm-clear-browser-storage messages
|
||||||
$tw.rootWidget.addEventListener("tm-clear-browser-storage",function(event) {
|
$tw.rootWidget.addEventListener("tm-clear-browser-storage",function(event) {
|
||||||
window.localStorage.clear();
|
|
||||||
$tw.wiki.addTiddler({title: ENABLED_TITLE, text: "no"});
|
$tw.wiki.addTiddler({title: ENABLED_TITLE, text: "no"});
|
||||||
|
clearLocalStorage();
|
||||||
});
|
});
|
||||||
// Track tiddler changes
|
// Track tiddler changes
|
||||||
$tw.wiki.addEventListener("change",function(changes) {
|
$tw.wiki.addEventListener("change",function(changes) {
|
||||||
@ -66,32 +66,57 @@ exports.startup = function() {
|
|||||||
if(title === ENABLED_TITLE) {
|
if(title === ENABLED_TITLE) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Get the tiddler
|
// Save the tiddler
|
||||||
var tiddler = $tw.wiki.getTiddler(title);
|
saveTiddlerToLocalStorage(title,{
|
||||||
if(tiddler) {
|
logger: logger,
|
||||||
// Get the JSON of the tiddler
|
prefix: prefix
|
||||||
var json = JSON.stringify(tiddler.getFieldStrings());
|
});
|
||||||
// Try to save it to local storage
|
|
||||||
try {
|
|
||||||
window.localStorage.setItem(prefix + title,json);
|
|
||||||
} catch(e) {
|
|
||||||
if(e.name === "QuotaExceededError") {
|
|
||||||
// Complain if we failed
|
|
||||||
var msg = $tw.wiki.getTiddlerText(QUOTA_EXCEEDED_ALERT_TITLE,DEFAULT_QUOTA_EXCEEDED_ALERT_PREFIX + title + DEFAULT_QUOTA_EXCEEDED_ALERT_SUFFIX);
|
|
||||||
logger.alert(msg);
|
|
||||||
// No point in keeping old values around for this tiddler
|
|
||||||
window.localStorage.removeItem(prefix + title);
|
|
||||||
} else {
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
console.log("browser-storage: Saving",title);
|
|
||||||
} else {
|
|
||||||
window.localStorage.removeItem(prefix + title);
|
|
||||||
console.log("browser-storage: Deleting",title);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
function saveTiddlerToLocalStorage(title,options) {
|
||||||
|
options = options || {};
|
||||||
|
// Get the tiddler
|
||||||
|
var tiddler = $tw.wiki.getTiddler(title);
|
||||||
|
if(tiddler) {
|
||||||
|
// Get the JSON of the tiddler
|
||||||
|
var json = JSON.stringify(tiddler.getFieldStrings());
|
||||||
|
// Try to save it to local storage
|
||||||
|
try {
|
||||||
|
window.localStorage.setItem(options.prefix + title,json);
|
||||||
|
} catch(e) {
|
||||||
|
if(e.name === "QuotaExceededError") {
|
||||||
|
// Complain if we failed
|
||||||
|
var msg = $tw.wiki.getTiddlerText(QUOTA_EXCEEDED_ALERT_TITLE,DEFAULT_QUOTA_EXCEEDED_ALERT_PREFIX + title + DEFAULT_QUOTA_EXCEEDED_ALERT_SUFFIX);
|
||||||
|
if(options.logger) {
|
||||||
|
options.logger.alert(msg);
|
||||||
|
}
|
||||||
|
// No point in keeping old values around for this tiddler
|
||||||
|
window.localStorage.removeItem(options.prefix + title);
|
||||||
|
} else {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
console.log("browser-storage: Saving",title);
|
||||||
|
} else {
|
||||||
|
window.localStorage.removeItem(options.prefix + title);
|
||||||
|
console.log("browser-storage: Deleting",title);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearLocalStorage() {
|
||||||
|
var url = window.location.pathname,
|
||||||
|
log = [];
|
||||||
|
// Step through each browsder storage item
|
||||||
|
for(var index=window.localStorage.length - 1; index>=0; index--) {
|
||||||
|
var key = window.localStorage.key(index),
|
||||||
|
parts = key.split("#");
|
||||||
|
// Delete it if it's ours
|
||||||
|
if(parts[0] === "tw5" && parts[1] === url) {
|
||||||
|
window.localStorage.removeItem(key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
})();
|
})();
|
||||||
|
Loading…
Reference in New Issue
Block a user