Merge pull request #237 from Wikia/XW-4231

XW-4231 | Captions menu

app/components/article-featured-video-jwplayer.js

@@ -38,12 +38,12 @@ export default Component.extend({
 	onCreate(player) {
 		this.player = player;
 
-		this.player.on('autoplayToggle', (data) => {
-			this.setCookie(this.get('autoplayCookieName'), data.enabled);
+		this.player.on('autoplayToggle', ({enabled}) => {
+			this.setCookie(this.get('autoplayCookieName'), (enabled ? '1' : '0'));
 		});
 
-		this.player.on('captionsSelected', (data) => {
-			this.setCookie(this.get('captionsCookieName'), data.enabled);
+		this.player.on('captionsSelected', ({selectedLang}) => {
+			this.setCookie(this.get('captionsCookieName'), selectedLang);
 		});
 	},
 
@@ -54,7 +54,7 @@ export default Component.extend({
 		const model = this.get('model.embed'),
 			jsParams = {
 				autoplay: $.cookie(this.get('autoplayCookieName')) !== '0',
-				captions: $.cookie(this.get('captionsCookieName')) !== '0',
+				selectedCaptionsLanguage: $.cookie(this.get('captionsCookieName')),
 				adTrackingParams: {
 					adProduct: this.get('ads.noAds') ? 'featured-video-no-preroll' : 'featured-video-preroll',
 					slotName: 'FEATURED'
@@ -79,8 +79,8 @@ export default Component.extend({
 		}
 	},
 
-	setCookie(cookieName, condition) {
-		$.cookie(cookieName, condition ? '1' : '0', {
+	setCookie(cookieName, cookieValue) {
+		$.cookie(cookieName, cookieValue, {
 			expires: this.get('playerCookieExpireDays'),
 			path: '/',
 			domain: config.cookieDomain

app/modules/video-players/jwplayer.js

@@ -58,11 +58,9 @@ export default class JWPlayer extends BasePlayer {
 				},
 				settings: {
 					showAutoplayToggle: true,
-					showCaptionsToggle: true
-				},
-				captions: {
-					enabled: this.params.captions
+					showCaptions: true
 				},
+				selectedCaptionsLanguage: this.params.selectedCaptionsLanguage,
 				autoplay: this.params.autoplay,
 				mute: this.params.autoplay,
 				related: {

package.json

@@ -37,7 +37,7 @@
     "express-bunyan-logger": "1.3.2",
     "fastboot": "github:wikia/fastboot#582162a5e2eb39c2d94f857e53ee0efff4544447",
     "fastboot-app-server": "1.0.1",
-    "jwplayer-fandom": "github:wikia/jwplayer-fandom#1.0.19",
+    "jwplayer-fandom": "github:wikia/jwplayer-fandom#1.0.20",
     "method-override": "2.3.10",
     "on-headers": "1.0.1",
     "snyk": "^1.41.1"