Issue 301 - Change for each to for .. of .. in lib/

lib/sync.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 180 matching lines @@
 
   createRecord: function(id, collection)
   {
     let record = new ABPEngine.prototype._recordObj(collection, id);
     if (id == filtersRecordID)
     {
       record.cleartext = {
         id: id,
         subscriptions: [],
       };
-      for each (let subscription in FilterStorage.subscriptions)
+      for (let subscription of FilterStorage.subscriptions)
       {
         if (subscription instanceof ExternalSubscription)
           continue;
 
         let subscriptionEntry =
         {
           url: subscription.url,
           disabled: subscription.disabled
         };
         if (subscription instanceof SpecialSubscription)
         {
           subscriptionEntry.filters = [];
-          for each (let filter in subscription.filters)
+          for (let filter of subscription.filters)
           {
             let filterEntry = {text: filter.text};
             if (filter instanceof ActiveFilter)
               filterEntry.disabled = filter.disabled;
             subscriptionEntry.filters.push(filterEntry);
           }
         }
         else
           subscriptionEntry.title = subscription.title;
         record.cleartext.subscriptions.push(subscriptionEntry);
@@ skipping 19 matching lines @@
   {
     if (record.id != filtersRecordID)
       return;
 
     this._log.trace("Merging in remote data");
 
     let data = record.cleartext.subscriptions;
 
     // First make sure we have the same subscriptions on both sides
     let seenSubscription = {__proto__: null};
-    for each (let remoteSubscription in data)
+    for (let remoteSubscription of data)
     {
       seenSubscription[remoteSubscription.url] = true;
       if (remoteSubscription.url in FilterStorage.knownSubscriptions)
       {
         let subscription = FilterStorage.knownSubscriptions[remoteSubscription.url];
         if (!trackerInstance.didSubscriptionChange(remoteSubscription))
         {
           // Only change local subscription if there were no changes, otherwise dismiss remote changes
           subscription.disabled = remoteSubscription.disabled;
           if (subscription instanceof DownloadableSubscription)
@@ skipping 10 matching lines @@
         subscription.disabled = remoteSubscription.disabled;
         if (subscription instanceof DownloadableSubscription)
         {
           subscription.title = remoteSubscription.title;
           FilterStorage.addSubscription(subscription);
           Synchronizer.execute(subscription);
         }
       }
     }
 
-    for each (let subscription in FilterStorage.subscriptions.slice())
+    for (let subscription of FilterStorage.subscriptions.slice())
     {
       if (!(subscription.url in seenSubscription) && subscription instanceof DownloadableSubscription && !trackerInstance.didSubscriptionChange(subscription))
       {
         // Subscription was removed remotely, remove it locally as well
         FilterStorage.removeSubscription(subscription);
       }
     }
 
     // Now sync the custom filters
     let seenFilter = {__proto__: null};
-    for each (let remoteSubscription in data)
+    for (let remoteSubscription of data)
     {
       if (!("filters" in remoteSubscription))
         continue;
 
-      for each (let remoteFilter in remoteSubscription.filters)
+      for (let remoteFilter of remoteSubscription.filters)
       {
         seenFilter[remoteFilter.text] = true;
 
         let filter = Filter.fromText(remoteFilter.text);
         if (trackerInstance.didFilterChange(filter))
           continue;
 
         if (filter.subscriptions.some(function(subscription) subscription instanceof SpecialSubscription))
         {
           // Filter might have been changed remotely
           if (filter instanceof ActiveFilter)
             filter.disabled = remoteFilter.disabled;
         }
         else
         {
           // Filter was added remotely, add it locally as well
           FilterStorage.addFilter(filter);
         }
       }
     }
 
-    for each (let subscription in FilterStorage.subscriptions)
+    for (let subscription of FilterStorage.subscriptions)
     {
       if (!(subscription instanceof SpecialSubscription))
         continue;
 
-      for each (let filter in subscription.filters.slice())
+      for (let filter of subscription.filters.slice())
       {
         if (!(filter.text in seenFilter) && !trackerInstance.didFilterChange(filter))
         {
           // Filter was removed remotely, remove it locally as well
           FilterStorage.removeFilter(filter);
         }
       }
     }
 
     // Merge done, forget about local changes now
     trackerInstance.clearPrivateChanges()
   },
 
   remove: function(record)
   {
     // Shouldn't be called but if it is - ignore
   },
 
   wipe: function()
   {
     this._log.trace("Got wipe command, removing all data");
 
-    for each (let subscription in FilterStorage.subscriptions.slice())
+    for (let subscription of FilterStorage.subscriptions.slice())
     {
       if (subscription instanceof DownloadableSubscription)
         FilterStorage.removeSubscription(subscription);
       else if (subscription instanceof SpecialSubscription)
       {
-        for each (let filter in subscription.filters.slice())
+        for (let filter of subscription.filters.slice())
           FilterStorage.removeFilter(filter);
       }
     }
 
     // Data wiped, forget about local changes now
     trackerInstance.clearPrivateChanges()
   }
 };
 
 /**
@@ skipping 60 matching lines @@
       case "subscription.updated":
         if ("oldSubscription" in item)
         {
           // Subscription moved to a new address
           this.addPrivateChange("subscription " + item.url);
           this.addPrivateChange("subscription " + item.oldSubscription.url);
         }
         else if (item instanceof SpecialSubscription)
         {
           // User's filters changed via Preferences window
-          for each (let filter in item.filters)
+          for (let filter of item.filters)
             this.addPrivateChange("filter " + filter.text);
-          for each (let filter in item.oldFilters)
+          for (let filter of item.oldFilters)
             this.addPrivateChange("filter " + filter.text);
         }
         break;
       case "subscription.added":
       case "subscription.removed":
       case "subscription.disabled":
       case "subscription.title":
         this.addPrivateChange("subscription " + item.url);
         break;
       case "filter.added":
       case "filter.removed":
       case "filter.disabled":
         this.addPrivateChange("filter " + item.text);
         break;
     }
   }
 };
 
 SyncServiceObserver.init();