Skip to content

Sync main with develop after release 1.4.1#1135

Merged
KMchaudhary merged 4 commits into
developfrom
main
Sep 18, 2025
Merged

Sync main with develop after release 1.4.1#1135
KMchaudhary merged 4 commits into
developfrom
main

Conversation

@KMchaudhary
Copy link
Copy Markdown
Collaborator

No description provided.

Merge develop to release 1.4.1 branch
* Revert "Fix - Analytics tracking for dynamically rendered videos (#1105)"

This reverts commit 835226f.

* docs: Remove reverted analytics commit from changelog
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR syncs the main branch with the develop branch after the 1.4.1 release, updating version numbers and changelog information across multiple files to reflect the new release.

  • Updates version number from 1.4.0 to 1.4.1 across all relevant files
  • Adds changelog entries for v1.4.1 with audio recording enhancements and video player fixes
  • Updates localization files with new translation strings and reference updates

Reviewed Changes

Copilot reviewed 8 out of 9 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
readme.txt Updates stable tag to 1.4.1 and adds changelog entry
package.json Updates version field to 1.4.1
languages/godam.pot Updates project version and POT creation date
inc/helpers/custom-functions.php Updates @SInCE tag from "n.e.x.t" to "1.4.1"
godam.php Updates plugin version and constant to 1.4.1
assets/src/js/godam-player/analytics.js Simplifies video analytics tracking implementation
README.md Updates stable tag to 1.4.1
CHANGELOG.md Adds v1.4.1 changelog entry

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

* Note: The files created by uppy webcam, screen capture, and audio plugin are in the same format. So we are checking the filename to determine if it's an audio file.
*
* @since n.e.x.t
* @since 1.4.1
Copy link

Copilot AI Sep 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The @SInCE tag should use 'n.e.x.t' format during development and only be updated to the actual version number in the final release commit. Since this is a sync from develop to main after release, this change is appropriate.

Copilot uses AI. Check for mistakes.
Comment on lines +47 to 80
videos.forEach( ( video ) => {
// read the data-setup attribute.
const player = videojs( video );

window.addEventListener( 'beforeunload', () => {
const played = player.played();
const ranges = [];
const videoLength = player.duration();

// Extract time ranges from the player.played() object
for ( let i = 0; i < played.length; i++ ) {
ranges.push( [ played.start( i ), played.end( i ) ] );
}

// Send the ranges using updateHeatmap
updateHeatmap( ranges, videoLength );
} );
} );

// Per-video initialization (no global listeners here)
videos.forEach( ( video ) => {
videojs( video );
async function updateHeatmap( ranges, videoLength ) {
const videoId = video.getAttribute( 'data-id' );
if ( ! videoId || ranges.length === 0 ) {
return; // Skip sending if no valid data
}

if ( window.analytics ) {
window.analytics.track( 'video_heatmap', {
type: 2, // Enum: 2 = Heatmap
videoId: parseInt( videoId, 10 ),
ranges,
videoLength,
} );
}
}
} );
Copy link

Copilot AI Sep 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding a 'beforeunload' event listener inside the forEach loop will create multiple identical event listeners, one for each video. This should be moved outside the loop or use a single listener that handles all videos.

Copilot uses AI. Check for mistakes.
// Per-video initialization (no global listeners here)
videos.forEach( ( video ) => {
videojs( video );
async function updateHeatmap( ranges, videoLength ) {
Copy link

Copilot AI Sep 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The updateHeatmap function is declared as async but doesn't use await or return a Promise. Either remove the async keyword or add proper async functionality.

Suggested change
async function updateHeatmap( ranges, videoLength ) {
function updateHeatmap( ranges, videoLength ) {

Copilot uses AI. Check for mistakes.
@KMchaudhary KMchaudhary merged commit 202a06e into develop Sep 18, 2025
8 checks passed
KMchaudhary added a commit that referenced this pull request Sep 18, 2025
KMchaudhary added a commit that referenced this pull request Sep 18, 2025
KMchaudhary added a commit that referenced this pull request Sep 19, 2025
…1148)

* Sync main with develop after release 1.4.1 (#1135)

* docs: Update changelog and version to 1.4.1 (#1130)

* Hotfix/analytics gallery (#1133)

* Revert "Fix - Analytics tracking for dynamically rendered videos (#1105)"

This reverts commit 835226f.

* docs: Remove reverted analytics commit from changelog

---------

Co-authored-by: Subodh Rajpopat <subodh.rajpopat@rtcamp.com>

* Revert "Sync main with develop after release 1.4.1 (#1135)" (#1136)

This reverts commit 202a06e.

* New sequence for media src HLS, MPD, Original URL to fix safari Audio mute issue

* Provide HLS URL support on [godam_video] shortcode

---------

Co-authored-by: Subodh Rajpopat <subodh.rajpopat@rtcamp.com>
Co-authored-by: KMchaudhary <kuldipkumar.chaudhary@rtcamp.com>
subodhr258 added a commit that referenced this pull request Sep 22, 2025
* Sync main with develop after release 1.4.1 (#1135)

* docs: Update changelog and version to 1.4.1 (#1130)

* Hotfix/analytics gallery (#1133)

* Revert "Fix - Analytics tracking for dynamically rendered videos (#1105)"

This reverts commit 835226f.

* docs: Remove reverted analytics commit from changelog

---------

Co-authored-by: Subodh Rajpopat <subodh.rajpopat@rtcamp.com>

* Revert "Sync main with develop after release 1.4.1 (#1135)" (#1136)

This reverts commit 202a06e.

* fix: exclude jetpack_contact_form_jwt field while submitting the jetpack forms (#1134)

* Fix the audio mute issue on mac safari browser for GoDAM video block (#1142)

* New sequence for media src HLS, MPD, Original URL to fix safari Audio mute issue

* Provide HLS URL support on [godam_video] shortcode

---------

Co-authored-by: KMchaudhary <kuldipkumar.chaudhary@rtcamp.com>

* Custom Thumbnail Upload Allows MP4 Video via “Upload Files” Option (#1126)

* fix: allow only image upload

* remove unused code

* update snackbar message

* FIX: Remove `filemtime` warnings

* FEAT: Close autoadvance upon `x` button click

---------

Co-authored-by: Kuldip Chaudhary <64731232+KMchaudhary@users.noreply.github.com>
Co-authored-by: nani samireddy <60937910+nani-samireddy@users.noreply.github.com>
Co-authored-by: KMchaudhary <kuldipkumar.chaudhary@rtcamp.com>
Co-authored-by: Prachi Garg <72646230+prachigarg19@users.noreply.github.com>
Co-authored-by: Vipul Patil <vipulrpatil.8@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants