Merge branch 'dev' into crowdin-deploy-support

Wikia · Nov 3, 2017 · c7fa22c · c7fa22c
2 parents b346def + a3a4970
commit c7fa22c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/modules/video-players/jwplayer.js b/app/modules/video-players/jwplayer.js
@@ -2,6 +2,7 @@ import Ads from '../ads';
 import BasePlayer from './base';
 import JWPlayerVideoAds from './jwplayer-video-ads';
 import {track} from '../../utils/track';
+import config from '../../config/environment';
 
 export const jwPlayerAssets = {
 	styles: '/mobile-wiki/assets/jwplayer/index.css',
@@ -57,8 +58,7 @@ export default class JWPlayer extends BasePlayer {
 						track(data);
 					},
 					setCustomDimension: M.tracker.UniversalAnalytics.setDimension,
-					// todo verify after Stanley's response
-					comscore: false
+					comscore: config.environment === 'production'
 				},
 				autoplay: {
 					enabled: this.params.autoplay,

diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "fastboot": "github:wikia/fastboot#582162a5e2eb39c2d94f857e53ee0efff4544447",
     "fastboot-app-server": "1.0.1",
     "html5-skin": "github:wikia/html5-skin#84574003c0cf2fa6de499bd6e7423a2a37681e44",
-    "jwplayer-fandom": "github:wikia/jwplayer-fandom#1.0.7",
+    "jwplayer-fandom": "github:wikia/jwplayer-fandom#1.0.8",
     "method-override": "2.3.10",
     "newrelic": "2.2.1",
     "on-headers": "1.0.1",