From 1503bf1268c3f6fc440d73c92b28e9dd9dfb5ee6 Mon Sep 17 00:00:00 2001 From: jforbes Date: Thu, 10 Sep 2015 14:51:21 -0700 Subject: [PATCH] @forbesjo fixed webkit deprecation warnings. closes #2558 --- CHANGELOG.md | 1 + src/js/utils/events.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c23256a28d..48a6bf6c99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -125,6 +125,7 @@ CHANGELOG * @gkatsev updated opacity of caption settings background color ([view](https://github.com/videojs/video.js/pull/2573)) * @gkatsev made all sass variables !default ([view](https://github.com/videojs/video.js/pull/2574)) * @heff fixed the inline volume control and made it the default ([view](https://github.com/videojs/video.js/pull/2553)) +* @forbesjo fixed webkit deprecation warnings ([view](https://github.com/videojs/video.js/pull/2558)) -------------------- diff --git a/src/js/utils/events.js b/src/js/utils/events.js index 23c277316f..4c9ca211d1 100644 --- a/src/js/utils/events.js +++ b/src/js/utils/events.js @@ -236,7 +236,9 @@ export function fixEvent(event) { for (var key in old) { // Safari 6.0.3 warns you if you try to copy deprecated layerX/Y // Chrome warns you if you try to copy deprecated keyboardEvent.keyLocation - if (key !== 'layerX' && key !== 'layerY' && key !== 'keyLocation') { + // and webkitMovementX/Y + if (key !== 'layerX' && key !== 'layerY' && key !== 'keyLocation' && + key !== 'webkitMovementX' && key !== 'webkitMovementY') { // Chrome 32+ warns if you try to copy deprecated returnValue, but // we still want to if preventDefault isn't supported (IE8). if (!(key === 'returnValue' && old.preventDefault)) {