Fix bugs after re-factor

Author: iq-dot

src/App.jsx

@@ -1,13 +1,8 @@
 import React from 'react';
-import videojs from 'video.js';
 import throttle from 'lodash/throttle';
-
-import 'videojs-overlay';
-import 'videojs-playlist';
-import 'imports-loader?videojs=video.js!videojs-vast-vpaid/dist/videojs_5.vast.vpaid';
 import 'whatwg-fetch';
 
-import Player from './Player.jsx';
+import Player from './Player';
 
 import { itn, bristolsport, londontheinside, spectator, telegraph } from './playlist';
 
@@ -44,15 +39,14 @@ function getClient() {
       : href.indexOf(url) !== -1;
   }
 
-
   return 'unknown';
 }
 
 const CLIENT = getClient();
 
 class App extends React.Component {
   static getVideos(url, client) {
-    let endpoint = `https://api.suggestv.io/semantics?url=${url}`;
+    let endpoint = `https://uat.suggestv.io/semantics?url=${url}`;
 
     if (client === 'telegraph') {
       endpoint += `&client=${client}`;
@@ -77,14 +71,15 @@ class App extends React.Component {
   static getAdTag(player, cb) {
     const height = player.currentHeight();
     const width = player.currentWidth();
+    const url = window.location.href;
     const { title, videoId, sources, description } = player.playlist()[0];
     const tremorUrl = 'https://fp31r.ads.tremorhub.com/ad/tag?adCode=m523r-uxl0e';
-    const playerInfo = `playerWidth=${width}&playerHeight=${height}&srcPageUrl=${window.location.href}`;
+    const playerInfo = `playerWidth=${width}&playerHeight=${height}&srcPageUrl=${url}`;
     const mediaInfo = `mediaId=${videoId}&mediaUrl=${sources[0].src}&mediaTitle=${encodeURIComponent(title)}&mediaDesc=${encodeURIComponent(description)}`;
     const adTag = `${tremorUrl}&${playerInfo}&${mediaInfo}`;
     const tmgAdsBuildAd = window.tmgAdsBuildAd;
 
-    if (CLIENT === 'client-test') return cb(null, '');
+    if (CLIENT === 'client-test') return cb(null, `https://req.tidaltv.com/ppm.ashx?logs=0&mt=1&pid=1&fmid=521675&xf=7&ap=0&rand=${Date.now()}&refUrl=${url}`);
     if (CLIENT === 'cityam') return cb(null, 'https://ad.360yield.com/advast?p=1023878&w=16&h=9');
     if (CLIENT === 'spectator') return cb(null, 'https://ad.360yield.com/advast?p=1021575&w=4&h=3');
     if (CLIENT === 'prospectmagazine') return cb(null, 'https://ad.360yield.com/advast?p=1021574&w=4&h=3');
@@ -97,7 +92,7 @@ class App extends React.Component {
     if (CLIENT === 'sovrnuk') return cb(null, 'https://ap.lijit.com/www/delivery/vst.php?zoneid=458676');
     if (CLIENT === 'sovrnus') return cb(null, 'http://ap.lijit.com/www/delivery/vst.php?zoneid=463506');
     if (CLIENT === 'hitc') return cb(null, 'https://ad.360yield.com/advast?p=1034241&w=4&h=3');
-    if (CLIENT === 'clickon') return cb(null, 'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/14188402/Soccer_Preroll&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&url=https://soccer.clickon.co/&description_url=https://soccer.clickon.co/&correlator=__random-number__');
+    if (CLIENT === 'clickon') return cb(null, `https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/14188402/CLICKON/preroll&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&url=${url}&description_url=${url}&correlator=${Date.now()}`);
     if (CLIENT === 'telegraph' && tmgAdsBuildAd) {
       return App.getPlaylistAdTag(tmgAdsBuildAd('advert_body_vid', '', '', '').fetchUrl(), cb);
     }
@@ -128,7 +123,7 @@ class App extends React.Component {
       videosFrom: '',
       videoJsOptions: {
         controls: true,
-        preload: 'auto',
+        preload: 'meta',
         loop: false,
         muted: true,
         width: 640,
@@ -259,7 +254,7 @@ class App extends React.Component {
     this.setState(obj);
   }
 
-  handleScroll(player) {
+  handleScroll() {
     const { pausedByUser, playedByUser, flashTestFinished, videoLoaded } = this.state;
     if (App.isInViewport(this.playerNode.videoNode)) {
       if (this.playerNode.videoNode && !pausedByUser && videoLoaded && flashTestFinished) {

src/player.jsx src/Player.jsxsrc/player.jsx renamed to src/Player.jsx

@@ -1,6 +1,10 @@
 import React from 'react';
 import videojs from 'video.js';
 
+import 'videojs-overlay';
+import 'videojs-playlist';
+import 'imports-loader?videojs=video.js!videojs-vast-vpaid/dist/videojs_5.vast.vpaid';
+
 class Player extends React.PureComponent {
   componentDidMount() {
     // Initialise the video player and do setup work after the player is ready
@@ -44,7 +48,7 @@ class Player extends React.PureComponent {
         player.currentTime(0);
         self.props.getAdTag(player, (err, adTag) => {
           console.log('SUGGESTV: AdTag = ', adTag);
-          self.props.updateState(adTag);
+          self.props.updateState({ adTag });
           cb(err, adTag);
         });
       }
@@ -73,7 +77,7 @@ class Player extends React.PureComponent {
       if (this.props.Modernizr.flash && !this.props.Modernizr.flash.blocked) {
         window.vpaid_video_flash_tester.on('change', () => this.props.updateState({ flashTestFinished: true }));
       } else {
-        this.props.updateState({ flashTestFinished: true });
+        setTimeout(() => this.props.updateState({ flashTestFinished: true }), 500);
       }
 
       player.on('vast.adStart', () => {
@@ -231,4 +235,4 @@ class Player extends React.PureComponent {
   }
 }
 
-export default Player;
+export default Player;