Skip to content

Commit 867c21f

Browse files
committed
Merge branch 'master'
# Conflicts: # dist/speed/speed.js # dist/speed/speed.min.js # package-lock.json # package.json # src/speed/speed.js I'm not sure that I didn't introduce new bugs though.
2 parents c2a077d + 13855ba commit 867c21f

39 files changed

+658
-253
lines changed

Gruntfile.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,10 @@ module.exports = function (grunt) {
119119
'dist/airplay/airplay.css': 'src/airplay/airplay.css',
120120
'dist/chromecast/chromecast.css': 'src/chromecast/chromecast.css',
121121
'dist/context-menu/context-menu.css': 'src/context-menu/context-menu.css',
122-
'dist/jump-forward/jump-forward.css': 'src/jump-forward/jump-forward.css',
123122
'dist/loop/loop.css': 'src/loop/loop.css',
124123
'dist/playlist/playlist.css': 'src/playlist/playlist.css',
125124
'dist/postroll/postroll.css': 'src/postroll/postroll.css',
126125
'dist/quality/quality.css': 'src/quality/quality.css',
127-
'dist/skip-back/skip-back.css': 'src/skip-back/skip-back.css',
128126
'dist/source-chooser/source-chooser.css': 'src/source-chooser/source-chooser.css',
129127
'dist/speed/speed.css': 'src/speed/speed.css',
130128
'dist/nmgt/nmgt.css': 'src/nmgt/nmgt.css',
@@ -149,12 +147,10 @@ module.exports = function (grunt) {
149147
'dist/airplay/airplay.min.css': 'dist/airplay/airplay.css',
150148
'dist/chromecast/chromecast.min.css': 'dist/chromecast/chromecast.css',
151149
'dist/context-menu/context-menu.min.css': 'dist/context-menu/context-menu.css',
152-
'dist/jump-forward/jump-forward.min.css': 'dist/jump-forward/jump-forward.css',
153150
'dist/loop/loop.min.css': 'dist/loop/loop.css',
154151
'dist/playlist/playlist.min.css': 'dist/playlist/playlist.css',
155152
'dist/postroll/postroll.min.css': 'dist/postroll/postroll.css',
156153
'dist/quality/quality.min.css': 'dist/quality/quality.css',
157-
'dist/skip-back/skip-back.min.css': 'dist/skip-back/skip-back.css',
158154
'dist/source-chooser/source-chooser.min.css': 'dist/source-chooser/source-chooser.css',
159155
'dist/speed/speed.min.css': 'dist/speed/speed.css',
160156
'dist/nmgt/nmgt.min.css': 'dist/nmgt/nmgt.css',

RELEASE.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,13 @@ Instructions for the Maintainer
3030

3131
grunt
3232

33-
- add/commit/push all including build/
34-
35-
git add --all
36-
git commit -am "release 4.X.X"
37-
git push
33+
- add/commit/push all including dist/
3834

35+
```
36+
git add --all
37+
git commit -am "release 4.X.X"
38+
git push
39+
```
3940

4041
**********************
4142
PREPARING A RELEASE - second step on github.com

changelog.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# Version History
22

3+
## *5.1.0 (2026/01/30)*
4+
* `mediaelement` is now a `peerDependency` of this project. This will prevent multiple installations of `mediaelement` in your project.
5+
### A11Y PLUGIN
6+
* Demo page was updated with working media assets. Fixes #261
7+
* Plugin is now cleaned up properly when the player is destroyed.
8+
9+
## *5.0.0 (2024/09/12)*
10+
### JUMP FORWARD PLUGIN
11+
#### New Feature: Inline SVG icon for jump forward button
12+
* Setting `iconSpritePathJumpForward`: This option enables you to define the path to your SVG icon sprite. When specified, it allows for dynamic generation of inline SVG icons, which will be displayed on the jump forward button. Further information can be found [here](docs/jump-forward.md).
13+
* Important CSS Adjustment: If you're planning to use `iconSpritePathJumpForward` and your current setup includes background icons defined in CSS, you'll need to make a small but crucial update to your CSS file. Please remove any CSS rules that apply background icons to these buttons. This step is necessary to prevent the display of both SVG and background icons simultaneously.
14+
15+
### SKIP BACK PLUGIN
16+
#### New Feature: Inline SVG icon for skip back button
17+
* Setting `iconSpritePathSkipBack`: This option enables you to define the path to your SVG icon sprite. When specified, it allows for dynamic generation of inline SVG icons, which will be displayed on the skip back button. Further information can be found [here](docs/skip-back.md).
18+
* Important CSS Adjustment: If you're planning to use `iconSpritePathSkipBack` and your current setup includes background icons defined in CSS, you'll need to make a small but crucial update to your CSS file. Please remove any CSS rules that apply background icons to these buttons. This step is necessary to prevent the display of both SVG and background icons simultaneously.
19+
20+
## *4.0.1 (2024/09/09)*
21+
### SPEED PLUGIN
22+
* Fix always controlling the first player on the page via keyboard when multiple players exist.
23+
324
## *4.0.0 (2024/03/11)*
425
This release marks a major version update to address and correct previous versioning inaccuracies. The transition from version 3.0.0 to 3.0.1 introduced changes that, upon further review, have been identified as breaking. These changes warranted a more significant version increment to reflect their impact accurately.
526

demo/a11y.html

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,39 @@
33
<head>
44
<meta charset="UTF-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<title>MediaElement.js 4.2 - Accessibility Plugin</title>
7-
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
8-
<link rel="icon" href="favicon.ico" type="image/x-icon">
6+
<title>MediaElement.js 7.0.7 - Accessibility Plugin</title>
7+
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon">
8+
<link rel="icon" href="./favicon.ico" type="image/x-icon">
99

1010
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css">
11-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mediaelement/7.0.3/mediaelementplayer.css">
11+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mediaelement/7.0.7/mediaelementplayer.min.css">
1212
<link rel="stylesheet" href="../dist/a11y/a11y.css">
13-
<link rel="stylesheet" href="demo.css">
13+
<link rel="stylesheet" href="./demo.css">
1414
</head>
1515
<body>
1616
<div id="container">
1717
<h1>Accessibility Plugin</h1>
18-
<p><a href="index.html">Back to Main</a> </p>
18+
<p><a href="./index.html">Back to Main</a> </p>
1919

2020
<h2>Video Player (w/o Voice-Over)</h2>
2121
<div class="media-wrapper">
2222
<video id="player1" width="750" height="421" controls preload="none" playsinline
23-
data-video-description='[{"src": "https://video.aktion-mensch.de/magnolia/aktion-mensch-videoplayer/aktion-mensch_beispiel/aktion-mensch_beispiel_signlanguageVideo.mp4", "type": "video/mp4"}, {"src": "https://video.aktion-mensch.de/magnolia/aktion-mensch-videoplayer/aktion-mensch_beispiel/aktion-mensch_beispiel_signlanguageVideo.webm", "type": "video/webm"}, {"src": "https://video.aktion-mensch.de/magnolia/aktion-mensch-videoplayer/aktion-mensch_beispiel/aktion-mensch_beispiel_signlanguageVideo.ogv", "type": "video/ogv"}]'
24-
data-audio-description='[{"src": "https://video.aktion-mensch.de/magnolia/aktion-mensch_beispiel_audioDescription.mp3", "type": "audio/mp3"}]'
23+
poster="https://delivery-aktion-mensch.stylelabs.cloud/api/public/content/2e7945298d864445b79c120be1eeb87c"
24+
data-video-description='[{"src": "https://delivery-aktion-mensch.stylelabs.cloud/api/public/content/video-kampagne-begegnung-dgs.mp4", "type": "video/mp4"}]'
25+
data-audio-description='[{"src": "https://delivery-aktion-mensch.stylelabs.cloud/api/public/content/72091bbef9494cc6a8da57179d69099c", "type": "audio/x-wav"}]'
2526
>
26-
<source src="https://video.aktion-mensch.de/magnolia/aktion-mensch_beispiel_video.mp4" type="video/mp4" />
27-
<source src="https://video.aktion-mensch.de/magnolia/aktion-mensch_beispiel_video.webm" type="video/webm" />
28-
<source src="https://video.aktion-mensch.de/magnolia/aktion-mensch_beispiel_video.ogv" type="video/ogg" />
27+
<source src="https://delivery-aktion-mensch.stylelabs.cloud/api/public/content/0e7a69b999dc4dad8b632d323909d1a1" type="video/mp4" />
2928
</video>
29+
<button onclick="player.remove()" style="margin: 20px 0">Remove</button>
3030
</div>
3131
</div>
32-
<script src="https://cdnjs.cloudflare.com/ajax/libs/mediaelement/4.2.9/mediaelement-and-player.min.js"></script>
32+
<script src="https://cdnjs.cloudflare.com/ajax/libs/mediaelement/7.0.7/mediaelement-and-player.min.js"></script>
3333
<script src="../dist/a11y/a11y.js"></script>
3434
<script>
35-
new MediaElementPlayer('player1', {
35+
const player = new MediaElementPlayer('player1', {
3636
features: ['playpause', 'current', 'progress', 'duration', 'volume', 'a11y', 'fullscreen'],
37+
iconSprite: 'mejs-controls.svg',
38+
iconSpritePathA11y: 'mejs-a11y-icons.svg'
3739
});
3840
</script>
3941
</body>

demo/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ <h1><img src="https://cloud.githubusercontent.com/assets/910829/22357262/e6cf32b
7878
<li><a href="postroll.html">Postroll</a></li>
7979
<li><a href="preview.html">Preview</a></li>
8080
<li><a href="quality.html">Quality</a></li>
81+
<li><a href="speed.html">Speed</a></li>
8182
<li><a href="vrview.html">VRView</a></li>
8283
</ul>
8384
</main>

demo/mejs-jump-forward.svg

Lines changed: 11 additions & 0 deletions
Loading

demo/mejs-skip-back.svg

Lines changed: 11 additions & 0 deletions
Loading

demo/multiple2.html

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
<head>
44
<meta charset="UTF-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<title>MediaElement.js 3.0 - Multiple Plugins (2)</title>
6+
<title>MediaElement.js - Multiple Plugins (2)</title>
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
99
<link rel="icon" href="favicon.ico" type="image/x-icon">
1010

1111
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css">
12-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mediaelement/4.2.6/mediaelementplayer.css">
13-
<link rel="stylesheet" href="../dist/jump-forward/jump-forward.css">
14-
<link rel="stylesheet" href="../dist/skip-back/skip-back.css">
12+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mediaelement/7.0.5/mediaelementplayer.css">
1513
<link rel="stylesheet" href="../dist/speed/speed.css">
1614
<link rel="stylesheet" href="demo.css">
1715
</head>
@@ -133,7 +131,7 @@ <h3>API</h3>
133131
</tbody>
134132
</table>
135133
</div>
136-
<script src="https://cdnjs.cloudflare.com/ajax/libs/mediaelement/4.2.6/mediaelement-and-player.min.js"></script>
134+
<script src="https://cdnjs.cloudflare.com/ajax/libs/mediaelement/7.0.5/mediaelement-and-player.min.js"></script>
137135
<script src="../dist/jump-forward/jump-forward.js"></script>
138136
<script src="../dist/skip-back/skip-back.js"></script>
139137
<script src="../dist/speed/speed.js"></script>
@@ -151,4 +149,4 @@ <h3>API</h3>
151149
}
152150
</script>
153151
</body>
154-
</html>
152+
</html>

demo/speed.html

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6+
<title>MediaElement.js 3.0 - Speed Plugin</title>
7+
<meta name="viewport" content="width=device-width, initial-scale=1">
8+
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
9+
<link rel="icon" href="favicon.ico" type="image/x-icon">
10+
11+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css">
12+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mediaelement/5.0.1/mediaelementplayer.css">
13+
<link rel="stylesheet" href="../dist/speed/speed.css">
14+
<link rel="stylesheet" href="demo.css">
15+
</head>
16+
<body>
17+
<div id="container">
18+
19+
<h1>Speed Plugin</h1>
20+
<p><a href="index.html">Back to Main</a></p>
21+
22+
<p>This plugin allows the generation of a menu with different video/audio speed.</p>
23+
24+
<h2>Video Player</h2>
25+
26+
<div class="media-wrapper">
27+
<h3>Video Player 1</h3>
28+
<video id="player1" width="750" height="421" controls preload="none" poster="http://mediaelementjs.com/images/big_buck_bunny.jpg">
29+
<source type="video/mp4" src="http://distribution.bbb3d.renderfarming.net/video/mp4/bbb_sunflower_native_60fps_normal.mp4">
30+
</video>
31+
<h3>Video Player 2</h3>
32+
<video id="player2" width="750" height="421" controls preload="none" poster="http://mediaelementjs.com/images/big_buck_bunny.jpg">
33+
<source type="video/mp4" src="http://distribution.bbb3d.renderfarming.net/video/mp4/bbb_sunflower_native_60fps_normal.mp4">
34+
</video>
35+
</div>
36+
</div>
37+
38+
<script src="https://cdnjs.cloudflare.com/ajax/libs/mediaelement/5.0.1/mediaelement-and-player.min.js"></script>
39+
<script src="../dist/speed/speed.js"></script>
40+
<script>
41+
var mediaElements = document.querySelectorAll('video, audio');
42+
43+
for (var i = 0, total = mediaElements.length; i < total; i++) {
44+
new MediaElementPlayer(mediaElements[i], {
45+
features: ['playpause', 'current', 'progress', 'duration', 'speed'],
46+
});
47+
}
48+
</script>
49+
</body>
50+
</html>

0 commit comments

Comments
 (0)