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

Side by Side Diff: lib/adblockplus.js

Issue 29348698: NoIssue - Use localStorage for storing filters in current Windows Store version of ABP for Edge (Closed)
Patch Set: Display an alert when trying to save to full localStorage Created July 27, 2016, 9:30 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | manifest.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 var keyPrefix = "file:"; 353 var keyPrefix = "file:";
354 354
355 function fileToKey(file) 355 function fileToKey(file)
356 { 356 {
357 return keyPrefix + (file instanceof FakeFile ? file.path : file.spec); 357 return keyPrefix + (file instanceof FakeFile ? file.path : file.spec);
358 } 358 }
359 359
360 function loadFile(file, successCallback, errorCallback) 360 function loadFile(file, successCallback, errorCallback)
361 { 361 {
362 var key = fileToKey(file); 362 var key = fileToKey(file);
363 ext.storage.get([key], function(items) 363 entry = localStorage.getItem(key);
kzar 2016/07/27 10:08:14 You missed the `var`.
364 { 364 if (entry)
365 var entry = items[key]; 365 successCallback(JSON.parse(entry));
366 if (entry) 366 else
367 { 367 errorCallback(new Error("File doesn't exist"));
368 successCallback(entry);
369 }
370 else
371 {
372 errorCallback(new Error("File doesn't exist"));
373 }
374 });
375 } 368 }
376 369
377 function saveFile(file, data, callback) 370 function saveFile(file, data, callback)
378 { 371 {
379 ext.storage.set(fileToKey(file), 372 try
380 { 373 {
381 content: data, 374 localStorage.setItem(fileToKey(file), JSON.stringify({
382 lastModified: Date.now() 375 content: data,
383 }, callback); 376 lastModified: Date.now()
377 }));
378 }
379 catch(error)
380 {
381 // QuotaExceededError can happen. Notify the user and ignore
382 alert("Subscription storage is full. Please remove some subscriptions and try again.");
kzar 2016/07/27 10:08:15 Nit: These lines are too long.
383 callback(new Error("Subscription storage is full. Please remove some subsc riptions and try again."));
kzar 2016/07/27 10:08:14 Mind putting the message in a variable instead of
shoniko 2016/07/27 10:46:51 If we are going to push this we should do it ASAP.
384 return;
385 }
386 callback();
384 } 387 }
385 exports.IO = { 388 exports.IO = {
386 resolveFilePath: function(path) 389 resolveFilePath: function(path)
387 { 390 {
388 return new FakeFile(path); 391 return new FakeFile(path);
389 }, 392 },
390 readFromFile: function(file, listener, callback) 393 readFromFile: function(file, listener, callback)
391 { 394 {
392 function onLoaded(entry) 395 function onLoaded(entry)
393 { 396 {
(...skipping 6143 matching lines...) Expand 10 before | Expand all | Expand 10 after
6537 search.push("notificationDownloadCount=" + encodeURIComponent(downlCount)); 6540 search.push("notificationDownloadCount=" + encodeURIComponent(downlCount));
6538 chrome.runtime.setUninstallURL(Utils.getDocLink("uninstalled") + "&" + searc h.join("&")); 6541 chrome.runtime.setUninstallURL(Utils.getDocLink("uninstalled") + "&" + searc h.join("&"));
6539 } 6542 }
6540 if ("setUninstallURL" in chrome.runtime) 6543 if ("setUninstallURL" in chrome.runtime)
6541 { 6544 {
6542 Prefs.untilLoaded.then(setUninstallURL); 6545 Prefs.untilLoaded.then(setUninstallURL);
6543 Prefs.on("notificationdata", setUninstallURL); 6546 Prefs.on("notificationdata", setUninstallURL);
6544 } 6547 }
6545 return exports; 6548 return exports;
6546 })(); 6549 })();
OLDNEW
« no previous file with comments | « no previous file | manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld