Issue 1258 - Block ads in YouTube's HTML5 player on Safari

safari/include.youtube.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 80 matching lines @@
     // player with JavaScript which video and which ads to show next,
     // bypassing our flashvars rewrite code. So we disable
     // history.pushState before YouTube's JavaScript runs.
     History.prototype.pushState = undefined;
 
     // The HTML5 player is configured via ytplayer.config.args. We have
     // to make sure that ad-related arguments are ignored as they are set.
     var ytplayer = undefined;
     Object.defineProperty(window, "ytplayer",
     {
+      configurable: true,
       get: function()
       {
         return ytplayer;
       },
       set: function(rawYtplayer)
       {
         if (!rawYtplayer || typeof rawYtplayer != "object")
         {
           ytplayer = rawYtplayer;
           return;
         }
 
         var config = undefined;
-        ytplayer = {
-          __proto__: rawYtplayer,
-          get config()

[Wladimir Palant, 2014/08/29 20:37:07]

Given that __proto__ is deprecated, I wonder whether this should be:

ytplayer = Object.create(rawYtplayer, {
  config: {
    enumerable: true,
    get: function() {...},
    set: function() {...}
  }
});

You will of course point out that this adds two lines of course so it's up to
you whether you want to do it :)

[Sebastian Noack, 2014/08/29 20:45:05]

We don't use Object.create() so far in this codebase. So I prefer to keep
consistent for now. However, we should replace {__proto__: ...} with
Object.create() all over the place at some point. Is there already an issue for
that?

[Sebastian Noack, 2014/08/30 11:03:14]

Done.

-          {
-            return config;
-          },
-          set config(rawConfig)
-          {
-            if (!rawConfig || typeof rawConfig != "object")
+        ytplayer = Object.create(rawYtplayer, {
+          config: {
+            enumerable: true,
+            get: function()
             {
-              config = rawConfig;
-              return;
+              return config;
+            },
+            set: function(rawConfig)
+            {
+              if (!rawConfig || typeof rawConfig != "object")
+              {
+                config = rawConfig;
+                return;
+              }
+
+              var args = undefined;
+              config = Object.create(rawConfig, {
+                args: {
+                  enumerable: true,
+                  get: function()
+                  {
+                    return args;
+                  },
+                  set: function(rawArgs)
+                  {
+                    if (!rawArgs || typeof rawArgs != "object")
+                    {
+                      args = rawArgs;
+                      return;
+                    }
+
+                    args = {};
+                    for (var arg in rawArgs)
+                    {
+                      if (!badArgumentsRegex.test(arg))
+                        args[arg] = rawArgs[arg];
+                    }
+                  }
+                }
+              });
+
+              config.args = rawConfig.args;
             }
-
-            var args = undefined;
-            config = {
-              __proto__: rawConfig,
-              get args()
-              {
-                return args;
-              },
-              set args(rawArgs)
-              {
-                if (!rawArgs || typeof rawArgs != "object")
-                {
-                  args = rawArgs;
-                  return;
-                }
-
-                args = {};
-                for (var arg in rawArgs)
-                {
-                  if (!badArgumentsRegex.test(arg))
-                    args[arg] = rawArgs[arg];
-                }
-              }
-            };
-
-            config.args = rawConfig.args;
           }
-        };
+        });
 
         ytplayer.config = rawYtplayer.config;
-      },
-      configurable: true
+      }
     });
   }, badArgumentsRegex);
 })();