Merge branch 'master' into 3.x-dev

mediaelement · Sep 22, 2016 · 97c3739 · 97c3739
2 parents 8a0aa09 + 75d8ac8
commit 97c3739
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/js/mep-player.js b/src/js/mep-player.js
@@ -108,12 +108,15 @@
 								32, // SPACE
 								179 // GOOGLE play/pause button
 								 ],
-						action: function(player, media) {
+						action: function(player, media, key, event) {
+
+							if (!mejs.MediaFeatures.isFirefox) {
 								if (media.paused || media.ended) {
-										media.play();
+									media.play();
 								} else {
-										media.pause();
+									media.pause();
 								}
+							}
 						}
 				},
 				{