Skip to content

Commit

Permalink
Merge branch 'master' into feature/RS-Reskin-2024
Browse files Browse the repository at this point in the history
  • Loading branch information
prajapatisagar authored Sep 30, 2024
2 parents be951e7 + 27ad34a commit 7372c8a
Show file tree
Hide file tree
Showing 31 changed files with 90 additions and 72 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unpublished Changes

## 1.66.1 09-11-2024
* Add support to play generic iframe video

## 1.66.0 09-03-2024
* Update Connatix script tag to use pmcCnx
* Update out sync package-lock.json
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"packages": [
"packages/*"
],
"version": "1.66.0"
"version": "1.66.1"
}
56 changes: 28 additions & 28 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/backstopjs-config/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/backstopjs-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@penskemediacorp/backstopjs-config",
"version": "1.66.0",
"version": "1.66.1",
"description": "Visual regression testing with Backstop JS.",
"author": "laras126 <[email protected]>",
"homepage": "https://github.com/penske-media-corp/pmc-larva#readme",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/eslint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@penskemediacorp/eslint-config",
"version": "1.66.0",
"version": "1.66.1",
"description": "Eslint base config and customizations.",
"keywords": [
"eslint",
Expand Down
2 changes: 1 addition & 1 deletion packages/larva-css/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/larva-css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@penskemediacorp/larva-css",
"version": "1.66.0",
"version": "1.66.1",
"description": "Larva CSS.",
"author": "laras126 <[email protected]>",
"homepage": "https://github.com/penske-media-corp/pmc-larva#readme",
Expand All @@ -23,8 +23,8 @@
},
"//": "DEPENDENCIES NOTES: Do not upgrade 'del' past 6 unless migrating entire app to module 'type'",
"devDependencies": {
"@penskemediacorp/larva-scss": "^1.66.0",
"@penskemediacorp/larva-tokens": "^1.66.0",
"@penskemediacorp/larva-scss": "^1.66.1",
"@penskemediacorp/larva-tokens": "^1.66.1",
"del": "^6",
"fs-extra": "^11",
"gulp": "^4",
Expand Down
2 changes: 1 addition & 1 deletion packages/larva-js/build/video-showcase.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/larva-js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/larva-js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@penskemediacorp/larva-js",
"version": "1.66.0",
"version": "1.66.1",
"description": "Larva JS patterns.",
"author": "laras126 <[email protected]>",
"homepage": "https://github.com/penske-media-corp/pmc-larva#readme",
Expand Down
17 changes: 16 additions & 1 deletion packages/larva-js/src/interface/VideoShowcase/VideoShowcase.js
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,10 @@ export default class VideoShowcase {
return `https://player.twitch.tv/?video=${ id }`;
}

if ( 'connatix' === type ) {
if ( 'connatix' === type || 'iframe' === type ) {
return id;
}

}

/**
Expand Down Expand Up @@ -283,6 +284,16 @@ export default class VideoShowcase {
);
}

/**
* Remove hidden attribute from the iframe and set the src.
*
* @param {string} IframeUrl - Iframe embed URL from returnUrl.
*/
playIframeUrl( IframeUrl ) {
this.playerUI.iframe.removeAttribute( 'hidden' );
this.playerUI.iframe.setAttribute( 'src', IframeUrl );
}

/**

Check warning on line 297 in packages/larva-js/src/interface/VideoShowcase/VideoShowcase.js

View workflow job for this annotation

GitHub Actions / Test and Lint (18.x)

Expected JSDoc block lines to be aligned
* Remove hidden attribute from jwplayerContainer and play the video with the jwplayer API.
* Note that `playlist` refers to a JWPlayer media object where the videos are handled within
Expand Down Expand Up @@ -366,6 +377,10 @@ export default class VideoShowcase {
const playerId = this.playerUI.player.dataset.videoPlayerId;
this.playConnatix( url, playerId );
}

if ( 'iframe' === state.videoType ) {
this.playIframeUrl( url );
}
}

// Remove any trigger-related data attributes and hide any elements that are not relevant for the player.
Expand Down
2 changes: 1 addition & 1 deletion packages/larva-patterns/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/larva-patterns/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@penskemediacorp/larva-patterns",
"version": "1.66.0",
"version": "1.66.1",
"description": "Larva markup patterns.",
"author": "laras126 <[email protected]>",
"homepage": "https://github.com/Penske-Media-Corp/pmc-larva/tree/master/packages/patterns#readme",
Expand All @@ -20,9 +20,9 @@
"url": "https://github.com/Penske-Media-Corp/pmc-larva/issues"
},
"dependencies": {
"@penskemediacorp/larva-css": "^1.66.0",
"@penskemediacorp/larva-js": "^1.66.0",
"@penskemediacorp/larva-svg": "^1.66.0",
"@penskemediacorp/larva-css": "^1.66.1",
"@penskemediacorp/larva-js": "^1.66.1",
"@penskemediacorp/larva-svg": "^1.66.1",
"lodash.clonedeep": "^4"
},
"gitHead": "a0ba45ec5dcc37b859cb08ffd694582c3d10bcdc"
Expand Down
2 changes: 1 addition & 1 deletion packages/larva-scss/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/larva-scss/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@penskemediacorp/larva-scss",
"version": "1.66.0",
"version": "1.66.1",
"description": "Larva SCSS authoring tools.",
"author": "laras126 <[email protected]>",
"homepage": "https://github.com/penske-media-corp/pmc-larva#readme",
Expand Down
2 changes: 1 addition & 1 deletion packages/larva-svg/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/larva-svg/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@penskemediacorp/larva-svg",
"version": "1.66.0",
"version": "1.66.1",
"description": "> TODO: description",
"author": "laras126 <[email protected]>",
"homepage": "https://github.com/penske-media-corp/pmc-larva/tree/master/packages/larva-svg#readme",
Expand Down
2 changes: 1 addition & 1 deletion packages/larva-tokens/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/larva-tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@penskemediacorp/larva-tokens",
"version": "1.66.0",
"version": "1.66.1",
"description": "Design tokens",
"author": "laras126 <[email protected]>",
"homepage": "https://github.com/penske-media-corp/pmc-larva#readme",
Expand Down
2 changes: 1 addition & 1 deletion packages/larva/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions packages/larva/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@penskemediacorp/larva",
"version": "1.66.0",
"version": "1.66.1",
"description": "> TODO: description",
"author": "laras126 <[email protected]>",
"homepage": "https://github.com/Penske-Media-Corp/pmc-larva/tree/master/packages/larva#readme",
Expand Down Expand Up @@ -44,16 +44,16 @@
"dependencies": {
"@babel/core": "^7",
"@babel/preset-env": "^7",
"@penskemediacorp/backstopjs-config": "^1.66.0",
"@penskemediacorp/eslint-config": "^1.66.0",
"@penskemediacorp/larva-css": "^1.66.0",
"@penskemediacorp/larva-js": "^1.66.0",
"@penskemediacorp/larva-patterns": "^1.66.0",
"@penskemediacorp/larva-scss": "^1.66.0",
"@penskemediacorp/larva-svg": "^1.66.0",
"@penskemediacorp/larva-tokens": "^1.66.0",
"@penskemediacorp/stylelint-config": "^1.66.0",
"@penskemediacorp/twig-to-php-parser": "^1.66.0",
"@penskemediacorp/backstopjs-config": "^1.66.1",
"@penskemediacorp/eslint-config": "^1.66.1",
"@penskemediacorp/larva-css": "^1.66.1",
"@penskemediacorp/larva-js": "^1.66.1",
"@penskemediacorp/larva-patterns": "^1.66.1",
"@penskemediacorp/larva-scss": "^1.66.1",
"@penskemediacorp/larva-svg": "^1.66.1",
"@penskemediacorp/larva-tokens": "^1.66.1",
"@penskemediacorp/stylelint-config": "^1.66.1",
"@penskemediacorp/twig-to-php-parser": "^1.66.1",
"axios": "^1",
"babel-loader": "^9",
"chalk": "^4",
Expand Down
2 changes: 1 addition & 1 deletion packages/site/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7372c8a

Please sign in to comment.