Skip to content

Commit

Permalink
Merge branch 'master' into FEC-13671
Browse files Browse the repository at this point in the history
  • Loading branch information
JonathanTGold authored Feb 6, 2024
2 parents e835d53 + 46423a2 commit 0ec67a3
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 23 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### 3.17.9 (2024-02-04)

### 3.17.8 (2024-01-21)

### 3.17.7 (2024-01-07)
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@playkit-js/kaltura-player-js",
"version": "3.17.8",
"version": "3.17.9",
"keywords": [
"kaltura",
"player",
Expand Down Expand Up @@ -49,11 +49,11 @@
"precommit": "yarn run build && yarn run type-check && yarn run test && yarn run lint"
},
"dependencies": {
"@playkit-js/playkit-js": "0.84.5-canary.0-df6fd72",
"@playkit-js/playkit-js-dash": "latest",
"@playkit-js/playkit-js-hls": "latest",
"@playkit-js/playkit-js": "0.84.5",
"@playkit-js/playkit-js-dash": "1.36.2",
"@playkit-js/playkit-js-hls": "1.32.11",
"@playkit-js/playkit-js-providers": "2.40.4-canary.0-b3e5269",
"@playkit-js/playkit-js-ui": "0.77.16-canary.0-7eb7c54",
"@playkit-js/playkit-js-ui": "0.78.0",
"hls.js": "1.4.11",
"shaka-player": "4.7.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/common/playlist/playlist-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class PlaylistManager {
autoContinue: true,
loop: false,
imageDuration: 5,
documentDuration: 5
documentDuration: 10
};
this._countdown = { duration: 10, showing: true };
this._mediaInfoList = [];
Expand Down
6 changes: 5 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import { playlist } from './common/playlist';
import { KALTURA_PLAYER_START_TIME_QS } from './common/utils/setup-helpers';
import { Ad, AdBreak } from './common/ads';
import { BasePlugin, registerPlugin } from './common/plugins';
import SessionStorageManager from './common/storage/session-storage-manager';
import LocalStorageManager from './common/storage/local-storage-manager';

core['Ad'] = Ad;
core['AdBreak'] = AdBreak;
Expand Down Expand Up @@ -43,5 +45,7 @@ export {
PLAYER_TYPE,
VERSION,
PLAYER_NAME,
KALTURA_PLAYER_START_TIME_QS
KALTURA_PLAYER_START_TIME_QS,
LocalStorageManager,
SessionStorageManager
};
32 changes: 16 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1172,35 +1172,35 @@
resolved "https://registry.yarnpkg.com/@playkit-js/browserslist-config/-/browserslist-config-1.0.8.tgz#735256ba560063d397d4b8776acb865e8697a287"
integrity sha512-BeiDM72c6GP8dZ6b2qScEpxT4sGECIJzjVGsanaTvXeFOkw3MoplAyz6HPKdrcLmidcinSl4yna5Yc9/ObwZow==

"@playkit-js/playkit-js-dash@latest":
version "1.36.1"
resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-dash/-/playkit-js-dash-1.36.1.tgz#14f423cc7b12eb4cbf1f89c31e5a889a68a83f6e"
integrity sha512-8qne4uLCLQ+Oai0m9mVZNpHtdg5cjciU/2oJ/afCU3BUOQJs5U+jZ8NoiPcPWIyWabbZvUy0oKoiR4UT4EywWQ==
"@playkit-js/playkit-js-dash@1.36.2":
version "1.36.2"
resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-dash/-/playkit-js-dash-1.36.2.tgz#9321960db414008a4697b3545950445141161958"
integrity sha512-dE3PLnhJ3haM1pyrjDg+VE2qYHrSrop0U1jV1R8c0SJ9vLLtFQehlQlQ4F/h0oGLloqbihqvs+cT4mlWSfbOJA==

"@playkit-js/playkit-js-hls@latest":
version "1.32.10"
resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-hls/-/playkit-js-hls-1.32.10.tgz#7320c02011f6705c21c9062c3e416bf2e2bc80b0"
integrity sha512-YTk4lXvyUurSfY9YJNVvQqVL7u4bazgygJ8QvnpyRe64PBYb31I8g6GdXjPsBy/Kia0xPc4Bts5w8lEOICiJoQ==
"@playkit-js/playkit-js-hls@1.32.11":
version "1.32.11"
resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-hls/-/playkit-js-hls-1.32.11.tgz#0d4d514750a660e9899d04e97482af6311355707"
integrity sha512-YWhFAYeBpONeENRQbmm6901FtkT4vwzu8O5mzrrty7TUGR3zXpBGszul1bngAZQWS6UZ5vpuvAuLSz+37BFUpg==

"@playkit-js/[email protected]":
version "2.40.4-canary.0-b3e5269"
resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-providers/-/playkit-js-providers-2.40.4-canary.0-b3e5269.tgz#0505713d1ca5dae3178704d1ef23e043f782289a"
integrity sha512-W9fHWtdAZgsXJhfEEqXEPIbqXBLuOQsTjRq/sDZXnuaBfPXZAZYNrIG10DCGUbeXGiNq/s8oomZOEskwSbsL1Q==

"@playkit-js/playkit-js-ui@0.77.16-canary.0-7eb7c54":
version "0.77.16-canary.0-7eb7c54"
resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-ui/-/playkit-js-ui-0.77.16-canary.0-7eb7c54.tgz#5ae6f5392e1e49d8b27dec17353f60fc78477c4e"
integrity sha512-90pRjqmbxX4lBapc/MT7VQpVeg6Lahrh/UfBfz2YKJpvmo7LkK+zjsccCMjARu2lERzbeBUXUqbo1Coe3RVDRw==
"@playkit-js/playkit-js-ui@0.78.0":
version "0.78.0"
resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-ui/-/playkit-js-ui-0.78.0.tgz#263539e8a448f312c19667608a434eef1e7761f6"
integrity sha512-keBkyzg8FtmmvWa+sA/6vpgYBCFGMcreqZ6AYPueOc4zbhOI26UBfMR2JS84rY4QIujv0E06j5Ict5YRGwvlDw==
dependencies:
preact "10.4.6"
preact-i18n "2.0.0-preactx.2"
react-redux "7.2.1"
redux "4.0.5"

"@playkit-js/[email protected]-canary.0-df6fd72":
version "0.84.5-canary.0-df6fd72"
resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js/-/playkit-js-0.84.5-canary.0-df6fd72.tgz#0638d4855d6705c92e69efb29ddf1439210d76d3"
integrity sha512-FrMoM+wsA1M/7AcxS33egYQftuhTlgcSzXEIUMcsjoctXUmuDgFVpgxzbTDELYHYsohNmxkpBgpms5KNMXqeTA==
"@playkit-js/[email protected]":
version "0.84.5"
resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js/-/playkit-js-0.84.5.tgz#df4558bc05f6bdc576de3d2e6ff9d576dfcb1e9e"
integrity sha512-YtUEeiSwQoEeXG9wX93p04KuKiQB06NoHLNkQs2rPXn1xgAPoObJay0z3xu+d0xVwpjMd1NI6K4dJ2VHdUR8Rw==
dependencies:
js-logger "^1.6.0"
ua-parser-js "^1.0.36"
Expand Down

0 comments on commit 0ec67a3

Please sign in to comment.