Merge pull request #5412 from guardian/sensitive-content-videos

Hide video adverts and 'more in section' when told to
guardian · Aug 6, 2014 · 241320c · 241320c
2 parents fe2b242 + e9d33ea
commit 241320c
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/common/app/assets/javascripts/bootstraps/media.js b/common/app/assets/javascripts/bootstraps/media.js
@@ -278,11 +278,11 @@ define([
                             if (mediaType === 'video') {
 
                                 modules.bindDiagnosticsEvents(player);
+                                player.fullscreener();
 
                                 // Init plugins
-                                if(config.switches.videoAdverts) {
+                                if (config.switches.videoAdverts && !config.page.shouldHideAdverts) {
                                     player.adCountDown();
-                                    player.fullscreener();
                                     player.ads({
                                         timeout: 3000
                                     });
@@ -295,7 +295,7 @@ define([
                                     modules.bindContentEvents(player);
                                 }
 
-                                if(/desktop|wide/.test(detect.getBreakpoint())) {
+                                if (/desktop|wide/.test(detect.getBreakpoint())) {
                                     modules.initEndSlate(player);
                                 }
                             } else {
@@ -402,11 +402,13 @@ define([
         }
 
         if (config.isMedia) {
-            modules.initMoreInSection();
+            if (config.page.showRelatedContent) {
+                modules.initMoreInSection();
+            }
             modules.initMostViewedMedia();
         }
 
-        if(config.page.contentType === 'Video' && detect.getBreakpoint() !== 'mobile') {
+        if (config.page.contentType === 'Video' && detect.getBreakpoint() !== 'mobile') {
             modules.displayReleaseMessage();
         }
     };