Skip to content

Commit

Permalink
Merge pull request #37 from Wikia/XW-4569
Browse files Browse the repository at this point in the history
XW-4569 | Add logging, remove number from video-select
  • Loading branch information
JamesHawking authored Feb 26, 2018
2 parents 1afb36d + 7121fe8 commit 240b72d
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 10 deletions.
4 changes: 2 additions & 2 deletions dist/dev.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/wikiajwplayer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jwplayer-fandom",
"version": "1.2.1",
"version": "1.2.2",
"description": "JWPlayer for Fandom",
"main": "index.js",
"scripts": {
Expand Down
9 changes: 8 additions & 1 deletion src/events.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function wikiaJWPlayerEvents(playerInstance, willAutoplay, logger) {
function wikiaJWPlayerEvents(playerInstance, willAutoplay, logger, playlistId) {
var state = getNewState(),
wasAlreadyUnmuted = false,
depth = 0,
Expand Down Expand Up @@ -44,6 +44,13 @@ function wikiaJWPlayerEvents(playerInstance, willAutoplay, logger) {
var positionFloor = Math.floor(data.position),
percentPlayed = Math.floor(positionFloor * 100 / data.duration);

if (percentPlayed > 100) {
data.mediaId = playerInstance.getPlaylistItem().mediaid;
data.playlistId = playlistId;

logger.error('played-percentage', data);
}

if (positionFloor > state[prefix].progress.durationWatched && positionFloor % 5 === 0) {
playerInstance.trigger(prefix + 'SecondsPlayed', { value: positionFloor });

Expand Down
5 changes: 3 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ window.wikiaJWPlayer = function (elementId, options, callback) {
* @param elementId
* @param options
* @param logger
* @param lang
* @param i18n
* @return {*}
*/
Expand Down Expand Up @@ -119,15 +120,15 @@ window.wikiaJWPlayer = function (elementId, options, callback) {

wikiaJWPlayerIdleScreen(playerInstance, i18n);
wikiaJWPlayerReplaceIcons(playerInstance);
wikiaJWPlayerEvents(playerInstance, options.autoplay, logger);
wikiaJWPlayerEvents(playerInstance, options.autoplay, logger, options.related.playlistId);

if (options.related) {
wikiaJWPlayerRelatedVideoSound(playerInstance);
}

if (options.tracking) {
options.tracking.pixel = options.videoDetails.playlist[0].pixel;
wikiaJWPlayerTracking(playerInstance, options.autoplay, options.tracking);
wikiaJWPlayerTracking(playerInstance, options.autoplay, options.tracking, logger, options.related.playlistId);
}

wikiaJWPlayerHandleTabNotActive(playerInstance, options.autoplay);
Expand Down
13 changes: 10 additions & 3 deletions src/tracking.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function wikiaJWPlayerTracking(playerInstance, willAutoplay, tracker) {
function wikiaJWPlayerTracking(playerInstance, willAutoplay, tracker, logger, playlistId) {
//This will replace 'trackingevent' in internal tracker url path
var eventName = 'videoplayerevent',
gaCategory = tracker.category || 'featured-video',
Expand Down Expand Up @@ -107,10 +107,17 @@ function wikiaJWPlayerTracking(playerInstance, willAutoplay, tracker) {
data.item
);

var labelPrefix = data.auto ? 'recommended-video-autoplay-' : 'recommended-video-select-';
if (data.auto && data.position > 0) {
data.mediaId = playerInstance.getPlaylistItem().mediaid;
data.playlistId = playlistId;

logger.error('recommended-video-autoplay', data)
}

var labelPrefix = data.auto ? 'recommended-video-autoplay' : 'recommended-video-select-' + data.position;

track({
label: labelPrefix + data.position,
label: labelPrefix,
action: 'impression'
});

Expand Down

0 comments on commit 240b72d

Please sign in to comment.