diff --git a/composer.json b/composer.json index 266d6702a915fbb4d3e2d987fb9d35263caf6182..36fd30ce003a6e3501515d21cd63ca90523bd6cd 100644 --- a/composer.json +++ b/composer.json @@ -5,8 +5,8 @@ "homepage": "http://drupal.org/project/h5p", "license": "GPL-2.0+", "require": { - "h5p/h5p-core": "dev-release", - "h5p/h5p-editor": "dev-release" + "h5p/h5p-core": "1.19.0", + "h5p/h5p-editor": "1.18.0" }, "minimum-stability": "RC" } diff --git a/composer.lock b/composer.lock index 5e067998a8f4fe21062f0c1907f010dbc7d6377b..0bacbad016aa14884aa93e5a6b602f82ec544489 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "ec2c3f58a79a6493a73307e6350d64d3", + "content-hash": "0053c390e7536328a87223ef90fc6ac7", "packages": [ { "name": "h5p/h5p-core", - "version": "dev-release", + "version": "1.19.0", "source": { "type": "git", "url": "https://github.com/h5p/h5p-php-library.git", - "reference": "715fa6f80311adf605898fcf2dfed690b6cc8c4e" + "reference": "85b278bd52bba4d6cc9d5a1a7dd8ba061742a5f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/h5p/h5p-php-library/zipball/715fa6f80311adf605898fcf2dfed690b6cc8c4e", - "reference": "715fa6f80311adf605898fcf2dfed690b6cc8c4e", + "url": "https://api.github.com/repos/h5p/h5p-php-library/zipball/85b278bd52bba4d6cc9d5a1a7dd8ba061742a5f2", + "reference": "85b278bd52bba4d6cc9d5a1a7dd8ba061742a5f2", "shasum": "" }, "require": { @@ -61,20 +61,20 @@ "interactive", "quiz" ], - "time": "2018-11-01T13:42:12+00:00" + "time": "2018-11-02T09:25:35+00:00" }, { "name": "h5p/h5p-editor", - "version": "dev-release", + "version": "1.18.0", "source": { "type": "git", "url": "https://github.com/h5p/h5p-editor-php-library.git", - "reference": "2d91b3a5f991fe59412b674d6ed1279758f6f912" + "reference": "01a2a553c62cf4f5c0c26c3ec7f69059e6133f90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/h5p/h5p-editor-php-library/zipball/2d91b3a5f991fe59412b674d6ed1279758f6f912", - "reference": "2d91b3a5f991fe59412b674d6ed1279758f6f912", + "url": "https://api.github.com/repos/h5p/h5p-editor-php-library/zipball/01a2a553c62cf4f5c0c26c3ec7f69059e6133f90", + "reference": "01a2a553c62cf4f5c0c26c3ec7f69059e6133f90", "shasum": "" }, "require": { @@ -118,16 +118,13 @@ "interactive", "quiz" ], - "time": "2018-11-01T13:40:43+00:00" + "time": "2018-11-02T08:51:28+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "RC", - "stability-flags": { - "h5p/h5p-core": 20, - "h5p/h5p-editor": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": [], diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index f14a6704279a52932d933a566362b5a3a6e522be..e3f45174623a5209261764c3938468d0ff6480c9 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1,23 +1,23 @@ [ { "name": "h5p/h5p-core", - "version": "dev-release", - "version_normalized": "dev-release", + "version": "1.19.0", + "version_normalized": "1.19.0.0", "source": { "type": "git", "url": "https://github.com/h5p/h5p-php-library.git", - "reference": "715fa6f80311adf605898fcf2dfed690b6cc8c4e" + "reference": "85b278bd52bba4d6cc9d5a1a7dd8ba061742a5f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/h5p/h5p-php-library/zipball/715fa6f80311adf605898fcf2dfed690b6cc8c4e", - "reference": "715fa6f80311adf605898fcf2dfed690b6cc8c4e", + "url": "https://api.github.com/repos/h5p/h5p-php-library/zipball/85b278bd52bba4d6cc9d5a1a7dd8ba061742a5f2", + "reference": "85b278bd52bba4d6cc9d5a1a7dd8ba061742a5f2", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "time": "2018-11-01T13:42:12+00:00", + "time": "2018-11-02T09:25:35+00:00", "type": "library", "installation-source": "source", "autoload": { @@ -60,23 +60,23 @@ }, { "name": "h5p/h5p-editor", - "version": "dev-release", - "version_normalized": "dev-release", + "version": "1.18.0", + "version_normalized": "1.18.0.0", "source": { "type": "git", "url": "https://github.com/h5p/h5p-editor-php-library.git", - "reference": "2d91b3a5f991fe59412b674d6ed1279758f6f912" + "reference": "01a2a553c62cf4f5c0c26c3ec7f69059e6133f90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/h5p/h5p-editor-php-library/zipball/2d91b3a5f991fe59412b674d6ed1279758f6f912", - "reference": "2d91b3a5f991fe59412b674d6ed1279758f6f912", + "url": "https://api.github.com/repos/h5p/h5p-editor-php-library/zipball/01a2a553c62cf4f5c0c26c3ec7f69059e6133f90", + "reference": "01a2a553c62cf4f5c0c26c3ec7f69059e6133f90", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "time": "2018-11-01T13:40:43+00:00", + "time": "2018-11-02T08:51:28+00:00", "type": "library", "installation-source": "source", "autoload": { diff --git a/vendor/h5p/h5p-core/h5p-metadata.class.php b/vendor/h5p/h5p-core/h5p-metadata.class.php index 8462fa428760bfcd3f2f0cd312f7c30dd24c1c2b..73223b12959719b5c60e76da29583109f3d41da6 100644 --- a/vendor/h5p/h5p-core/h5p-metadata.class.php +++ b/vendor/h5p/h5p-core/h5p-metadata.class.php @@ -90,7 +90,7 @@ abstract class H5PMetadata { $exists = array_key_exists($key, $metadata); // Don't include missing fields - if (!$include_missing && !exists) { + if (!$include_missing && !$exists) { continue; } diff --git a/vendor/h5p/h5p-core/h5p.classes.php b/vendor/h5p/h5p-core/h5p.classes.php index b0099bca1b2cfbb2b20d13e7813f7a0955a03b22..d1c05fadf25db1049b1938dad89581f179976607 100644 --- a/vendor/h5p/h5p-core/h5p.classes.php +++ b/vendor/h5p/h5p-core/h5p.classes.php @@ -1864,7 +1864,7 @@ class H5PCore { 'js/h5p-utils.js', ); - public static $defaultContentWhitelist = 'json png jpg jpeg gif bmp tif tiff svg eot ttf woff woff2 otf webm mp4 ogg mp3 wav txt pdf rtf doc docx xls xlsx ppt pptx odt ods odp xml csv diff patch swf md textile vtt webvtt'; + public static $defaultContentWhitelist = 'json png jpg jpeg gif bmp tif tiff svg eot ttf woff woff2 otf webm mp4 ogg mp3 m4a wav txt pdf rtf doc docx xls xlsx ppt pptx odt ods odp xml csv diff patch swf md textile vtt webvtt'; public static $defaultLibraryWhitelistExtras = 'js css'; public $librariesJsonData, $contentJsonData, $mainJsonData, $h5pF, $fs, $h5pD, $disableFileCheck; @@ -3402,8 +3402,14 @@ class H5PContentValidator { */ public function validateMetadata($metadata) { $semantics = $this->getMetadataSemantics(); - $group = (object)$metadata; + + // Stop complaining about "invalid selected option in select" for + // old content without license chosen. + if (!isset($group->license)) { + $group->license = 'U'; + } + $this->validateGroup($group, (object) array( 'type' => 'group', 'fields' => $semantics, diff --git a/vendor/h5p/h5p-core/js/jquery.js b/vendor/h5p/h5p-core/js/jquery.js index 90a3b830be6196d917785b6f3472533310405b55..a05d5568b9c8ce2c4687ea23d2cee34e211c8782 100644 --- a/vendor/h5p/h5p-core/js/jquery.js +++ b/vendor/h5p/h5p-core/js/jquery.js @@ -13,3 +13,8 @@ var H5P = window.H5P = window.H5P || {}; * @member */ H5P.jQuery = jQuery.noConflict(true); +H5P.jQuery.ajaxPrefilter(function (s) { + if (s.crossDomain) { + s.contents.script = false; + } +}); diff --git a/vendor/h5p/h5p-editor/h5peditor-file.class.php b/vendor/h5p/h5p-editor/h5peditor-file.class.php index b0d033e97b62f6d3578cb22815c03a3014d07819..637de4a5ea0ce1cc9e450f16f4847f44ddced41f 100644 --- a/vendor/h5p/h5p-editor/h5peditor-file.class.php +++ b/vendor/h5p/h5p-editor/h5peditor-file.class.php @@ -167,6 +167,7 @@ class H5peditorFile { $allowed = array( 'audio/mpeg' => 'mp3', 'audio/mp3' => 'mp3', + 'audio/mp4' => 'm4a', 'audio/x-wav' => 'wav', 'audio/wav' => 'wav', //'application/ogg' => 'ogg', diff --git a/vendor/h5p/h5p-editor/scripts/h5peditor-file-uploader.js b/vendor/h5p/h5p-editor/scripts/h5peditor-file-uploader.js index ca3ed345841f7c093d719b1edd8925c4628791a5..c5dc3f391bddc8ba7c44b15e1b79a0507111fa55 100644 --- a/vendor/h5p/h5p-editor/scripts/h5peditor-file-uploader.js +++ b/vendor/h5p/h5p-editor/scripts/h5peditor-file-uploader.js @@ -256,7 +256,7 @@ H5PEditor.FileUploader = (function ($, EventDispatcher) { mimes = 'image/jpeg,image/png,image/gif'; } else if (field.type === 'audio') { - mimes = 'audio/mpeg,audio/x-wav,audio/ogg'; + mimes = 'audio/mpeg,audio/x-wav,audio/ogg,audio/mp4'; } else if (field.type === 'video') { mimes = 'video/mp4,video/webm,video/ogg';