Issue 2040 - Replaced localStorage with chrome.storage.local

safari/ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 652 matching lines @@
         // only when reloading the page or following links, but not when
         // the current page is replaced with a prerendered page.
         replacePage(pages[event.message.pageId]);
         break;
     }
   });
 
 
   /* Storage */
 
-  ext.storage = safari.extension.settings;
+  ext.storage = {
+    get: function(keys, callback)
+    {
+      var items = {};
+      var settings = safari.extension.settings;
+
+      for (var i = 0; i < keys.length; i++)
+      {
+        var key = keys[i];
+        if (key in settings)
+          items[key] = settings[key];
+      }
+
+      setTimeout(callback, 0, items);
+    },
+    set: function(key, value, callback)
+    {
+      safari.extension.settings[key] = value;
+
+      if (callback)
+        setTimeout(callback, 0);
+    },
+    remove: function(key, callback)
+    {
+      delete safari.extension.settings[key];
+
+      if (callback)
+        setTimeout(callback, 0);
+    },
+    onChanged: new ext._EventTarget(),
+
+    // Preferences were previously encoded as JSON for compatibility
+    // with localStorage, which has been used on Chrome.
+    migratePrefs: function(mapFunc)
+    {
+      var settings = safari.extension.settings;
+
+      for (var key in settings)
+      {
+        var item = mapFunc(key, settings[key]);
+        if (item)

[Wladimir Palant, 2015/03/16 12:20:26]

Add |&& item.key != key| here? I think we will keep "migrating" currentVersion
until the end of times otherwise. Should have a comment explaining this of
course.

[Sebastian Noack, 2015/03/16 12:54:34]

Done.

+        {
+          delete settings[key];
+          settings[item.key] = item.value;
+        }
+      }
+    }
+  };
+
+  safari.extension.settings.addEventListener("change", function(event)
+  {
+    var changes = {};
+    var change = changes[event.key] = {};
+
+    if (event.oldValue != null)
+      change.oldValue = event.oldValue;
+    if (event.newValue != null)
+      change.newValue = event.newValue;
+
+    ext.storage.onChanged._dispatch(changes);
+  });
 
 
   /* Options */
 
   ext.showOptions = function(callback)
   {
     var optionsUrl = safari.extension.baseURI + "options.html";
 
     for (var id in pages)
     {
       var page = pages[id];
       var tab = page._tab;
 
       if (page.url.href == optionsUrl && tab.browserWindow == safari.application.activeBrowserWindow)
       {
         tab.activate();
         if (callback)
           callback(page);
         return;
       }
     }
 
     ext.pages.open(optionsUrl, callback);
   };
 })();