Issue 3716 - Split up files stored in storage.local

safari/ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 690 matching lines @@
         var key = keys[i];
         if (key in settings)
           items[key] = settings[key];
       }
 
       setTimeout(callback, 0, items);
     },
     set: function(items, callback)
     {
       for (let key in items)
-      {
-        if (items.hasOwnProperty(key))

[Sebastian Noack, 2016/03/31 14:08:53]

I think it's safe to just skip this check. We never call ext.storage.set with
anything other than a plain object without custom prototype.

-        {
-          safari.extension.settings[key] = items[key];
-        }
-      }
+        safari.extension.settings[key] = items[key];
       if (callback)
-        setTimeout(callback, 0);
+        setTimeout(callback);
     },
     remove: function(key, callback)
     {
       delete safari.extension.settings[key];
 
       if (callback)
         setTimeout(callback, 0);
     },
     onChanged: new ext._EventTarget()
   };
@@ skipping 38 matching lines @@
   /* Windows */
   ext.windows = {
     // Safari doesn't provide as rich a windows API as Chrome does, so instead
     // of chrome.windows.create we have to fall back to just opening a new tab.
     create: function(createData, callback)
     {
       ext.pages.open(createData.url, callback);
     }
   };
 })();