From 9c28857247cc8b0b740f83aa664c5d1b37f044b2 Mon Sep 17 00:00:00 2001 From: Gary Katsevman Date: Mon, 19 Oct 2015 18:23:17 -0400 Subject: [PATCH 1/2] bump object.assign. Fixes #2703 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 96b838f8f..4493466ba 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "dependencies": { "global": "^4.3.0", "lodash-compat": "^3.9.3", - "object.assign": "^2.0.1", + "object.assign": "^4.0.1", "safe-json-parse": "^4.0.0", "tsml": "1.0.1", "videojs-font": "1.3.0", From 49698d2a8c45fb4dc60d34cc89aa1d40dbd58a34 Mon Sep 17 00:00:00 2001 From: Gary Katsevman Date: Tue, 20 Oct 2015 13:57:21 -0400 Subject: [PATCH 2/2] @gkatsev bumped obj.assign to fix uncaught SecurityError in iframes. Fixes #2703. closes #2721 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00c0aae94..e6cb84670 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ CHANGELOG ## HEAD (Unreleased) * @imbcmdth fixed an issue with emulateTextTracks being called before the tech dom was ready ([view](https://github.com/videojs/video.js/pull/2692)) +* @gkatsev bumped obj.assign to fix uncaught SecurityError in iframes. Fixes #2703 ([view](https://github.com/videojs/video.js/pull/2721)) --------------------