Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: lib/adblockplus.js

Issue 29348698: NoIssue - Use localStorage for storing filters in current Windows Store version of ABP for Edge (Closed)
Patch Set: Address the comments Created July 27, 2016, 4:32 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/adblockplus.js
===================================================================
--- a/lib/adblockplus.js
+++ b/lib/adblockplus.js
@@ -360,27 +360,44 @@
function loadFile(file, successCallback, errorCallback)
{
var key = fileToKey(file);
- ext.storage.get([key], function(items)
- {
- var entry = items[key];
- if (entry)
- {
- successCallback(entry);
- }
- else
- {
- errorCallback(new Error("File doesn't exist"));
- }
- });
+ var entry = localStorage.getItem(key);
+ if (entry)
+ {
+ successCallback(JSON.parse(entry));
+ }
+ else
+ {
+ // Also check the chrome.storage.local
+ // We may have a init data there
+ ext.storage.get([key], function(items)
+ {
+ var entry = items[key];
+ if (entry)
+ successCallback(entry);
+ else
+ errorCallback(new Error("File doesn't exist"));
+ });
+ }
}
-
function saveFile(file, data, callback)
{
- ext.storage.set(fileToKey(file),
- {
- content: data,
- lastModified: Date.now()
- }, callback);
+ try
+ {
+ localStorage.setItem(fileToKey(file), JSON.stringify({
+ content: data,
+ lastModified: Date.now()
+ }));
+ }
+ catch(error)
+ {
+ // QuotaExceededError can happen. Notify the user and ignore
+ var errorMessage = "Subscription storage is full. " +
+ "Please remove some subscriptions and try again.";
+ alert(errorMessage);
+ callback(new Error(errorMessage));
+ return;
+ }
+ callback();
}
exports.IO = {
resolveFilePath: function(path)
« no previous file with comments | « no previous file | manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld