Compare commits
No commits in common. "master" and "moodle-rc3" have entirely different histories.
master
...
moodle-rc3
|
|
@ -1,3 +1 @@
|
||||||
vendor
|
|
||||||
*~
|
*~
|
||||||
.idea
|
|
||||||
40
.travis.yml
40
.travis.yml
|
|
@ -1,40 +0,0 @@
|
||||||
language: php
|
|
||||||
|
|
||||||
# At present the only jobs to run are a php lint.
|
|
||||||
# Run this against all supported versions of PHP.
|
|
||||||
jobs:
|
|
||||||
include:
|
|
||||||
# Bionic supports PHP 7.1, 7.2, 7.3, and 7.4.
|
|
||||||
# https://docs.travis-ci.com/user/reference/bionic/#php-support
|
|
||||||
- php: 7.4
|
|
||||||
dist: bionic
|
|
||||||
- php: 7.3
|
|
||||||
dist: bionic
|
|
||||||
- php: 7.2
|
|
||||||
dist: bionic
|
|
||||||
- php: 7.1
|
|
||||||
dist: bionic
|
|
||||||
|
|
||||||
# Xenial was the last Travis distribution to support PHP 5.6, and 7.0.
|
|
||||||
# https://docs.travis-ci.com/user/reference/xenial/#php-support
|
|
||||||
- php: 7.0
|
|
||||||
dist: xenial
|
|
||||||
- php: 5.6
|
|
||||||
dist: xenial
|
|
||||||
|
|
||||||
# Trusty was the last Travis distribution to support PHP 5.4, and 5.5.
|
|
||||||
# https://docs.travis-ci.com/user/languages/php/#php-54x---55x-support-is-available-on-precise-and-trusty-only
|
|
||||||
- php: 5.5
|
|
||||||
dist: trusty
|
|
||||||
- php: 5.4
|
|
||||||
dist: trusty
|
|
||||||
|
|
||||||
|
|
||||||
# Precise was the last Travis distribution to support PHP 5.2, and 5.3.
|
|
||||||
# https://docs.travis-ci.com/user/languages/php/#php-52x---53x-support-is-available-on-precise-only
|
|
||||||
- php: 5.3
|
|
||||||
dist: precise
|
|
||||||
|
|
||||||
script:
|
|
||||||
# Run a php lint across all PHP files.
|
|
||||||
- find . -type f -name '*\.php' -print0 | xargs -0 -n1 php -l
|
|
||||||
|
|
@ -1,35 +1,10 @@
|
||||||
{
|
{
|
||||||
"name": "h5p/h5p-core",
|
"name": "h5p/h5p-php-library",
|
||||||
"type": "library",
|
|
||||||
"description": "H5P Core functionality in PHP",
|
|
||||||
"keywords": ["h5p","hvp","interactive","content","quiz"],
|
|
||||||
"homepage": "https://h5p.org",
|
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Svein-Tore Griff With",
|
|
||||||
"email": "with@joubel.com",
|
|
||||||
"homepage": "http://joubel.com",
|
|
||||||
"role": "CEO"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Frode Petterson",
|
|
||||||
"email": "frode.petterson@joubel.com",
|
|
||||||
"homepage": "http://joubel.com",
|
|
||||||
"role": "Developer"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"require": {
|
|
||||||
"php": ">=5.3.0"
|
|
||||||
},
|
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"files": [
|
"files": [
|
||||||
"h5p.classes.php",
|
|
||||||
"h5p-development.class.php",
|
"h5p-development.class.php",
|
||||||
"h5p-file-storage.interface.php",
|
"h5p.classes.php"
|
||||||
"h5p-default-storage.class.php",
|
|
||||||
"h5p-event-base.class.php",
|
|
||||||
"h5p-metadata.class.php"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -9,7 +9,6 @@
|
||||||
<?php for ($i = 0, $s = count($styles); $i < $s; $i++): ?>
|
<?php for ($i = 0, $s = count($styles); $i < $s; $i++): ?>
|
||||||
<link rel="stylesheet" href="<?php print $styles[$i]; ?>">
|
<link rel="stylesheet" href="<?php print $styles[$i]; ?>">
|
||||||
<?php endfor; ?>
|
<?php endfor; ?>
|
||||||
<?php if (!empty($additional_embed_head_tags)): print implode("\n", $additional_embed_head_tags); endif; ?>
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="h5p-content" data-content-id="<?php print $content['id']; ?>"></div>
|
<div class="h5p-content" data-content-id="<?php print $content['id']; ?>"></div>
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -0,0 +1,25 @@
|
||||||
|
<?xml version="1.0" standalone="no"?>
|
||||||
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<metadata>Generated by IcoMoon</metadata>
|
||||||
|
<defs>
|
||||||
|
<font id="h5p-core-14" horiz-adv-x="1024">
|
||||||
|
<font-face units-per-em="1024" ascent="960" descent="-64" />
|
||||||
|
<missing-glyph horiz-adv-x="1024" />
|
||||||
|
<glyph unicode=" " horiz-adv-x="512" d="" />
|
||||||
|
<glyph unicode="" glyph-name="uniE88D" d="M386.662 874.394h71.27v-71.27h-71.27v71.27zM566.067 874.394h71.27v-71.27h-71.27v71.27zM386.662 718.131h71.27v-71.27h-71.27v71.27zM566.067 718.131h71.27v-71.27h-71.27v71.27zM386.662 561.766h71.27v-71.27h-71.27v71.27zM566.067 561.766h71.27v-71.27h-71.27v71.27zM386.662 405.504h71.27v-71.27h-71.27v71.27zM566.067 405.504h71.27v-71.27h-71.27v71.27zM386.662 249.139h71.27v-71.27h-71.27v71.27zM566.067 249.139h71.27v-71.27h-71.27v71.27zM386.662 92.877h71.27v-71.27h-71.27v71.27zM566.067 92.877h71.27v-71.27h-71.27v71.27z" />
|
||||||
|
<glyph unicode="" glyph-name="uniE601" d="M454.299 416.588l-116.917 116.917-84.781-84.707 201.696-201.697 317.097 317.097-84.781 84.706z" />
|
||||||
|
<glyph unicode="" glyph-name="uniE888" horiz-adv-x="1321" d="M660.48 703.59c-140.288 0-253.952-113.664-253.952-253.952 0-122.47 86.63-224.666 202.138-248.627v206.234h-86.835c-11.264 0-14.541 7.168-7.373 16.179l133.12 164.659c7.168 9.011 18.842 9.011 26.010 0l133.12-164.659c7.373-8.602 3.686-16.179-7.373-16.179h-86.835v-206.234c115.507 23.962 202.138 126.157 202.138 248.627-0.205 140.288-113.869 253.952-254.157 253.952z" />
|
||||||
|
<glyph unicode="" glyph-name="uniE889" horiz-adv-x="1321" d="M662.118 701.952c-140.288 0-253.952-113.664-253.952-253.952s113.664-253.952 253.952-253.952 253.952 113.664 253.952 253.952-113.664 253.952-253.952 253.952zM621.773 652.8h83.763v-65.946h-83.763v65.946zM748.749 273.92h-173.67v50.995h49.562v159.13h-49.562v50.995h133.53v-210.125h40.346v-50.995z" />
|
||||||
|
<glyph unicode="" glyph-name="uniE88A" horiz-adv-x="1321" d="M925.491 236.646l-114.688 114.688c27.238 37.888 43.213 84.378 43.213 134.554 0 127.59-103.834 231.424-231.424 231.424s-231.424-103.834-231.424-231.424c0-127.59 103.834-231.424 231.424-231.424 50.176 0 96.666 15.974 134.554 43.213l114.688-114.688c5.325-5.325 13.926-5.325 19.251 0l34.406 34.406c5.325 5.12 5.325 13.926 0 19.251zM622.797 318.566c-92.365 0-167.117 74.752-167.117 167.117s74.752 167.117 167.117 167.117c92.365 0 167.117-74.752 167.117-167.117s-74.752-167.117-167.117-167.117z" />
|
||||||
|
<glyph unicode="" glyph-name="uniE88C" horiz-adv-x="1321" d="M495.845 602.867c4.186 4.186 2.79 8.372-3.255 8.835l-111.615 11.86c-6.046 0.697-10.464-3.721-9.766-9.766l11.86-111.615c0.697-6.046 4.65-7.441 8.835-3.255l103.942 103.942zM421.202 534.968l64.876-64.876c4.186-4.186 11.161-4.186 15.581 0l23.254 23.254c4.186 4.186 4.186 11.161 0 15.581l-64.876 64.876zM932.774 498.924c4.186-4.186 8.372-2.79 8.835 3.255l11.86 111.615c0.697 6.046-3.721 10.464-9.766 9.766l-111.615-11.86c-6.046-0.697-7.441-4.65-3.255-8.835l103.942-103.942zM864.873 573.799l-64.876-64.876c-4.186-4.186-4.186-11.161 0-15.581l23.254-23.254c4.186-4.186 11.161-4.186 15.581 0l64.876 64.876zM828.83 284.064c-4.186-4.186-2.79-8.372 3.255-8.835l111.615-11.86c6.046-0.697 10.464 3.721 9.766 9.766l-11.86 111.615c-0.697 6.046-4.65 7.441-8.835 3.255l-103.942-103.942zM903.707 351.733l-64.876 64.876c-4.186 4.186-11.161 4.186-15.581 0l-23.254-23.254c-4.186-4.186-4.186-11.161 0-15.581l64.876-64.876zM391.903 388.008c-4.186 4.186-8.372 2.79-8.835-3.255l-11.86-111.615c-0.697-6.046 3.721-10.464 9.766-9.766l111.615 11.86c6.046 0.697 7.441 4.65 3.255 8.835l-103.942 103.942zM459.802 313.131l64.876 64.876c4.186 4.186 4.186 11.161 0 15.581l-23.254 23.254c-4.186 4.186-11.161 4.186-15.581 0l-64.876-64.876zM284.938 707.273v-518.547h751.079v518.547h-751.079zM990.906 233.837h-660.857v428.325h660.623v-428.325z" />
|
||||||
|
<glyph unicode="" glyph-name="uniE88E" horiz-adv-x="1321" d="M1062.773 608.822c-21.364 20.404-53.527 31.205-96.254 31.205h-148.821v-76.81h-168.504l-14.162-60.968c11.762 5.521 28.565 9.602 40.087 12.483 11.521 2.88 23.044 1.681 34.325 1.681 38.405 0 69.369-12.001 93.131-35.285 23.763-23.044 35.765-52.567 35.765-87.611 0-24.722-6.241-48.488-18.484-71.529-12.243-22.804-29.764-41.766-52.327-53.768-8.161-4.321-17.043-2.4-26.644-12.001h141.62v144.021h70.811c47.767 0 83.292 9.843 106.335 31.684 23.285 21.844 34.806 51.848 34.806 90.494 0.241 37.205-10.321 66.009-31.684 86.411zM965.8 488.087c-9.12-7.921-25.204-11.284-48.006-11.284h-35.285v86.411h39.846c22.084 0 37.205-5.281 45.125-13.683 7.921-8.401 12.001-18.722 12.001-30.724 0-12.483-4.562-22.804-13.683-30.724zM671.518 446.559c-20.642 0-38.646-12.001-47.287-29.285l-103.694 15.122 46.807 207.629h-100.095v-163.222h-122.417v163.222h-120.017v-384.053h120.017v144.021h122.417v-144.021h148.579c-17.522 9.602-32.643 13.202-45.125 22.563-12.721 9.602-22.804 20.883-30.724 32.885s-13.921 25.685-19.203 43.686l103.694 15.122c8.642-17.283 26.403-29.044 47.047-29.044 29.044 0 52.567 23.522 52.567 52.567s-23.522 52.807-52.567 52.807z" />
|
||||||
|
<glyph unicode="" glyph-name="uniE88F" horiz-adv-x="1321" d="M1030.554 429.363c1.638-3.277 0-3.277-1.638-6.349-20.89-22.323-46.49-35.226-76.8-41.574-12.902-1.638-25.6-3.277-36.864-3.277-12.493 0-18.637 0-27.238 1.638-1.638 0.205-3.277 1.638-4.71 3.277-67.174 60.826-135.987 121.651-203.162 182.477-1.638 1.638-4.71 1.638-6.349 1.638-23.962-6.349-47.923-12.902-73.523-19.251-25.6-4.71-51.2-1.638-75.162 12.902-12.902 7.987-22.323 19.251-28.877 33.587-4.71 9.626 1.638 22.323 12.902 25.6 43.213 12.902 86.426 28.877 128 44.851 12.902 4.71 27.238 7.987 41.574 6.349 4.71 0 9.626-3.277 14.336-4.71 41.574-15.974 83.149-30.31 124.723-46.49 1.638-1.638 4.71-1.638 7.987 0 30.31 7.987 62.464 17.613 92.774 25.6 3.277 1.638 4.71 0 6.349-1.638zM420.864 437.35c19.251 9.626 36.864 6.349 51.2-9.626 12.902-12.902 12.902-28.877 3.277-49.562 19.251 3.277 33.587-3.277 43.213-19.251 11.264-17.613 7.987-33.587-6.349-49.562 4.71 0 11.264 0 15.974-1.638 14.336-3.277 25.6-12.902 30.31-27.238s1.638-27.238-7.987-36.864c-4.71-6.349-11.264-11.264-15.974-17.613s-11.264-11.264-15.974-17.613c-14.336-14.336-38.502-15.974-52.838-1.638-30.31 30.31-55.91 64.102-83.149 97.69-17.613 22.323-33.587 43.213-49.562 65.536-7.987 9.626-12.902 19.251-14.336 31.949 0 7.987 1.638 15.974 7.987 22.323 9.626 9.626 17.613 19.251 27.238 28.877 17.613 17.613 47.923 12.698 62.464-7.987 1.434-1.434 3.072-4.506 4.506-7.782zM571.392 224.563l27.238-28.877c17.613-15.974 46.49-12.902 57.549 7.987l-3.277 3.277c-22.323 22.323-46.49 46.49-68.813 68.813-3.277 3.277-4.71 7.987-3.277 12.902 1.638 4.71 4.71 7.987 9.626 9.626 4.71 1.638 9.626 0 12.902-4.71 14.336-14.336 30.31-30.31 44.851-44.851 14.336-14.336 30.31-28.877 44.851-44.851 7.987-9.626 19.251-11.264 30.31-9.626 14.336 3.277 23.962 11.264 30.31 25.6 1.638 3.277 0 4.71-1.638 6.349-43.213 43.213-86.426 84.787-128 128-3.277 3.277-6.349 7.987-4.71 14.336 1.638 9.626 12.902 14.336 22.323 7.987 1.638-1.638 3.277-1.638 3.277-3.277 43.213-43.213 88.064-88.064 131.277-131.277 3.277-3.277 4.71-3.277 7.987-3.277 17.613 1.638 33.587 15.974 36.864 33.587 0 3.277 0 4.71-1.638 6.349-49.562 49.562-99.123 99.123-148.89 148.89-3.277 3.277-4.71 6.349-4.71 11.264 0 4.71 3.277 11.264 7.987 12.698 4.71 1.638 9.626 1.638 14.336-3.277 3.277-3.277 7.987-7.987 11.264-11.264 35.226-35.226 70.451-70.451 105.677-105.677 11.264-11.264 22.323-20.89 31.949-31.949 1.638-1.638 4.71-3.277 6.349-1.638 23.962 4.71 38.502 30.31 28.877 54.477l38.298-1.638c0-0.205 0-0.41 0.205-0.614 1.434-7.987 1.434-17.203-0.205-24.986-6.349-30.31-23.962-49.562-52.838-59.187-1.638 0-3.277-1.638-3.277-3.277-9.626-31.949-33.587-52.838-67.174-55.91-3.277 0-3.277-1.638-4.71-3.277-17.613-33.587-57.549-49.562-91.136-36.864-4.71 1.638-9.626 4.71-14.336 6.349-6.349-6.349-14.336-12.698-22.323-15.974-27.238-12.698-57.549-6.349-78.438 14.336-9.626 9.626-19.251 19.251-30.31 28.877 7.987 7.987 14.336 15.974 23.962 25.6l1.434-1.024zM404.89 744.55c31.949-9.626 62.464-20.89 94.413-30.31 33.587-11.264 65.536-20.89 99.123-31.949 1.638 0 1.638 0 3.277-1.638-17.613-6.349-33.587-11.264-49.562-17.613-1.638 0-3.277 0-4.71 0-44.851 14.336-91.136 28.877-135.987 43.213-3.277 1.638-4.71 0-7.987-1.638l-80.077-185.549c0-9.626 4.71-17.613 11.264-25.6 3.277-4.71 6.349-7.987 7.987-9.626-7.987-7.987-14.336-15.974-22.323-25.6-15.974 19.251-28.877 38.502-30.31 64.102l89.498 212.787c-0.41-0.205 12.902 13.312 25.395 9.421z" />
|
||||||
|
<glyph unicode="" glyph-name="uniE890" horiz-adv-x="1321" d="M660.48 701.952c-140.288 0-253.952-113.664-253.952-253.952s113.664-253.952 253.952-253.952 253.952 113.664 253.952 253.952-113.664 253.952-253.952 253.952zM796.058 371.2c6.963-6.963 6.963-18.022 0-24.986l-33.997-33.997c-6.963-6.963-18.022-6.963-24.986 0l-76.8 76.8-76.595-76.595c-6.963-6.963-18.022-6.963-24.986 0l-33.997 33.997c-6.963 6.963-6.963 18.022 0 24.986l76.8 76.8-76.8 76.8c-6.963 6.963-6.963 18.022 0 24.986l33.997 33.997c6.963 6.963 18.022 6.963 24.986 0l76.8-76.8 76.8 76.8c6.963 6.963 18.022 6.963 24.986 0l33.997-33.997c6.963-6.963 6.963-18.022 0-24.986l-77.005-77.005 76.8-76.8z" />
|
||||||
|
<glyph unicode="" glyph-name="uniE891" horiz-adv-x="1321" d="M324.468 566.591c-4.186-4.186-2.79-8.372 3.255-8.835l111.615-11.86c6.046-0.697 10.464 3.721 9.766 9.766l-11.86 111.615c-0.697 6.046-4.65 7.441-8.835 3.255l-103.942-103.942zM399.112 634.259l-64.644 64.876c-4.186 4.186-11.161 4.186-15.581 0l-23.254-23.254c-4.186-4.186-4.186-11.161 0-15.581l64.876-64.876zM896.497 670.533c-4.186 4.186-8.372 2.79-8.835-3.255l-11.86-111.615c-0.697-6.046 3.721-10.464 9.766-9.766l111.615 11.86c6.046 0.697 7.441 4.65 3.255 8.835l-103.942 103.942zM964.165 595.657l64.876 64.876c4.186 4.186 4.186 11.161 0 15.581l-23.254 23.254c-4.186 4.186-11.161 4.186-15.581 0l-64.876-64.876zM1000.44 320.34c4.186 4.186 2.79 8.372-3.255 8.835l-111.615 11.86c-6.046 0.697-10.464-3.721-9.766-9.766l11.86-111.615c0.697-6.046 4.65-7.441 8.835-3.255l103.942 103.942zM925.564 252.441l64.876-64.876c4.186-4.186 11.161-4.186 15.581 0l23.254 23.254c4.186 4.186 4.186 11.161 0 15.581l-64.876 64.876zM428.41 216.398c4.186-4.186 8.372-2.79 8.835 3.255l11.86 111.615c0.697 6.046-3.721 10.464-9.766 9.766l-111.615-11.86c-6.046-0.697-7.441-4.65-3.255-8.835l103.942-103.942zM360.51 291.273l-64.876-64.876c-4.186-4.186-4.186-11.161 0-15.581l23.254-23.254c4.186-4.186 11.161-4.186 15.581 0l64.876 64.876zM477.939 572.404v-248.809h365.076v248.809h-365.076zM797.905 368.707h-274.854v158.355h274.621v-158.355z" />
|
||||||
|
<glyph unicode="" glyph-name="uniE892" horiz-adv-x="1321" d="M599.553 337.314c4.419-3.023 8.138-9.998 8.138-15.581v-58.599c0-5.348-3.721-7.441-8.138-4.419l-220.906 148.123c-4.419 3.023-8.138 9.998-8.138 15.348v50.228c0 5.348 3.721 12.323 8.138 15.581l220.906 149.517c4.419 3.023 8.138 1.162 8.138-4.419v-58.599c0-5.348-3.721-12.556-8.138-15.581l-152.773-106.731c-4.419-3.023-4.419-8.138 0-11.161l152.773-103.71zM874.175 440.559c4.419 3.023 4.65 8.138 0 11.161l-152.773 106.731c-4.419 3.023-8.138 10.232-8.138 15.581v58.599c0 5.348 3.721 7.441 8.138 4.419l220.906-149.517c4.419-3.023 8.138-9.998 8.138-15.581v-50.228c0-5.348-3.721-12.323-8.138-15.348l-220.906-148.123c-4.419-3.023-8.138-1.162-8.138 4.419v58.599c0 5.348 3.721 12.323 8.138 15.581l152.773 103.71z" />
|
||||||
|
<glyph unicode="" glyph-name="uniE893" horiz-adv-x="1321" d="M502.17 522.957c-12.902 0-16.998-8.192-8.806-18.227l152.166-188.006c8.192-10.035 21.504-10.035 29.696 0l152.166 188.006c8.192 10.035 4.301 18.227-8.806 18.227h-316.416zM719.462 512.512v139.878c0 12.902-10.65 23.552-23.552 23.552h-70.656c-12.902 0-23.552-10.65-23.552-23.552v-139.878zM798.106 375.91c-8.602 0-20.070-5.53-25.6-12.288l-75.162-92.979c-5.325-6.758-15.36-16.589-22.118-21.914 0 0-4.506-3.686-14.746-3.686s-14.746 3.686-14.746 3.686c-6.758 5.325-16.589 15.36-22.118 21.914l-75.162 92.979c-5.325 6.758-16.998 12.288-25.6 12.288h-130.253c-8.602 0-15.77-6.963-15.77-15.77v-141.722c0-8.602 6.963-15.77 15.77-15.77h535.962c8.602 0 15.77 6.963 15.77 15.77v141.722c0 8.602-6.963 15.77-15.77 15.77h-130.458zM448.102 261.018c-15.565 0-28.262 12.698-28.262 28.262s12.698 28.262 28.262 28.262 28.262-12.698 28.262-28.262c-0.205-15.565-12.698-28.262-28.262-28.262z" />
|
||||||
|
<glyph unicode="" glyph-name="uniE894" horiz-adv-x="1321" d="M742.605 448l107.11 107.11c9.626 9.626 9.626 25.19 0 34.816l-47.309 47.309c-9.626 9.626-25.19 9.626-34.816 0l-107.11-107.11-107.11 107.11c-9.626 9.626-25.19 9.626-34.816 0l-47.309-47.309c-9.626-9.626-9.626-25.19 0-34.816l107.11-107.11-107.11-107.11c-9.626-9.626-9.626-25.19 0-34.816l47.309-47.309c9.626-9.626 25.19-9.626 34.816 0l107.11 107.11 107.11-107.11c9.626-9.626 25.19-9.626 34.816 0l47.309 47.309c9.626 9.626 9.626 25.19 0 34.816l-107.11 107.11z" />
|
||||||
|
<glyph unicode="" glyph-name="edit-image" d="M300.237 770.97c69.018 23.142 133.325 14.234 189.133-33.28 56.627-48.128 77.619-110.592 63.181-183.808-2.355-12.186 0.307-19.456 8.704-27.853 93.901-93.389 156.774-156.467 250.47-250.163 5.427-5.427 10.957-10.854 15.667-16.896 39.424-50.278 16.794-124.006-44.237-142.029-36.966-10.957-68.403 0-95.334 27.034-95.642 96.051-160.973 160.973-256.614 257.024-6.963 6.963-12.8 8.909-22.63 6.758-117.76-26.317-229.171 60.826-231.731 181.453-0.614 26.419 3.584 52.326 15.974 77.926 34.816-34.816 68.506-67.789 101.274-101.786 10.445-10.752 20.992-15.36 36.045-15.36 14.643 0 25.19 3.891 34.816 14.848 10.752 12.39 23.040 23.347 34.611 35.021 14.336 14.438 14.336 46.080-0.205 60.518-35.123 35.226-70.349 70.349-106.598 106.496 3.891 2.253 5.632 3.482 7.475 4.096zM703.386 212.89c-0.41-24.269 20.685-45.466 44.851-45.158 23.757 0.41 44.032 20.992 43.93 44.544-0.102 23.757-20.275 44.032-44.237 44.134-23.859 0.307-44.237-19.661-44.544-43.52z" />
|
||||||
|
<glyph unicode="" glyph-name="hourglass" d="M733.286 138.752c-147.763 0-295.526 0-443.29 0 0 2.048 0.102 4.096 0 6.144-0.307 13.824-1.024 32.666-0.922 46.49 0.41 39.731 6.861 78.131 19.046 115.2 17.203 52.224 43.725 96.256 81.306 130.355 4.506 4.096 9.216 7.885 13.722 11.776-0.205 0.717-0.307 1.126-0.41 1.229-1.331 1.229-2.765 2.355-4.198 3.584-28.058 22.63-50.688 51.405-68.403 85.606-30.618 59.085-43.52 123.597-41.165 192.614 0.205 7.168 0.614 18.33 0.922 25.498 147.763 0 295.526 0 443.29 0 0.205-1.331 0.512-2.662 0.614-3.994 2.662-36.966 1.229-77.722-5.939-113.869-14.336-72.909-44.544-133.837-95.027-179.405-4.096-3.686-8.294-7.066-12.39-10.547 0.205-0.717 0.307-1.126 0.512-1.331 0.819-0.717 1.638-1.434 2.458-2.15 42.189-33.894 71.68-79.872 90.931-135.782 11.776-34.202 18.637-69.837 20.070-106.701 0.819-19.763-0.614-44.851-1.126-64.717zM687.309 181.965c0 6.554 0.205 12.493 0 18.432-1.331 37.581-7.27 74.138-19.866 108.749-17.92 49.562-45.568 88.269-88.678 108.646-2.458 1.126-2.97 3.072-2.97 5.837 0.102 16.691 0.102 33.485 0 50.176 0 3.994 1.331 5.427 4.096 6.963 9.114 5.325 18.432 10.24 26.829 16.896 29.696 23.552 49.152 56.934 62.362 95.744 10.342 30.413 15.77 62.259 17.818 94.822 0.614 9.114 0.102 18.227 0.102 27.546-116.634 0-233.574 0-351.027 0 0.307-8.704 0.614-16.998 1.024-25.395 1.946-37.274 8.499-73.216 21.504-107.213 18.125-47.104 45.261-83.558 86.528-103.117 2.253-1.024 2.867-2.662 2.867-5.427-0.102-17.203-0.102-34.509 0-51.712 0-3.072-1.024-4.506-3.277-5.632-5.632-2.867-11.366-5.734-16.691-9.216-34.304-22.733-56.832-57.754-71.987-100.147-12.493-35.123-18.125-71.987-19.661-109.875-0.205-5.325 0-10.752 0-16.282 117.35 0.205 234.189 0.205 351.027 0.205zM410.214 601.293c68.096 0 135.373 0 203.674 0-3.789-6.554-7.168-12.595-10.752-18.227-10.957-16.998-24.269-30.618-39.731-41.472s-27.75-25.293-32.768-46.592c-1.638-6.963-2.765-14.336-2.867-21.606-0.307-17.203-0.205-34.406 0.307-51.712 0.717-28.058 12.493-48.947 32.154-62.566 43.008-30.003 65.843-75.878 75.776-132.506 0.307-1.638 0.307-3.379 0.614-5.53-83.149 0-166.093 0-249.242 0 2.662 20.685 7.885 40.346 15.462 59.085 13.312 32.973 32.768 59.187 59.494 77.722 16.589 11.469 28.365 27.955 32.358 50.995 0.819 4.813 1.331 9.83 1.434 14.746 0.102 18.637 0.614 37.274-0.205 55.808-1.126 24.678-11.981 43.213-28.57 57.139-9.216 7.782-18.944 14.746-27.648 23.142-11.981 11.162-21.197 25.395-29.491 41.574z" />
|
||||||
|
</font></defs></svg>
|
||||||
|
After Width: | Height: | Size: 16 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 97 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,38 +0,0 @@
|
||||||
<?xml version="1.0" standalone="no"?>
|
|
||||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<metadata>
|
|
||||||
<json>
|
|
||||||
<![CDATA[
|
|
||||||
{
|
|
||||||
"fontFamily": "h5p-hub",
|
|
||||||
"description": "Font generated by IcoMoon.",
|
|
||||||
"majorVersion": 1,
|
|
||||||
"minorVersion": 3,
|
|
||||||
"version": "Version 1.3",
|
|
||||||
"fontId": "h5p-hub",
|
|
||||||
"psName": "h5p-hub",
|
|
||||||
"subFamily": "Regular",
|
|
||||||
"fullName": "h5p-hub"
|
|
||||||
}
|
|
||||||
]]>
|
|
||||||
</json>
|
|
||||||
</metadata>
|
|
||||||
<defs>
|
|
||||||
<font id="h5p-hub" horiz-adv-x="1024">
|
|
||||||
<font-face units-per-em="1024" ascent="960" descent="-64" />
|
|
||||||
<missing-glyph horiz-adv-x="1024" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="512" d="" />
|
|
||||||
<glyph unicode="" glyph-name="dropdown" data-tags="dropdown" d="M1004.654 717.002c-11.526 11.526-27.853 19.209-45.142 19.209h-895.161c-35.538 0-63.391-27.853-64.352-63.391 0-17.289 6.724-33.616 19.209-46.103l447.582-447.582c24.013-24.972 63.391-25.933 88.363-1.92 0.961 0.961 0.961 0.961 1.92 1.92l447.582 447.582c24.972 24.013 25.933 63.391 1.92 88.363-0.961 0.961-0.961 0.961-1.92 1.92z" />
|
|
||||||
<glyph unicode="" glyph-name="info" data-tags="info" d="M745.14 76.307c-0.699 25.827-20.941 46.069-46.768 46.768h-46.069v418.813c-1.395 25.827-21.639 46.069-46.768 46.069h-279.209c-25.827 0-46.768-20.941-47.465-46.768v-92.837c0.699-25.827 20.941-46.069 46.768-46.768h46.768v-279.209h-46.069c-25.827-0.699-46.069-20.941-46.768-46.768v-92.837c0.699-25.827 20.941-46.069 46.768-46.768h372.045c25.827 0.699 46.069 20.941 46.768 46.768v93.534zM638.343 946.041c-8.376 9.075-20.242 13.96-32.806 13.96h-185.673c-25.827-0.699-46.069-20.941-46.768-46.768v-139.604c0.699-25.827 20.941-46.069 46.768-46.768h186.372c25.129 1.395 45.371 21.639 46.069 46.768v139.604c0 12.564-5.584 24.43-13.96 32.806z" />
|
|
||||||
<glyph unicode="" glyph-name="thick-arrow" data-tags="thick-arrow" d="M997.162 446.653c0.634 22.167-8.234 44.336-24.701 59.537l-428.789 428.789c-32.302 32.936-85.505 33.568-118.44 0.634 0 0-0.634-0.634-0.634-0.634l-49.403-49.403c-32.936-32.302-32.936-84.871-1.266-117.806 0.634-0.634 0.634-0.634 1.266-1.266l192.544-193.81h-463.625c-21.535 0.634-41.802-8.234-55.737-24.701-14.567-16.467-22.167-38.002-21.535-59.537v-84.238c-0.634-21.535 6.967-43.068 21.535-59.537 13.935-16.467 34.202-25.335 55.737-24.701h464.259l-193.81-190.644c-32.936-32.936-33.568-86.138-0.634-119.073 0 0 0.634-0.634 0.634-0.634l49.403-49.403c32.936-32.302 86.138-32.302 119.073 0l429.423 429.423c15.201 15.201 24.067 35.468 24.701 57.003v0z" />
|
|
||||||
<glyph unicode="" glyph-name="check" data-tags="check" d="M1021.469 686.541c0 17.084-6.328 32.903-18.349 44.924l-89.849 89.215c-24.677 24.677-64.539 24.677-89.215 0.633 0 0 0 0-0.633-0.633l-432.156-432.79-193.616 194.25c-24.677 24.677-64.539 24.677-89.215 0.633 0 0 0 0-0.633-0.633l-89.215-89.215c-24.677-24.677-24.677-64.539-0.633-89.215 0 0 0 0 0.633-0.633l327.755-327.755c24.677-24.677 64.539-24.677 89.215-0.633 0 0 0 0 0.633 0.633l569.46 569.46c12.022 12.022 18.349 27.84 18.349 44.924v0l-2.531-3.163z" />
|
|
||||||
<glyph unicode="" glyph-name="close" data-tags="close" d="M1024 856.869l-103.131 103.131-408.869-408.869-408.869 408.869-103.131-103.131 408.869-408.869-408.869-408.869 103.131-103.131 408.869 408.869 408.869-408.869 103.131 103.131-408.869 408.869z" />
|
|
||||||
<glyph unicode="" glyph-name="plus" data-tags="plus" d="M597.333 533.333v426.667h-170.667v-426.667h-426.667v-170.667h426.667v-426.667h170.667v426.667h426.667v170.667z" />
|
|
||||||
<glyph unicode="" glyph-name="filters" data-tags="filters" d="M217.543 834.589v98.249c0 14.999-12.163 27.162-27.162 27.162h-8.785c-14.999 0-27.162-12.163-27.162-27.162v-98.249c-63.792-14.19-110.78-70.3-110.78-137.38s46.988-123.189 109.844-137.208l0.936-592.841c0-14.999 12.163-27.162 27.162-27.162h7.99c14.999 0 27.162 12.163 27.162 27.162v588.669c69.551 9.191 122.666 68.109 122.666 139.435 0 71.041-52.699 129.772-121.13 139.246zM549.82 417.644v515.184c0 14.999-12.163 27.162-27.162 27.162h-4.796c-14.999 0-27.162-12.163-27.162-27.162v-513.593c-71.358-12.114-125.020-73.469-125.020-147.364s53.662-135.26 124.145-147.242l0.884-159.869c0-14.999 12.163-27.162 27.162-27.162h4.796c14.999 0 27.162 12.163 27.162 27.162v159.745c67.325 15.43 116.8 74.826 116.8 145.772s-49.464 130.342-115.794 145.579zM980.345 594.96c-0.075 69.212-51.022 126.499-117.453 136.489l-0.764 201.379c0 14.999-12.163 27.162-27.162 27.162h-6.387c-14.999 0-27.162-12.163-27.162-27.162v-205.273c-58.17-16.849-99.977-69.642-99.977-132.191s41.807-115.342 99-131.95l0.967-500.252c0-14.999 12.163-27.162 27.162-27.162h4.796c14.999 0 27.162 12.163 27.162 27.162v496.022c67.608 9.329 119.206 66.436 119.809 135.722z" />
|
|
||||||
<glyph unicode="" glyph-name="arrow-line" data-tags="arrow-line" d="M995.878 700.739l-43.703 43.703c-17.591 16.506-41.326 26.645-67.432 26.645s-49.837-10.139-67.483-26.693l-303.387-303.389-305.935 304.692c-17.468 16.781-41.244 27.116-67.432 27.116s-49.958-10.335-67.464-27.148l-44.92-44.92c-17.371-17.206-28.122-41.062-28.122-67.432s10.752-50.226 28.112-67.421l414.583-414.583c17.206-17.371 41.062-28.122 67.432-28.122s50.226 10.752 67.421 28.112l418.329 414.583c17.371 17.206 28.122 41.062 28.122 67.432s-10.752 50.226-28.112 67.421z" />
|
|
||||||
<glyph unicode="" glyph-name="check-empty" data-tags="check-empty" d="M910.2 846.2v-796.4h-796.4v796.4h796.4zM910.2 960h-796.4c-62.6 0-113.8-51.2-113.8-113.8v-796.4c0-62.6 51.2-113.8 113.8-113.8h796.4c62.6 0 113.8 51.2 113.8 113.8v796.4c0 62.6-51.2 113.8-113.8 113.8z" />
|
|
||||||
<glyph unicode="" glyph-name="check1" data-tags="check" d="M910.2 960h-796.4c-62.6 0-113.8-51.2-113.8-113.8v-796.4c0-62.6 51.2-113.8 113.8-113.8h796.4c62.6 0 113.8 51.2 113.8 113.8v796.4c0 62.6-51.2 113.8-113.8 113.8zM398.2 163.6l-284.4 284.4 79.6 79.6 204.8-204.8 432.4 432.4 79.6-79.6-512-512z" />
|
|
||||||
<glyph unicode="" glyph-name="details-arrow" data-tags="details-arrow" d="M512 960.001l-90.24-90.24 357.12-357.76h-778.879v-127.999h778.879l-357.12-357.76 90.24-90.24 511.999 511.999z" />
|
|
||||||
<glyph unicode="" glyph-name="Spinner" data-tags="Spinner" d="M1023.953 448.071c1.137 83.016-18.195 164.895-56.861 238.814-75.625 145.563-216.069 245.637-378.121 270.087v-135.328c85.291-16.489 162.621-63.115 217.207-130.779 89.839-108.035 112.015-257.578 56.861-387.219-38.097-91.545-110.309-163.758-201.855-201.855-93.82-40.37-200.149-40.37-293.969 0-91.545 38.097-163.758 110.309-201.855 201.855-55.155 129.642-32.979 279.184 56.861 387.219 54.586 67.663 131.917 114.289 217.207 130.779v135.328c-163.758-22.745-305.91-123.388-382.102-270.087-69.938-135.328-76.193-294.537-17.058-434.982 51.174-123.388 149.542-221.756 272.93-272.361 127.367-54.017 270.655-54.017 398.023 0 122.819 51.174 220.619 148.975 271.793 271.793 26.724 61.978 40.37 129.073 40.94 196.738v0z" />
|
|
||||||
</font></defs></svg>
|
|
||||||
|
Before Width: | Height: | Size: 6.6 KiB |
Binary file not shown.
Binary file not shown.
|
|
@ -53,11 +53,11 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
*
|
*
|
||||||
* @param string $source
|
* @param string $source
|
||||||
* Path on file system to content directory.
|
* Path on file system to content directory.
|
||||||
* @param array $content
|
* @param int $id
|
||||||
* Content properties
|
* What makes this content unique.
|
||||||
*/
|
*/
|
||||||
public function saveContent($source, $content) {
|
public function saveContent($source, $id) {
|
||||||
$dest = "{$this->path}/content/{$content['id']}";
|
$dest = "{$this->path}/content/{$id}";
|
||||||
|
|
||||||
// Remove any old content
|
// Remove any old content
|
||||||
\H5PCore::deleteFileTree($dest);
|
\H5PCore::deleteFileTree($dest);
|
||||||
|
|
@ -68,11 +68,11 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
/**
|
/**
|
||||||
* Remove content folder.
|
* Remove content folder.
|
||||||
*
|
*
|
||||||
* @param array $content
|
* @param int $id
|
||||||
* Content properties
|
* Content identifier
|
||||||
*/
|
*/
|
||||||
public function deleteContent($content) {
|
public function deleteContent($id) {
|
||||||
\H5PCore::deleteFileTree("{$this->path}/content/{$content['id']}");
|
\H5PCore::deleteFileTree("{$this->path}/content/{$id}");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -85,10 +85,8 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
*/
|
*/
|
||||||
public function cloneContent($id, $newId) {
|
public function cloneContent($id, $newId) {
|
||||||
$path = $this->path . '/content/';
|
$path = $this->path . '/content/';
|
||||||
if (file_exists($path . $id)) {
|
|
||||||
self::copyFileTree($path . $id, $path . $newId);
|
self::copyFileTree($path . $id, $path . $newId);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get path to a new unique tmp folder.
|
* Get path to a new unique tmp folder.
|
||||||
|
|
@ -145,18 +143,11 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
* Path on file system to temporary export file.
|
* Path on file system to temporary export file.
|
||||||
* @param string $filename
|
* @param string $filename
|
||||||
* Name of export file.
|
* Name of export file.
|
||||||
* @throws Exception Unable to save the file
|
|
||||||
*/
|
*/
|
||||||
public function saveExport($source, $filename) {
|
public function saveExport($source, $filename) {
|
||||||
$this->deleteExport($filename);
|
$this->deleteExport($filename);
|
||||||
|
self::dirReady("{$this->path}/exports");
|
||||||
if (!self::dirReady("{$this->path}/exports")) {
|
copy($source, "{$this->path}/exports/{$filename}");
|
||||||
throw new Exception("Unable to create directory for H5P export file.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!copy($source, "{$this->path}/exports/{$filename}")) {
|
|
||||||
throw new Exception("Unable to save H5P export file.");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -171,17 +162,6 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if the given export file exists
|
|
||||||
*
|
|
||||||
* @param string $filename
|
|
||||||
* @return boolean
|
|
||||||
*/
|
|
||||||
public function hasExport($filename) {
|
|
||||||
$target = "{$this->path}/exports/{$filename}";
|
|
||||||
return file_exists($target);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Will concatenate all JavaScrips and Stylesheets into two files in order
|
* Will concatenate all JavaScrips and Stylesheets into two files in order
|
||||||
* to improve page performance.
|
* to improve page performance.
|
||||||
|
|
@ -285,7 +265,7 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getContent($file_path) {
|
public function getContent($file_path) {
|
||||||
return file_get_contents($file_path);
|
return file_get_contents($this->path . $file_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -299,7 +279,7 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
// Prepare directory
|
// Prepare directory
|
||||||
if (empty($contentId)) {
|
if (empty($contentId)) {
|
||||||
// Should be in editor tmp folder
|
// Should be in editor tmp folder
|
||||||
$path = $this->getEditorPath();
|
$path = ($this->alteditorpath !== NULL ? $this->alteditorpath : $path . '/editor');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// Should be in content folder
|
// Should be in content folder
|
||||||
|
|
@ -311,9 +291,13 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
// Add filename to path
|
// Add filename to path
|
||||||
$path .= '/' . $file->getName();
|
$path .= '/' . $file->getName();
|
||||||
|
|
||||||
|
$fileData = $file->getData();
|
||||||
|
if ($fileData) {
|
||||||
|
file_put_contents($path, $fileData);
|
||||||
|
}
|
||||||
|
else {
|
||||||
copy($_FILES['file']['tmp_name'], $path);
|
copy($_FILES['file']['tmp_name'], $path);
|
||||||
|
}
|
||||||
return $file;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -327,7 +311,7 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
public function cloneContentFile($file, $fromId, $toId) {
|
public function cloneContentFile($file, $fromId, $toId) {
|
||||||
// Determine source path
|
// Determine source path
|
||||||
if ($fromId === 'editor') {
|
if ($fromId === 'editor') {
|
||||||
$sourcepath = $this->getEditorPath();
|
$sourcepath = ($this->alteditorpath !== NULL ? $this->alteditorpath : "{$this->path}/editor");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$sourcepath = "{$this->path}/content/{$fromId}";
|
$sourcepath = "{$this->path}/content/{$fromId}";
|
||||||
|
|
@ -352,41 +336,6 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
copy($sourcepath, $targetpath);
|
copy($sourcepath, $targetpath);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Copy a content from one directory to another. Defaults to cloning
|
|
||||||
* content from the current temporary upload folder to the editor path.
|
|
||||||
*
|
|
||||||
* @param string $source path to source directory
|
|
||||||
* @param string $contentId Id of contentarray
|
|
||||||
*/
|
|
||||||
public function moveContentDirectory($source, $contentId = NULL) {
|
|
||||||
if ($source === NULL) {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Remove $contentId and never copy temporary files into content folder. JI-366
|
|
||||||
if ($contentId === NULL || $contentId == 0) {
|
|
||||||
$target = $this->getEditorPath();
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// Use content folder
|
|
||||||
$target = "{$this->path}/content/{$contentId}";
|
|
||||||
}
|
|
||||||
|
|
||||||
$contentSource = $source . '/' . 'content';
|
|
||||||
$contentFiles = array_diff(scandir($contentSource), array('.','..', 'content.json'));
|
|
||||||
foreach ($contentFiles as $file) {
|
|
||||||
if (is_dir("{$contentSource}/{$file}")) {
|
|
||||||
self::copyFileTree("{$contentSource}/{$file}", "{$target}/{$file}");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
copy("{$contentSource}/{$file}", "{$target}/{$file}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Return list of all files so that they can be marked as temporary. JI-366
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks to see if content has the given file.
|
* Checks to see if content has the given file.
|
||||||
* Used when saving content.
|
* Used when saving content.
|
||||||
|
|
@ -412,80 +361,7 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
$path = "{$this->path}/content/{$contentId}/{$file}";
|
$path = "{$this->path}/content/{$contentId}/{$file}";
|
||||||
if (file_exists($path)) {
|
if (file_exists($path)) {
|
||||||
unlink($path);
|
unlink($path);
|
||||||
|
|
||||||
// Clean up any empty parent directories to avoid cluttering the file system
|
|
||||||
$parts = explode('/', $path);
|
|
||||||
while (array_pop($parts) !== NULL) {
|
|
||||||
$dir = implode('/', $parts);
|
|
||||||
if (is_dir($dir) && count(scandir($dir)) === 2) { // empty contains '.' and '..'
|
|
||||||
rmdir($dir); // Remove empty parent
|
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
return; // Not empty
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if server setup has write permission to
|
|
||||||
* the required folders
|
|
||||||
*
|
|
||||||
* @return bool True if site can write to the H5P files folder
|
|
||||||
*/
|
|
||||||
public function hasWriteAccess() {
|
|
||||||
return self::dirReady($this->path);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if the file presave.js exists in the root of the library
|
|
||||||
*
|
|
||||||
* @param string $libraryFolder
|
|
||||||
* @param string $developmentPath
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public function hasPresave($libraryFolder, $developmentPath = null) {
|
|
||||||
$path = is_null($developmentPath) ? 'libraries' . '/' . $libraryFolder : $developmentPath;
|
|
||||||
$filePath = realpath($this->path . '/' . $path . '/' . 'presave.js');
|
|
||||||
return file_exists($filePath);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if upgrades script exist for library.
|
|
||||||
*
|
|
||||||
* @param string $machineName
|
|
||||||
* @param int $majorVersion
|
|
||||||
* @param int $minorVersion
|
|
||||||
* @return string Relative path
|
|
||||||
*/
|
|
||||||
public function getUpgradeScript($machineName, $majorVersion, $minorVersion) {
|
|
||||||
$upgrades = "/libraries/{$machineName}-{$majorVersion}.{$minorVersion}/upgrades.js";
|
|
||||||
if (file_exists($this->path . $upgrades)) {
|
|
||||||
return $upgrades;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Store the given stream into the given file.
|
|
||||||
*
|
|
||||||
* @param string $path
|
|
||||||
* @param string $file
|
|
||||||
* @param resource $stream
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public function saveFileFromZip($path, $file, $stream) {
|
|
||||||
$filePath = $path . '/' . $file;
|
|
||||||
|
|
||||||
// Make sure the directory exists first
|
|
||||||
$matches = array();
|
|
||||||
preg_match('/(.+)\/[^\/]*$/', $filePath, $matches);
|
|
||||||
self::dirReady($matches[1]);
|
|
||||||
|
|
||||||
// Store in local storage folder
|
|
||||||
return file_put_contents($filePath, $stream);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -505,8 +381,6 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
throw new \Exception('unabletocopy');
|
throw new \Exception('unabletocopy');
|
||||||
}
|
}
|
||||||
|
|
||||||
$ignoredFiles = self::getIgnoredFiles("{$source}/.h5pignore");
|
|
||||||
|
|
||||||
$dir = opendir($source);
|
$dir = opendir($source);
|
||||||
if ($dir === FALSE) {
|
if ($dir === FALSE) {
|
||||||
trigger_error('Unable to open directory ' . $source, E_USER_WARNING);
|
trigger_error('Unable to open directory ' . $source, E_USER_WARNING);
|
||||||
|
|
@ -514,7 +388,7 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
}
|
}
|
||||||
|
|
||||||
while (false !== ($file = readdir($dir))) {
|
while (false !== ($file = readdir($dir))) {
|
||||||
if (($file != '.') && ($file != '..') && $file != '.git' && $file != '.gitignore' && !in_array($file, $ignoredFiles)) {
|
if (($file != '.') && ($file != '..') && $file != '.git' && $file != '.gitignore') {
|
||||||
if (is_dir("{$source}/{$file}")) {
|
if (is_dir("{$source}/{$file}")) {
|
||||||
self::copyFileTree("{$source}/{$file}", "{$destination}/{$file}");
|
self::copyFileTree("{$source}/{$file}", "{$destination}/{$file}");
|
||||||
}
|
}
|
||||||
|
|
@ -526,25 +400,6 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
closedir($dir);
|
closedir($dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve array of file names from file.
|
|
||||||
*
|
|
||||||
* @param string $file
|
|
||||||
* @return array Array with files that should be ignored
|
|
||||||
*/
|
|
||||||
private static function getIgnoredFiles($file) {
|
|
||||||
if (file_exists($file) === FALSE) {
|
|
||||||
return array();
|
|
||||||
}
|
|
||||||
|
|
||||||
$contents = file_get_contents($file);
|
|
||||||
if ($contents === FALSE) {
|
|
||||||
return array();
|
|
||||||
}
|
|
||||||
|
|
||||||
return preg_split('/\s+/', $contents);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Recursive function that makes sure the specified directory exists and
|
* Recursive function that makes sure the specified directory exists and
|
||||||
* is writable.
|
* is writable.
|
||||||
|
|
@ -574,13 +429,4 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Easy helper function for retrieving the editor path
|
|
||||||
*
|
|
||||||
* @return string Path to editor files
|
|
||||||
*/
|
|
||||||
private function getEditorPath() {
|
|
||||||
return ($this->alteditorpath !== NULL ? $this->alteditorpath : "{$this->path}/editor");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ class H5PDevelopment {
|
||||||
$contents = scandir($path);
|
$contents = scandir($path);
|
||||||
|
|
||||||
for ($i = 0, $s = count($contents); $i < $s; $i++) {
|
for ($i = 0, $s = count($contents); $i < $s; $i++) {
|
||||||
if ($contents[$i][0] === '.') {
|
if ($contents[$i]{0} === '.') {
|
||||||
continue; // Skip hidden stuff.
|
continue; // Skip hidden stuff.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -84,19 +84,10 @@ class H5PDevelopment {
|
||||||
|
|
||||||
// TODO: Validate props? Not really needed, is it? this is a dev site.
|
// TODO: Validate props? Not really needed, is it? this is a dev site.
|
||||||
|
|
||||||
$library['libraryId'] = $this->h5pF->getLibraryId($library['machineName'], $library['majorVersion'], $library['minorVersion']);
|
|
||||||
|
|
||||||
// Convert metadataSettings values to boolean & json_encode it before saving
|
|
||||||
$library['metadataSettings'] = isset($library['metadataSettings']) ?
|
|
||||||
H5PMetadata::boolifyAndEncodeSettings($library['metadataSettings']) :
|
|
||||||
NULL;
|
|
||||||
|
|
||||||
// Save/update library.
|
// Save/update library.
|
||||||
|
$library['libraryId'] = $this->h5pF->getLibraryId($library['machineName'], $library['majorVersion'], $library['minorVersion']);
|
||||||
$this->h5pF->saveLibraryData($library, $library['libraryId'] === FALSE);
|
$this->h5pF->saveLibraryData($library, $library['libraryId'] === FALSE);
|
||||||
|
|
||||||
// Need to decode it again, since it is served from here.
|
|
||||||
$library['metadataSettings'] = json_decode($library['metadataSettings']);
|
|
||||||
|
|
||||||
$library['path'] = 'development/' . $contents[$i];
|
$library['path'] = 'development/' . $contents[$i];
|
||||||
$this->libraries[H5PDevelopment::libraryToString($library['machineName'], $library['majorVersion'], $library['minorVersion'])] = $library;
|
$this->libraries[H5PDevelopment::libraryToString($library['machineName'], $library['majorVersion'], $library['minorVersion'])] = $library;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,18 +22,18 @@ interface H5PFileStorage {
|
||||||
*
|
*
|
||||||
* @param string $source
|
* @param string $source
|
||||||
* Path on file system to content directory.
|
* Path on file system to content directory.
|
||||||
* @param array $content
|
* @param int $id
|
||||||
* Content properties
|
* What makes this content unique.
|
||||||
*/
|
*/
|
||||||
public function saveContent($source, $content);
|
public function saveContent($source, $id);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remove content folder.
|
* Remove content folder.
|
||||||
*
|
*
|
||||||
* @param array $content
|
* @param int $id
|
||||||
* Content properties
|
* Content identifier
|
||||||
*/
|
*/
|
||||||
public function deleteContent($content);
|
public function deleteContent($id);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a stored copy of the content folder.
|
* Creates a stored copy of the content folder.
|
||||||
|
|
@ -90,14 +90,6 @@ interface H5PFileStorage {
|
||||||
*/
|
*/
|
||||||
public function deleteExport($filename);
|
public function deleteExport($filename);
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if the given export file exists
|
|
||||||
*
|
|
||||||
* @param string $filename
|
|
||||||
* @return boolean
|
|
||||||
*/
|
|
||||||
public function hasExport($filename);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Will concatenate all JavaScrips and Stylesheets into two files in order
|
* Will concatenate all JavaScrips and Stylesheets into two files in order
|
||||||
* to improve page performance.
|
* to improve page performance.
|
||||||
|
|
@ -139,7 +131,7 @@ interface H5PFileStorage {
|
||||||
* The files must be marked as temporary until the content form is saved.
|
* The files must be marked as temporary until the content form is saved.
|
||||||
*
|
*
|
||||||
* @param \H5peditorFile $file
|
* @param \H5peditorFile $file
|
||||||
* @param int $contentId
|
* @param int $contentid
|
||||||
*/
|
*/
|
||||||
public function saveFile($file, $contentId);
|
public function saveFile($file, $contentId);
|
||||||
|
|
||||||
|
|
@ -148,22 +140,11 @@ interface H5PFileStorage {
|
||||||
* Used when copy pasting content in H5P.
|
* Used when copy pasting content in H5P.
|
||||||
*
|
*
|
||||||
* @param string $file path + name
|
* @param string $file path + name
|
||||||
* @param string|int $fromId Content ID or 'editor' string
|
* @param string|int $fromid Content ID or 'editor' string
|
||||||
* @param int $toId Target Content ID
|
* @param int $toid Target Content ID
|
||||||
*/
|
*/
|
||||||
public function cloneContentFile($file, $fromId, $toId);
|
public function cloneContentFile($file, $fromId, $toId);
|
||||||
|
|
||||||
/**
|
|
||||||
* Copy a content from one directory to another. Defaults to cloning
|
|
||||||
* content from the current temporary upload folder to the editor path.
|
|
||||||
*
|
|
||||||
* @param string $source path to source directory
|
|
||||||
* @param string $contentId Id of content
|
|
||||||
*
|
|
||||||
* @return object Object containing h5p json and content json data
|
|
||||||
*/
|
|
||||||
public function moveContentDirectory($source, $contentId = NULL);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks to see if content has the given file.
|
* Checks to see if content has the given file.
|
||||||
* Used when saving content.
|
* Used when saving content.
|
||||||
|
|
@ -182,41 +163,4 @@ interface H5PFileStorage {
|
||||||
* @param int $contentId
|
* @param int $contentId
|
||||||
*/
|
*/
|
||||||
public function removeContentFile($file, $contentId);
|
public function removeContentFile($file, $contentId);
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if server setup has write permission to
|
|
||||||
* the required folders
|
|
||||||
*
|
|
||||||
* @return bool True if server has the proper write access
|
|
||||||
*/
|
|
||||||
public function hasWriteAccess();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if the library has a presave.js in the root folder
|
|
||||||
*
|
|
||||||
* @param string $libraryName
|
|
||||||
* @param string $developmentPath
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public function hasPresave($libraryName, $developmentPath = null);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if upgrades script exist for library.
|
|
||||||
*
|
|
||||||
* @param string $machineName
|
|
||||||
* @param int $majorVersion
|
|
||||||
* @param int $minorVersion
|
|
||||||
* @return string Relative path
|
|
||||||
*/
|
|
||||||
public function getUpgradeScript($machineName, $majorVersion, $minorVersion);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Store the given stream into the given file.
|
|
||||||
*
|
|
||||||
* @param string $path
|
|
||||||
* @param string $file
|
|
||||||
* @param resource $stream
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public function saveFileFromZip($path, $file, $stream);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,156 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* Utility class for handling metadata
|
|
||||||
*/
|
|
||||||
abstract class H5PMetadata {
|
|
||||||
|
|
||||||
private static $fields = array(
|
|
||||||
'title' => array(
|
|
||||||
'type' => 'text',
|
|
||||||
'maxLength' => 255
|
|
||||||
),
|
|
||||||
'a11yTitle' => array(
|
|
||||||
'type' => 'text',
|
|
||||||
'maxLength' => 255,
|
|
||||||
),
|
|
||||||
'authors' => array(
|
|
||||||
'type' => 'json'
|
|
||||||
),
|
|
||||||
'changes' => array(
|
|
||||||
'type' => 'json'
|
|
||||||
),
|
|
||||||
'source' => array(
|
|
||||||
'type' => 'text',
|
|
||||||
'maxLength' => 255
|
|
||||||
),
|
|
||||||
'license' => array(
|
|
||||||
'type' => 'text',
|
|
||||||
'maxLength' => 32
|
|
||||||
),
|
|
||||||
'licenseVersion' => array(
|
|
||||||
'type' => 'text',
|
|
||||||
'maxLength' => 10
|
|
||||||
),
|
|
||||||
'licenseExtras' => array(
|
|
||||||
'type' => 'text',
|
|
||||||
'maxLength' => 5000
|
|
||||||
),
|
|
||||||
'authorComments' => array(
|
|
||||||
'type' => 'text',
|
|
||||||
'maxLength' => 5000
|
|
||||||
),
|
|
||||||
'yearFrom' => array(
|
|
||||||
'type' => 'int'
|
|
||||||
),
|
|
||||||
'yearTo' => array(
|
|
||||||
'type' => 'int'
|
|
||||||
),
|
|
||||||
'defaultLanguage' => array(
|
|
||||||
'type' => 'text',
|
|
||||||
'maxLength' => 32,
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* JSON encode metadata
|
|
||||||
*
|
|
||||||
* @param object $content
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public static function toJSON($content) {
|
|
||||||
// Note: deliberatly creating JSON string "manually" to improve performance
|
|
||||||
return
|
|
||||||
'{"title":' . (isset($content->title) ? json_encode($content->title) : 'null') .
|
|
||||||
',"a11yTitle":' . (isset($content->a11y_title) ? $content->a11y_title : 'null') .
|
|
||||||
',"authors":' . (isset($content->authors) ? $content->authors : 'null') .
|
|
||||||
',"source":' . (isset($content->source) ? '"' . $content->source . '"' : 'null') .
|
|
||||||
',"license":' . (isset($content->license) ? '"' . $content->license . '"' : 'null') .
|
|
||||||
',"licenseVersion":' . (isset($content->license_version) ? '"' . $content->license_version . '"' : 'null') .
|
|
||||||
',"licenseExtras":' . (isset($content->license_extras) ? json_encode($content->license_extras) : 'null') .
|
|
||||||
',"yearFrom":' . (isset($content->year_from) ? $content->year_from : 'null') .
|
|
||||||
',"yearTo":' . (isset($content->year_to) ? $content->year_to : 'null') .
|
|
||||||
',"changes":' . (isset($content->changes) ? $content->changes : 'null') .
|
|
||||||
',"defaultLanguage":' . (isset($content->default_language) ? '"' . $content->default_language . '"' : 'null') .
|
|
||||||
',"authorComments":' . (isset($content->author_comments) ? json_encode($content->author_comments) : 'null') . '}';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Make the metadata into an associative array keyed by the property names
|
|
||||||
* @param mixed $metadata Array or object containing metadata
|
|
||||||
* @param bool $include_title
|
|
||||||
* @param bool $include_missing For metadata fields not being set, skip 'em.
|
|
||||||
* Relevant for content upgrade
|
|
||||||
* @param array $types
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
public static function toDBArray($metadata, $include_title = true, $include_missing = true, &$types = array()) {
|
|
||||||
$fields = array();
|
|
||||||
|
|
||||||
if (!is_array($metadata)) {
|
|
||||||
$metadata = (array) $metadata;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (self::$fields as $key => $config) {
|
|
||||||
|
|
||||||
// Ignore title?
|
|
||||||
if ($key === 'title' && !$include_title) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
$exists = array_key_exists($key, $metadata);
|
|
||||||
|
|
||||||
// Don't include missing fields
|
|
||||||
if (!$include_missing && !$exists) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
$value = $exists ? $metadata[$key] : null;
|
|
||||||
|
|
||||||
// lowerCamelCase to snake_case
|
|
||||||
$db_field_name = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $key));
|
|
||||||
|
|
||||||
switch ($config['type']) {
|
|
||||||
case 'text':
|
|
||||||
if ($value !== null && strlen($value) > $config['maxLength']) {
|
|
||||||
$value = mb_substr($value, 0, $config['maxLength']);
|
|
||||||
}
|
|
||||||
$types[] = '%s';
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'int':
|
|
||||||
$value = ($value !== null) ? intval($value) : null;
|
|
||||||
$types[] = '%d';
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'json':
|
|
||||||
$value = ($value !== null) ? json_encode($value) : null;
|
|
||||||
$types[] = '%s';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
$fields[$db_field_name] = $value;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $fields;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The metadataSettings field in libraryJson uses 1 for true and 0 for false.
|
|
||||||
* Here we are converting these to booleans, and also doing JSON encoding.
|
|
||||||
* This is invoked before the library data is beeing inserted/updated to DB.
|
|
||||||
*
|
|
||||||
* @param array $metadataSettings
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public static function boolifyAndEncodeSettings($metadataSettings) {
|
|
||||||
// Convert metadataSettings values to boolean
|
|
||||||
if (isset($metadataSettings['disable'])) {
|
|
||||||
$metadataSettings['disable'] = $metadataSettings['disable'] === 1;
|
|
||||||
}
|
|
||||||
if (isset($metadataSettings['disableExtraTitleField'])) {
|
|
||||||
$metadataSettings['disableExtraTitleField'] = $metadataSettings['disableExtraTitleField'] === 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return json_encode($metadataSettings);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
2484
h5p.classes.php
2484
h5p.classes.php
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
|
|
@ -0,0 +1,26 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
|
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
|
width="36px" height="36px" viewBox="0 0 36 36" enable-background="new 0 0 36 36" xml:space="preserve">
|
||||||
|
<g>
|
||||||
|
<path fill="#FFFFFF" d="M0.126,13.306h3.07l0.365,3.476h3.354L6.55,13.306h3.083l1.044,9.934H7.594l-0.422-4.018H3.818L4.24,23.24
|
||||||
|
H1.17L0.126,13.306z"/>
|
||||||
|
<path fill="#FFFFFF" d="M27.738,13.306h5.103c1.111,0,1.916,0.264,2.414,0.793c0.498,0.529,0.696,1.281,0.593,2.257
|
||||||
|
c-0.105,1.003-0.489,1.787-1.152,2.351c-0.662,0.565-1.613,0.847-2.85,0.847h-1.681l-0.387,3.686h-3.083L27.738,13.306z
|
||||||
|
M30.376,17.541h0.752c0.592,0,1.018-0.103,1.279-0.308c0.261-0.205,0.408-0.469,0.442-0.789c0.033-0.312-0.043-0.576-0.228-0.793
|
||||||
|
c-0.185-0.217-0.564-0.325-1.138-0.325h-0.874L30.376,17.541z"/>
|
||||||
|
<g>
|
||||||
|
<polygon fill="#E24E26" points="12.431,25.515 11.035,9.851 26.38,9.851 24.982,25.512 18.698,27.254 "/>
|
||||||
|
<polygon fill="#F06529" points="18.707,25.923 23.785,24.515 24.98,11.132 18.707,11.132 "/>
|
||||||
|
<polygon fill="#EAEAEA" points="18.707,16.941 16.165,16.941 15.99,14.974 18.707,14.974 18.707,13.053 18.701,13.053
|
||||||
|
13.89,13.053 13.936,13.568 14.408,18.862 18.707,18.862 "/>
|
||||||
|
<polygon fill="#EAEAEA" points="18.707,21.93 18.699,21.933 16.56,21.355 16.423,19.823 15.383,19.823 14.494,19.823
|
||||||
|
14.763,22.839 18.699,23.932 18.707,23.929 "/>
|
||||||
|
<polygon fill="#FFFFFF" points="18.701,16.941 18.701,18.862 21.066,18.862 20.843,21.354 18.701,21.932 18.701,23.931
|
||||||
|
22.639,22.839 22.668,22.514 23.119,17.457 23.166,16.941 22.649,16.941 "/>
|
||||||
|
<polygon fill="#FFFFFF" points="18.701,13.053 18.701,14.246 18.701,14.969 18.701,14.974 23.335,14.974 23.335,14.974
|
||||||
|
23.341,14.974 23.38,14.542 23.467,13.568 23.513,13.053 "/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.7 KiB |
|
|
@ -0,0 +1,19 @@
|
||||||
|
(function ($) {
|
||||||
|
$(document).ready(function () {
|
||||||
|
var $inputs = $('.h5p-action-bar-settings input');
|
||||||
|
var $frame = $inputs.filter('input[name="frame"], input[name="h5p_frame"]');
|
||||||
|
var $others = $inputs.filter(':not(input[name="frame"], input[name="h5p_frame"])');
|
||||||
|
|
||||||
|
var toggle = function () {
|
||||||
|
if ($frame.is(':checked')) {
|
||||||
|
$others.attr('disabled', false);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$others.attr('disabled', true);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
$frame.change(toggle);
|
||||||
|
toggle();
|
||||||
|
});
|
||||||
|
})(H5P.jQuery);
|
||||||
|
|
@ -1,100 +0,0 @@
|
||||||
/**
|
|
||||||
* @class
|
|
||||||
* @augments H5P.EventDispatcher
|
|
||||||
* @param {Object} displayOptions
|
|
||||||
* @param {boolean} displayOptions.export Triggers the display of the 'Download' button
|
|
||||||
* @param {boolean} displayOptions.copyright Triggers the display of the 'Copyright' button
|
|
||||||
* @param {boolean} displayOptions.embed Triggers the display of the 'Embed' button
|
|
||||||
* @param {boolean} displayOptions.icon Triggers the display of the 'H5P icon' link
|
|
||||||
*/
|
|
||||||
H5P.ActionBar = (function ($, EventDispatcher) {
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
function ActionBar(displayOptions) {
|
|
||||||
EventDispatcher.call(this);
|
|
||||||
|
|
||||||
/** @alias H5P.ActionBar# */
|
|
||||||
var self = this;
|
|
||||||
|
|
||||||
var hasActions = false;
|
|
||||||
|
|
||||||
// Create action bar
|
|
||||||
var $actions = H5P.jQuery('<ul class="h5p-actions"></ul>');
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Helper for creating action bar buttons.
|
|
||||||
*
|
|
||||||
* @private
|
|
||||||
* @param {string} type
|
|
||||||
* @param {string} customClass Instead of type class
|
|
||||||
*/
|
|
||||||
var addActionButton = function (type, customClass) {
|
|
||||||
/**
|
|
||||||
* Handles selection of action
|
|
||||||
*/
|
|
||||||
var handler = function () {
|
|
||||||
self.trigger(type);
|
|
||||||
};
|
|
||||||
H5P.jQuery('<li/>', {
|
|
||||||
'class': 'h5p-button h5p-noselect h5p-' + (customClass ? customClass : type),
|
|
||||||
role: 'button',
|
|
||||||
tabindex: 0,
|
|
||||||
title: H5P.t(type + 'Description'),
|
|
||||||
html: H5P.t(type),
|
|
||||||
on: {
|
|
||||||
click: handler,
|
|
||||||
keypress: function (e) {
|
|
||||||
if (e.which === 32) {
|
|
||||||
handler();
|
|
||||||
e.preventDefault(); // (since return false will block other inputs)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
appendTo: $actions
|
|
||||||
});
|
|
||||||
|
|
||||||
hasActions = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
// Register action bar buttons
|
|
||||||
if (displayOptions.export || displayOptions.copy) {
|
|
||||||
// Add export button
|
|
||||||
addActionButton('reuse', 'export');
|
|
||||||
}
|
|
||||||
if (displayOptions.copyright) {
|
|
||||||
addActionButton('copyrights');
|
|
||||||
}
|
|
||||||
if (displayOptions.embed) {
|
|
||||||
addActionButton('embed');
|
|
||||||
}
|
|
||||||
if (displayOptions.icon) {
|
|
||||||
// Add about H5P button icon
|
|
||||||
H5P.jQuery('<li><a class="h5p-link" href="http://h5p.org" target="_blank" title="' + H5P.t('h5pDescription') + '"></a></li>').appendTo($actions);
|
|
||||||
hasActions = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a reference to the dom element
|
|
||||||
*
|
|
||||||
* @return {H5P.jQuery}
|
|
||||||
*/
|
|
||||||
self.getDOMElement = function () {
|
|
||||||
return $actions;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Does the actionbar contain actions?
|
|
||||||
*
|
|
||||||
* @return {Boolean}
|
|
||||||
*/
|
|
||||||
self.hasActions = function () {
|
|
||||||
return hasActions;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
ActionBar.prototype = Object.create(EventDispatcher.prototype);
|
|
||||||
ActionBar.prototype.constructor = ActionBar;
|
|
||||||
|
|
||||||
return ActionBar;
|
|
||||||
|
|
||||||
})(H5P.jQuery, H5P.EventDispatcher);
|
|
||||||
|
|
@ -11,10 +11,6 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
|
||||||
* @param [options.dialogText] Dialog text
|
* @param [options.dialogText] Dialog text
|
||||||
* @param [options.cancelText] Cancel dialog button text
|
* @param [options.cancelText] Cancel dialog button text
|
||||||
* @param [options.confirmText] Confirm dialog button text
|
* @param [options.confirmText] Confirm dialog button text
|
||||||
* @param [options.hideCancel] Hide cancel button
|
|
||||||
* @param [options.hideExit] Hide exit button
|
|
||||||
* @param [options.skipRestoreFocus] Skip restoring focus when hiding the dialog
|
|
||||||
* @param [options.classes] Extra classes for popup
|
|
||||||
* @constructor
|
* @constructor
|
||||||
*/
|
*/
|
||||||
function ConfirmationDialog(options) {
|
function ConfirmationDialog(options) {
|
||||||
|
|
@ -77,12 +73,6 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
|
||||||
// Create outer popup
|
// Create outer popup
|
||||||
var popup = document.createElement('div');
|
var popup = document.createElement('div');
|
||||||
popup.classList.add('h5p-confirmation-dialog-popup', 'hidden');
|
popup.classList.add('h5p-confirmation-dialog-popup', 'hidden');
|
||||||
if (options.classes) {
|
|
||||||
options.classes.forEach(function (popupClass) {
|
|
||||||
popup.classList.add(popupClass);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
popup.setAttribute('role', 'dialog');
|
popup.setAttribute('role', 'dialog');
|
||||||
popup.setAttribute('aria-labelledby', 'h5p-confirmation-dialog-dialog-text-' + uniqueId);
|
popup.setAttribute('aria-labelledby', 'h5p-confirmation-dialog-dialog-text-' + uniqueId);
|
||||||
popupBackground.appendChild(popup);
|
popupBackground.appendChild(popup);
|
||||||
|
|
@ -128,8 +118,8 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
|
||||||
|
|
||||||
// Confirm button
|
// Confirm button
|
||||||
var confirmButton = document.createElement('button');
|
var confirmButton = document.createElement('button');
|
||||||
confirmButton.classList.add('h5p-core-button');
|
confirmButton.classList.add('h5p-core-button',
|
||||||
confirmButton.classList.add('h5p-confirmation-dialog-confirm-button');
|
'h5p-confirmation-dialog-confirm-button');
|
||||||
confirmButton.textContent = options.confirmText;
|
confirmButton.textContent = options.confirmText;
|
||||||
|
|
||||||
// Exit button
|
// Exit button
|
||||||
|
|
@ -149,14 +139,7 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
|
||||||
flowTo(confirmButton, e);
|
flowTo(confirmButton, e);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!options.hideCancel) {
|
|
||||||
buttons.appendChild(cancelButton);
|
buttons.appendChild(cancelButton);
|
||||||
}
|
|
||||||
else {
|
|
||||||
// Center buttons
|
|
||||||
buttons.classList.add('center');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Confirm handler
|
// Confirm handler
|
||||||
confirmButton.addEventListener('click', dialogConfirmed);
|
confirmButton.addEventListener('click', dialogConfirmed);
|
||||||
|
|
@ -165,8 +148,7 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
|
||||||
dialogConfirmed(e);
|
dialogConfirmed(e);
|
||||||
}
|
}
|
||||||
else if (e.which === 9 && !e.shiftKey) { // Tab
|
else if (e.which === 9 && !e.shiftKey) { // Tab
|
||||||
const nextButton = !options.hideCancel ? cancelButton : confirmButton;
|
flowTo(cancelButton, e);
|
||||||
flowTo(nextButton, e);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
buttons.appendChild(confirmButton);
|
buttons.appendChild(confirmButton);
|
||||||
|
|
@ -178,9 +160,7 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
|
||||||
dialogCanceled(e);
|
dialogCanceled(e);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if (!options.hideExit) {
|
|
||||||
popup.appendChild(exitButton);
|
popup.appendChild(exitButton);
|
||||||
}
|
|
||||||
|
|
||||||
// Wrapper element
|
// Wrapper element
|
||||||
var wrapperElement;
|
var wrapperElement;
|
||||||
|
|
@ -292,14 +272,10 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
|
||||||
*/
|
*/
|
||||||
var fitToContainer = function (offsetTop) {
|
var fitToContainer = function (offsetTop) {
|
||||||
var popupOffsetTop = parseInt(popup.style.top, 10);
|
var popupOffsetTop = parseInt(popup.style.top, 10);
|
||||||
if (offsetTop !== undefined) {
|
if (offsetTop) {
|
||||||
popupOffsetTop = offsetTop;
|
popupOffsetTop = offsetTop;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!popupOffsetTop) {
|
|
||||||
popupOffsetTop = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Overflows height
|
// Overflows height
|
||||||
if (popupOffsetTop + popup.offsetHeight > wrapperElement.offsetHeight) {
|
if (popupOffsetTop + popup.offsetHeight > wrapperElement.offsetHeight) {
|
||||||
popupOffsetTop = wrapperElement.offsetHeight - popup.offsetHeight - shadowOffset;
|
popupOffsetTop = wrapperElement.offsetHeight - popup.offsetHeight - shadowOffset;
|
||||||
|
|
@ -339,7 +315,7 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
|
||||||
if (resizeIFrame && options.instance) {
|
if (resizeIFrame && options.instance) {
|
||||||
var minHeight = parseInt(popup.offsetHeight, 10) +
|
var minHeight = parseInt(popup.offsetHeight, 10) +
|
||||||
exitButtonOffset + (2 * shadowOffset);
|
exitButtonOffset + (2 * shadowOffset);
|
||||||
self.setViewPortMinimumHeight(minHeight);
|
wrapperElement.style.minHeight = minHeight + 'px';
|
||||||
options.instance.trigger('resize');
|
options.instance.trigger('resize');
|
||||||
resizeIFrame = false;
|
resizeIFrame = false;
|
||||||
}
|
}
|
||||||
|
|
@ -359,45 +335,15 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
|
||||||
|
|
||||||
// Restore focus
|
// Restore focus
|
||||||
stopCapturingFocus();
|
stopCapturingFocus();
|
||||||
if (!options.skipRestoreFocus) {
|
|
||||||
previouslyFocused.focus();
|
previouslyFocused.focus();
|
||||||
}
|
|
||||||
restoreUnderlay();
|
restoreUnderlay();
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
popupBackground.classList.add('hidden');
|
popupBackground.classList.add('hidden');
|
||||||
wrapperElement.removeChild(popupBackground);
|
wrapperElement.removeChild(popupBackground);
|
||||||
self.setViewPortMinimumHeight(null);
|
|
||||||
}, 100);
|
}, 100);
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve element
|
|
||||||
*
|
|
||||||
* @return {HTMLElement}
|
|
||||||
*/
|
|
||||||
this.getElement = function () {
|
|
||||||
return popup;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get previously focused element
|
|
||||||
* @return {HTMLElement}
|
|
||||||
*/
|
|
||||||
this.getPreviouslyFocused = function () {
|
|
||||||
return previouslyFocused;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the minimum height of the view port
|
|
||||||
*
|
|
||||||
* @param {number|null} minHeight
|
|
||||||
*/
|
|
||||||
this.setViewPortMinimumHeight = function (minHeight) {
|
|
||||||
var container = document.querySelector('.h5p-container') || document.body;
|
|
||||||
container.style.minHeight = (typeof minHeight === 'number') ? (minHeight + 'px') : minHeight;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfirmationDialog.prototype = Object.create(EventDispatcher.prototype);
|
ConfirmationDialog.prototype = Object.create(EventDispatcher.prototype);
|
||||||
|
|
|
||||||
|
|
@ -3,17 +3,10 @@
|
||||||
*
|
*
|
||||||
* Functions here may be overridable by the libraries. In special cases,
|
* Functions here may be overridable by the libraries. In special cases,
|
||||||
* it is also possible to override H5P.ContentType on a global level.
|
* it is also possible to override H5P.ContentType on a global level.
|
||||||
*
|
* */
|
||||||
* NOTE that this doesn't actually 'extend' the event dispatcher but instead
|
H5P.ContentType = function (isRootLibrary, library) {
|
||||||
* it creates a single instance which all content types shares as their base
|
|
||||||
* prototype. (in some cases this may be the root of strange event behavior)
|
|
||||||
*
|
|
||||||
* @class
|
|
||||||
* @augments H5P.EventDispatcher
|
|
||||||
*/
|
|
||||||
H5P.ContentType = function (isRootLibrary) {
|
|
||||||
|
|
||||||
function ContentType() {}
|
function ContentType() {};
|
||||||
|
|
||||||
// Inherit from EventDispatcher.
|
// Inherit from EventDispatcher.
|
||||||
ContentType.prototype = new H5P.EventDispatcher();
|
ContentType.prototype = new H5P.EventDispatcher();
|
||||||
|
|
@ -22,6 +15,7 @@ H5P.ContentType = function (isRootLibrary) {
|
||||||
* Is library standalone or not? Not beeing standalone, means it is
|
* Is library standalone or not? Not beeing standalone, means it is
|
||||||
* included in another library
|
* included in another library
|
||||||
*
|
*
|
||||||
|
* @method isStandalone
|
||||||
* @return {Boolean}
|
* @return {Boolean}
|
||||||
*/
|
*/
|
||||||
ContentType.prototype.isRoot = function () {
|
ContentType.prototype.isRoot = function () {
|
||||||
|
|
@ -30,6 +24,7 @@ H5P.ContentType = function (isRootLibrary) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the file path of a file in the current library
|
* Returns the file path of a file in the current library
|
||||||
|
* @method getLibraryFilePath
|
||||||
* @param {string} filePath The path to the file relative to the library folder
|
* @param {string} filePath The path to the file relative to the library folder
|
||||||
* @return {string} The full path to the file
|
* @return {string} The full path to the file
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -25,28 +25,19 @@ H5P.ContentUpgradeProcess = (function (Version) {
|
||||||
}
|
}
|
||||||
|
|
||||||
self.loadLibrary = loadLibrary;
|
self.loadLibrary = loadLibrary;
|
||||||
self.upgrade(name, oldVersion, newVersion, params.params, params.metadata, function (err, upgradedParams, upgradedMetadata) {
|
self.upgrade(name, oldVersion, newVersion, params, function (err, result) {
|
||||||
if (err) {
|
if (err) {
|
||||||
err.id = id;
|
|
||||||
return done(err);
|
return done(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
done(null, JSON.stringify({params: upgradedParams, metadata: upgradedMetadata}));
|
done(null, JSON.stringify(params));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Run content upgrade.
|
|
||||||
*
|
*
|
||||||
* @public
|
|
||||||
* @param {string} name
|
|
||||||
* @param {Version} oldVersion
|
|
||||||
* @param {Version} newVersion
|
|
||||||
* @param {Object} params
|
|
||||||
* @param {Object} metadata
|
|
||||||
* @param {Function} done
|
|
||||||
*/
|
*/
|
||||||
ContentUpgradeProcess.prototype.upgrade = function (name, oldVersion, newVersion, params, metadata, done) {
|
ContentUpgradeProcess.prototype.upgrade = function (name, oldVersion, newVersion, params, done) {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
// Load library details and upgrade routines
|
// Load library details and upgrade routines
|
||||||
|
|
@ -54,15 +45,9 @@ H5P.ContentUpgradeProcess = (function (Version) {
|
||||||
if (err) {
|
if (err) {
|
||||||
return done(err);
|
return done(err);
|
||||||
}
|
}
|
||||||
if (library.semantics === null) {
|
|
||||||
return done({
|
|
||||||
type: 'libraryMissing',
|
|
||||||
library: library.name + ' ' + library.version.major + '.' + library.version.minor
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Run upgrade routines on params
|
// Run upgrade routines on params
|
||||||
self.processParams(library, oldVersion, newVersion, params, metadata, function (err, params, metadata) {
|
self.processParams(library, oldVersion, newVersion, params, function (err, params) {
|
||||||
if (err) {
|
if (err) {
|
||||||
return done(err);
|
return done(err);
|
||||||
}
|
}
|
||||||
|
|
@ -76,7 +61,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
|
||||||
next(err);
|
next(err);
|
||||||
});
|
});
|
||||||
}, function (err) {
|
}, function (err) {
|
||||||
done(err, params, metadata);
|
done(err, params);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
@ -92,7 +77,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
|
||||||
* @param {Object} params
|
* @param {Object} params
|
||||||
* @param {Function} next
|
* @param {Function} next
|
||||||
*/
|
*/
|
||||||
ContentUpgradeProcess.prototype.processParams = function (library, oldVersion, newVersion, params, metadata, next) {
|
ContentUpgradeProcess.prototype.processParams = function (library, oldVersion, newVersion, params, next) {
|
||||||
if (H5PUpgrades[library.name] === undefined) {
|
if (H5PUpgrades[library.name] === undefined) {
|
||||||
if (library.upgradesScript) {
|
if (library.upgradesScript) {
|
||||||
// Upgrades script should be loaded so the upgrades should be here.
|
// Upgrades script should be loaded so the upgrades should be here.
|
||||||
|
|
@ -103,7 +88,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// No upgrades script. Move on
|
// No upgrades script. Move on
|
||||||
return next(null, params, metadata);
|
return next(null, params);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Run upgrade hooks. Start by going through major versions
|
// Run upgrade hooks. Start by going through major versions
|
||||||
|
|
@ -125,19 +110,16 @@ H5P.ContentUpgradeProcess = (function (Version) {
|
||||||
var unnecessaryWrapper = (upgrade.contentUpgrade !== undefined ? upgrade.contentUpgrade : upgrade);
|
var unnecessaryWrapper = (upgrade.contentUpgrade !== undefined ? upgrade.contentUpgrade : upgrade);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
unnecessaryWrapper(params, function (err, upgradedParams, upgradedExtras) {
|
unnecessaryWrapper(params, function (err, upgradedParams) {
|
||||||
params = upgradedParams;
|
params = upgradedParams;
|
||||||
if (upgradedExtras && upgradedExtras.metadata) { // Optional
|
|
||||||
metadata = upgradedExtras.metadata;
|
|
||||||
}
|
|
||||||
nextMinor(err);
|
nextMinor(err);
|
||||||
}, {metadata: metadata});
|
});
|
||||||
}
|
}
|
||||||
catch (err) {
|
catch (err) {
|
||||||
if (console && console.error) {
|
if (console && console.log) {
|
||||||
console.error("Error", err.stack);
|
console.log("Error", err.stack);
|
||||||
console.error("Error", err.name);
|
console.log("Error", err.name);
|
||||||
console.error("Error", err.message);
|
console.log("Error", err.message);
|
||||||
}
|
}
|
||||||
next(err);
|
next(err);
|
||||||
}
|
}
|
||||||
|
|
@ -145,7 +127,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
|
||||||
}, nextMajor);
|
}, nextMajor);
|
||||||
}
|
}
|
||||||
}, function (err) {
|
}, function (err) {
|
||||||
next(err, params, metadata);
|
next(err, params);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -173,7 +155,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
|
||||||
// Look for available upgrades
|
// Look for available upgrades
|
||||||
var usedLib = params.library.split(' ', 2);
|
var usedLib = params.library.split(' ', 2);
|
||||||
for (var i = 0; i < field.options.length; i++) {
|
for (var i = 0; i < field.options.length; i++) {
|
||||||
var availableLib = (typeof field.options[i] === 'string') ? field.options[i].split(' ', 2) : field.options[i].name.split(' ', 2);
|
var availableLib = field.options[i].split(' ', 2);
|
||||||
if (availableLib[0] === usedLib[0]) {
|
if (availableLib[0] === usedLib[0]) {
|
||||||
if (availableLib[1] === usedLib[1]) {
|
if (availableLib[1] === usedLib[1]) {
|
||||||
return done(); // Same version
|
return done(); // Same version
|
||||||
|
|
@ -183,36 +165,24 @@ H5P.ContentUpgradeProcess = (function (Version) {
|
||||||
var usedVer = new Version(usedLib[1]);
|
var usedVer = new Version(usedLib[1]);
|
||||||
var availableVer = new Version(availableLib[1]);
|
var availableVer = new Version(availableLib[1]);
|
||||||
if (usedVer.major > availableVer.major || (usedVer.major === availableVer.major && usedVer.minor >= availableVer.minor)) {
|
if (usedVer.major > availableVer.major || (usedVer.major === availableVer.major && usedVer.minor >= availableVer.minor)) {
|
||||||
return done({
|
return done(); // Larger or same version that's available
|
||||||
type: 'errorTooHighVersion',
|
|
||||||
used: usedLib[0] + ' ' + usedVer,
|
|
||||||
supported: availableLib[0] + ' ' + availableVer
|
|
||||||
}); // Larger or same version that's available
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// A newer version is available, upgrade params
|
// A newer version is available, upgrade params
|
||||||
return self.upgrade(availableLib[0], usedVer, availableVer, params.params, params.metadata, function (err, upgradedParams, upgradedMetadata) {
|
return self.upgrade(availableLib[0], usedVer, availableVer, params.params, function (err, upgraded) {
|
||||||
if (!err) {
|
if (!err) {
|
||||||
params.library = availableLib[0] + ' ' + availableVer.major + '.' + availableVer.minor;
|
params.library = availableLib[0] + ' ' + availableVer.major + '.' + availableVer.minor;
|
||||||
params.params = upgradedParams;
|
params.params = upgraded;
|
||||||
if (upgradedMetadata) {
|
|
||||||
params.metadata = upgradedMetadata;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
done(err, params);
|
done(err, params);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
done();
|
||||||
// Content type was not supporte by the higher version
|
|
||||||
done({
|
|
||||||
type: 'errorNotSupported',
|
|
||||||
used: usedLib[0] + ' ' + usedVer
|
|
||||||
});
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'group':
|
case 'group':
|
||||||
if (field.fields.length === 1 && field.isSubContent !== true) {
|
if (field.fields.length === 1) {
|
||||||
// Single field to process, wrapper will be skipped
|
// Single field to process, wrapper will be skipped
|
||||||
self.processField(field.fields[0], params, function (err, upgradedParams) {
|
self.processField(field.fields[0], params, function (err, upgradedParams) {
|
||||||
if (upgradedParams) {
|
if (upgradedParams) {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
/* global importScripts */
|
|
||||||
var H5P = H5P || {};
|
var H5P = H5P || {};
|
||||||
importScripts('h5p-version.js', 'h5p-content-upgrade-process.js');
|
importScripts('h5p-version.js', 'h5p-content-upgrade-process.js');
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
/* global H5PAdminIntegration H5PUtils */
|
/*jshint -W083 */
|
||||||
|
|
||||||
(function ($, Version) {
|
(function ($, Version) {
|
||||||
var info, $log, $container, librariesCache = {}, scriptsCache = {};
|
var info, $container, librariesCache = {}, scriptsCache = {};
|
||||||
|
|
||||||
// Initialize
|
// Initialize
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
|
|
@ -9,9 +9,7 @@
|
||||||
info = H5PAdminIntegration.libraryInfo;
|
info = H5PAdminIntegration.libraryInfo;
|
||||||
|
|
||||||
// Get and reset container
|
// Get and reset container
|
||||||
const $wrapper = $('#h5p-admin-container').html('');
|
$container = $('#h5p-admin-container').html('<p>' + info.message + '</p>');
|
||||||
$log = $('<ul class="content-upgrade-log"></ul>').appendTo($wrapper);
|
|
||||||
$container = $('<div><p>' + info.message + '</p></div>').appendTo($wrapper);
|
|
||||||
|
|
||||||
// Make it possible to select version
|
// Make it possible to select version
|
||||||
var $version = $(getVersionSelect(info.versions)).appendTo($container);
|
var $version = $(getVersionSelect(info.versions)).appendTo($container);
|
||||||
|
|
@ -122,7 +120,9 @@
|
||||||
},
|
},
|
||||||
error: function (error) {
|
error: function (error) {
|
||||||
self.printError(error.err);
|
self.printError(error.err);
|
||||||
self.workDone(error.id, null, this);
|
|
||||||
|
// Stop everything
|
||||||
|
self.terminate();
|
||||||
},
|
},
|
||||||
loadLibrary: function (details) {
|
loadLibrary: function (details) {
|
||||||
var worker = this;
|
var worker = this;
|
||||||
|
|
@ -184,7 +184,7 @@
|
||||||
self.token = inData.token;
|
self.token = inData.token;
|
||||||
|
|
||||||
// Start processing
|
// Start processing
|
||||||
self.processBatch(inData.params, inData.skipped);
|
self.processBatch(inData.params);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -202,12 +202,11 @@
|
||||||
*
|
*
|
||||||
* @param {Object} parameters
|
* @param {Object} parameters
|
||||||
*/
|
*/
|
||||||
ContentUpgrade.prototype.processBatch = function (parameters, skipped) {
|
ContentUpgrade.prototype.processBatch = function (parameters) {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
// Track upgraded params
|
// Track upgraded params
|
||||||
self.upgraded = {};
|
self.upgraded = {};
|
||||||
self.skipped = skipped;
|
|
||||||
|
|
||||||
// Track current batch
|
// Track current batch
|
||||||
self.parameters = parameters;
|
self.parameters = parameters;
|
||||||
|
|
@ -277,7 +276,7 @@
|
||||||
}, function done(err, result) {
|
}, function done(err, result) {
|
||||||
if (err) {
|
if (err) {
|
||||||
self.printError(err);
|
self.printError(err);
|
||||||
result = null;
|
return ;
|
||||||
}
|
}
|
||||||
|
|
||||||
self.workDone(id, result);
|
self.workDone(id, result);
|
||||||
|
|
@ -292,12 +291,7 @@
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
self.working--;
|
self.working--;
|
||||||
if (result === null) {
|
|
||||||
self.skipped.push(id);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
self.upgraded[id] = result;
|
self.upgraded[id] = result;
|
||||||
}
|
|
||||||
|
|
||||||
// Update progress message
|
// Update progress message
|
||||||
self.throbber.setProgress(Math.round((info.total - self.left + self.current) / (info.total / 100)) + ' %');
|
self.throbber.setProgress(Math.round((info.total - self.left + self.current) / (info.total / 100)) + ' %');
|
||||||
|
|
@ -308,7 +302,6 @@
|
||||||
self.nextBatch({
|
self.nextBatch({
|
||||||
libraryId: self.version.libraryId,
|
libraryId: self.version.libraryId,
|
||||||
token: self.token,
|
token: self.token,
|
||||||
skipped: JSON.stringify(self.skipped),
|
|
||||||
params: JSON.stringify(self.upgraded)
|
params: JSON.stringify(self.upgraded)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -417,29 +410,14 @@
|
||||||
ContentUpgrade.prototype.printError = function (error) {
|
ContentUpgrade.prototype.printError = function (error) {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
switch (error.type) {
|
if (error.type === 'errorParamsBroken') {
|
||||||
case 'errorParamsBroken':
|
|
||||||
error = info.errorContent.replace('%id', error.id) + ' ' + info.errorParamsBroken;
|
error = info.errorContent.replace('%id', error.id) + ' ' + info.errorParamsBroken;
|
||||||
break;
|
}
|
||||||
|
else if (error.type === 'scriptMissing') {
|
||||||
case 'libraryMissing':
|
|
||||||
error = info.errorLibrary.replace('%lib', error.library);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'scriptMissing':
|
|
||||||
error = info.errorScript.replace('%lib', error.library);
|
error = info.errorScript.replace('%lib', error.library);
|
||||||
break;
|
|
||||||
|
|
||||||
case 'errorTooHighVersion':
|
|
||||||
error = info.errorContent.replace('%id', error.id) + ' ' + info.errorTooHighVersion.replace('%used', error.used).replace('%supported', error.supported);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'errorNotSupported':
|
|
||||||
error = info.errorContent.replace('%id', error.id) + ' ' + info.errorNotSupported.replace('%used', error.used);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$('<li>' + info.error + '<br/>' + error + '</li>').appendTo($log);
|
self.setStatus('<p>' + info.error + '<br/>' + error + '</p>');
|
||||||
};
|
};
|
||||||
|
|
||||||
})(H5P.jQuery, H5P.Version);
|
})(H5P.jQuery, H5P.Version);
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
/* global H5PUtils */
|
|
||||||
var H5PDataView = (function ($) {
|
var H5PDataView = (function ($) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -53,18 +52,8 @@ var H5PDataView = (function ($) {
|
||||||
self.filterOn = [];
|
self.filterOn = [];
|
||||||
self.facets = {};
|
self.facets = {};
|
||||||
|
|
||||||
// Index of column with author name; could be made more general by passing database column names and checking for position
|
|
||||||
self.columnIdAuthor = 2;
|
|
||||||
|
|
||||||
// Future option: Create more general solution for filter presets
|
|
||||||
if (H5PIntegration.user && parseInt(H5PIntegration.user.canToggleViewOthersH5PContents) === 1) {
|
|
||||||
self.updateTable([]);
|
|
||||||
self.filterByFacet(self.columnIdAuthor, H5PIntegration.user.id, H5PIntegration.user.name || '');
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
self.loadData();
|
self.loadData();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load data from source URL.
|
* Load data from source URL.
|
||||||
|
|
@ -161,12 +150,6 @@ var H5PDataView = (function ($) {
|
||||||
// Add filters
|
// Add filters
|
||||||
self.addFilters();
|
self.addFilters();
|
||||||
|
|
||||||
// Add toggler for others' content
|
|
||||||
if (H5PIntegration.user && parseInt(H5PIntegration.user.canToggleViewOthersH5PContents) > 0) {
|
|
||||||
// canToggleViewOthersH5PContents = 1 is setting for only showing current user's contents
|
|
||||||
self.addOthersContentToggler(parseInt(H5PIntegration.user.canToggleViewOthersH5PContents) === 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add facets
|
// Add facets
|
||||||
self.$facets = $('<div/>', {
|
self.$facets = $('<div/>', {
|
||||||
'class': 'h5p-facet-wrapper',
|
'class': 'h5p-facet-wrapper',
|
||||||
|
|
@ -215,6 +198,7 @@ var H5PDataView = (function ($) {
|
||||||
* @param number col ID of column
|
* @param number col ID of column
|
||||||
*/
|
*/
|
||||||
H5PDataView.prototype.createFacets = function (input, col) {
|
H5PDataView.prototype.createFacets = function (input, col) {
|
||||||
|
var self = this;
|
||||||
var facets = '';
|
var facets = '';
|
||||||
|
|
||||||
if (input instanceof Array) {
|
if (input instanceof Array) {
|
||||||
|
|
@ -262,17 +246,13 @@ var H5PDataView = (function ($) {
|
||||||
appendTo: self.$facets,
|
appendTo: self.$facets,
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Callback for removing filter.
|
* Callback for removing filter.
|
||||||
*
|
*
|
||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
var remove = function () {
|
var remove = function () {
|
||||||
// Uncheck toggler for others' H5P contents
|
|
||||||
if ( self.$othersContentToggler && self.facets.hasOwnProperty( self.columnIdAuthor ) ) {
|
|
||||||
self.$othersContentToggler.prop('checked', false );
|
|
||||||
}
|
|
||||||
|
|
||||||
self.facets[col].$tag.remove();
|
self.facets[col].$tag.remove();
|
||||||
delete self.facets[col];
|
delete self.facets[col];
|
||||||
self.loadData();
|
self.loadData();
|
||||||
|
|
@ -394,49 +374,5 @@ var H5PDataView = (function ($) {
|
||||||
}).appendTo(self.$container);
|
}).appendTo(self.$container);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Add toggle for others' H5P content.
|
|
||||||
* @param {boolean} [checked=false] Initial check setting.
|
|
||||||
*/
|
|
||||||
H5PDataView.prototype.addOthersContentToggler = function (checked) {
|
|
||||||
var self = this;
|
|
||||||
|
|
||||||
checked = (typeof checked === 'undefined') ? false : checked;
|
|
||||||
|
|
||||||
// Checkbox
|
|
||||||
this.$othersContentToggler = $('<input/>', {
|
|
||||||
type: 'checkbox',
|
|
||||||
'class': 'h5p-others-contents-toggler',
|
|
||||||
'id': 'h5p-others-contents-toggler',
|
|
||||||
'checked': checked,
|
|
||||||
'click': function () {
|
|
||||||
if ( this.checked ) {
|
|
||||||
// Add filter on current user
|
|
||||||
self.filterByFacet( self.columnIdAuthor, H5PIntegration.user.id, H5PIntegration.user.name );
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// Remove facet indicator and reload full data view
|
|
||||||
if ( self.facets.hasOwnProperty( self.columnIdAuthor ) && self.facets[self.columnIdAuthor].$tag ) {
|
|
||||||
self.facets[self.columnIdAuthor].$tag.remove();
|
|
||||||
}
|
|
||||||
delete self.facets[self.columnIdAuthor];
|
|
||||||
self.loadData();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Label
|
|
||||||
var $label = $('<label>', {
|
|
||||||
'class': 'h5p-others-contents-toggler-label',
|
|
||||||
'text': this.l10n.showOwnContentOnly,
|
|
||||||
'for': 'h5p-others-contents-toggler'
|
|
||||||
}).prepend(this.$othersContentToggler);
|
|
||||||
|
|
||||||
$('<div>', {
|
|
||||||
'class': 'h5p-others-contents-toggler-wrapper'
|
|
||||||
}).append($label)
|
|
||||||
.appendTo(this.$container);
|
|
||||||
};
|
|
||||||
|
|
||||||
return H5PDataView;
|
return H5PDataView;
|
||||||
})(H5P.jQuery);
|
})(H5P.jQuery);
|
||||||
|
|
|
||||||
|
|
@ -1,54 +0,0 @@
|
||||||
/**
|
|
||||||
* Utility that makes it possible to hide fields when a checkbox is unchecked
|
|
||||||
*/
|
|
||||||
(function ($) {
|
|
||||||
function setupHiding() {
|
|
||||||
var $toggler = $(this);
|
|
||||||
|
|
||||||
// Getting the field which should be hidden:
|
|
||||||
var $subject = $($toggler.data('h5p-visibility-subject-selector'));
|
|
||||||
|
|
||||||
var toggle = function () {
|
|
||||||
$subject.toggle($toggler.is(':checked'));
|
|
||||||
};
|
|
||||||
|
|
||||||
$toggler.change(toggle);
|
|
||||||
toggle();
|
|
||||||
}
|
|
||||||
|
|
||||||
function setupRevealing() {
|
|
||||||
var $button = $(this);
|
|
||||||
|
|
||||||
// Getting the field which should have the value:
|
|
||||||
var $input = $('#' + $button.data('control'));
|
|
||||||
|
|
||||||
if (!$input.data('value')) {
|
|
||||||
$button.remove();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Setup button action
|
|
||||||
var revealed = false;
|
|
||||||
var text = $button.html();
|
|
||||||
$button.click(function () {
|
|
||||||
if (revealed) {
|
|
||||||
$input.val('');
|
|
||||||
$button.html(text);
|
|
||||||
revealed = false;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$input.val($input.data('value'));
|
|
||||||
$button.html($button.data('hide'));
|
|
||||||
revealed = true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
$(document).ready(function () {
|
|
||||||
// Get the checkboxes making other fields being hidden:
|
|
||||||
$('.h5p-visibility-toggler').each(setupHiding);
|
|
||||||
|
|
||||||
// Get the buttons making other fields have hidden values:
|
|
||||||
$('.h5p-reveal-value').each(setupRevealing);
|
|
||||||
});
|
|
||||||
})(H5P.jQuery);
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
var H5P = window.H5P = window.H5P || {};
|
var H5P = H5P || {};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Event class for the EventDispatcher.
|
* The Event class for the EventDispatcher.
|
||||||
|
|
@ -10,7 +10,7 @@ var H5P = window.H5P = window.H5P || {};
|
||||||
* @param {boolean} [extras.bubbles]
|
* @param {boolean} [extras.bubbles]
|
||||||
* @param {boolean} [extras.external]
|
* @param {boolean} [extras.external]
|
||||||
*/
|
*/
|
||||||
H5P.Event = function (type, data, extras) {
|
H5P.Event = function(type, data, extras) {
|
||||||
this.type = type;
|
this.type = type;
|
||||||
this.data = data;
|
this.data = data;
|
||||||
var bubbles = false;
|
var bubbles = false;
|
||||||
|
|
@ -34,7 +34,7 @@ H5P.Event = function (type, data, extras) {
|
||||||
/**
|
/**
|
||||||
* Prevent this event from bubbling up to parent
|
* Prevent this event from bubbling up to parent
|
||||||
*/
|
*/
|
||||||
this.preventBubbling = function () {
|
this.preventBubbling = function() {
|
||||||
bubbles = false;
|
bubbles = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -44,7 +44,7 @@ H5P.Event = function (type, data, extras) {
|
||||||
* @returns {boolean}
|
* @returns {boolean}
|
||||||
* true if bubbling false otherwise
|
* true if bubbling false otherwise
|
||||||
*/
|
*/
|
||||||
this.getBubbles = function () {
|
this.getBubbles = function() {
|
||||||
return bubbles;
|
return bubbles;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -54,7 +54,7 @@ H5P.Event = function (type, data, extras) {
|
||||||
* @returns {boolean}
|
* @returns {boolean}
|
||||||
* true if external and not already scheduled, otherwise false
|
* true if external and not already scheduled, otherwise false
|
||||||
*/
|
*/
|
||||||
this.scheduleForExternal = function () {
|
this.scheduleForExternal = function() {
|
||||||
if (external && !scheduledForExternal) {
|
if (external && !scheduledForExternal) {
|
||||||
scheduledForExternal = true;
|
scheduledForExternal = true;
|
||||||
return true;
|
return true;
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,5 +1,4 @@
|
||||||
/* global H5PAdminIntegration H5PUtils */
|
var H5PLibraryDetails= H5PLibraryDetails || {};
|
||||||
var H5PLibraryDetails = H5PLibraryDetails || {};
|
|
||||||
|
|
||||||
(function ($) {
|
(function ($) {
|
||||||
|
|
||||||
|
|
@ -69,7 +68,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
|
||||||
*/
|
*/
|
||||||
H5PLibraryDetails.createContentTable = function () {
|
H5PLibraryDetails.createContentTable = function () {
|
||||||
// Remove it if it exists:
|
// Remove it if it exists:
|
||||||
if (H5PLibraryDetails.$contentTable) {
|
if(H5PLibraryDetails.$contentTable) {
|
||||||
H5PLibraryDetails.$contentTable.remove();
|
H5PLibraryDetails.$contentTable.remove();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -78,10 +77,10 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
|
||||||
var i = (H5PLibraryDetails.currentPage*H5PLibraryDetails.PAGER_SIZE);
|
var i = (H5PLibraryDetails.currentPage*H5PLibraryDetails.PAGER_SIZE);
|
||||||
var lastIndex = (i+H5PLibraryDetails.PAGER_SIZE);
|
var lastIndex = (i+H5PLibraryDetails.PAGER_SIZE);
|
||||||
|
|
||||||
if (lastIndex > H5PLibraryDetails.currentContent.length) {
|
if(lastIndex > H5PLibraryDetails.currentContent.length) {
|
||||||
lastIndex = H5PLibraryDetails.currentContent.length;
|
lastIndex = H5PLibraryDetails.currentContent.length;
|
||||||
}
|
}
|
||||||
for (; i<lastIndex; i++) {
|
for(; i<lastIndex; i++) {
|
||||||
var content = H5PLibraryDetails.currentContent[i];
|
var content = H5PLibraryDetails.currentContent[i];
|
||||||
H5PLibraryDetails.$contentTable.append(H5PUtils.createTableRow(['<a href="' + content.url + '">' + content.title + '</a>']));
|
H5PLibraryDetails.$contentTable.append(H5PUtils.createTableRow(['<a href="' + content.url + '">' + content.title + '</a>']));
|
||||||
}
|
}
|
||||||
|
|
@ -94,11 +93,15 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
|
||||||
* Creates the pager element on the bottom of the list
|
* Creates the pager element on the bottom of the list
|
||||||
*/
|
*/
|
||||||
H5PLibraryDetails.createPagerElement = function () {
|
H5PLibraryDetails.createPagerElement = function () {
|
||||||
|
|
||||||
|
// Only create pager if needed:
|
||||||
|
if(H5PLibraryDetails.currentContent.length > H5PLibraryDetails.PAGER_SIZE) {
|
||||||
|
|
||||||
H5PLibraryDetails.$previous = $('<button type="button" class="previous h5p-admin"><</button>');
|
H5PLibraryDetails.$previous = $('<button type="button" class="previous h5p-admin"><</button>');
|
||||||
H5PLibraryDetails.$next = $('<button type="button" class="next h5p-admin">></button>');
|
H5PLibraryDetails.$next = $('<button type="button" class="next h5p-admin">></button>');
|
||||||
|
|
||||||
H5PLibraryDetails.$previous.on('click', function () {
|
H5PLibraryDetails.$previous.on('click', function () {
|
||||||
if (H5PLibraryDetails.$previous.hasClass('disabled')) {
|
if(H5PLibraryDetails.$previous.hasClass('disabled')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -108,7 +111,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
|
||||||
});
|
});
|
||||||
|
|
||||||
H5PLibraryDetails.$next.on('click', function () {
|
H5PLibraryDetails.$next.on('click', function () {
|
||||||
if (H5PLibraryDetails.$next.hasClass('disabled')) {
|
if(H5PLibraryDetails.$next.hasClass('disabled')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -128,7 +131,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
|
||||||
H5PLibraryDetails.$pagerInfo.hide();
|
H5PLibraryDetails.$pagerInfo.hide();
|
||||||
|
|
||||||
// User has updated the pageNumber
|
// User has updated the pageNumber
|
||||||
var pageNumerUpdated = function () {
|
var pageNumerUpdated = function() {
|
||||||
var newPageNum = $gotoInput.val()-1;
|
var newPageNum = $gotoInput.val()-1;
|
||||||
var intRegex = /^\d+$/;
|
var intRegex = /^\d+$/;
|
||||||
|
|
||||||
|
|
@ -136,7 +139,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
|
||||||
H5PLibraryDetails.$pagerInfo.css({display: 'inline-block'});
|
H5PLibraryDetails.$pagerInfo.css({display: 'inline-block'});
|
||||||
|
|
||||||
// Check if input value is valid, and that it has actually changed
|
// Check if input value is valid, and that it has actually changed
|
||||||
if (!(intRegex.test(newPageNum) && newPageNum >= 0 && newPageNum < H5PLibraryDetails.getNumPages() && newPageNum != H5PLibraryDetails.currentPage)) {
|
if(!(intRegex.test(newPageNum) && newPageNum >= 0 && newPageNum < H5PLibraryDetails.getNumPages() && newPageNum != H5PLibraryDetails.currentPage)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -171,6 +174,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
|
||||||
});
|
});
|
||||||
|
|
||||||
H5PLibraryDetails.updatePager();
|
H5PLibraryDetails.updatePager();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -186,7 +190,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
|
||||||
H5PLibraryDetails.updatePager = function () {
|
H5PLibraryDetails.updatePager = function () {
|
||||||
H5PLibraryDetails.$pagerInfo.css({display: 'inline-block'});
|
H5PLibraryDetails.$pagerInfo.css({display: 'inline-block'});
|
||||||
|
|
||||||
if (H5PLibraryDetails.getNumPages() > 0) {
|
if(H5PLibraryDetails.getNumPages() > 0) {
|
||||||
var message = H5PUtils.translateReplace(H5PLibraryDetails.library.translations.pageXOfY, {
|
var message = H5PUtils.translateReplace(H5PLibraryDetails.library.translations.pageXOfY, {
|
||||||
'$x': (H5PLibraryDetails.currentPage+1),
|
'$x': (H5PLibraryDetails.currentPage+1),
|
||||||
'$y': H5PLibraryDetails.getNumPages()
|
'$y': H5PLibraryDetails.getNumPages()
|
||||||
|
|
@ -212,7 +216,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
|
||||||
var searchString = $('.h5p-content-search > input').val();
|
var searchString = $('.h5p-content-search > input').val();
|
||||||
|
|
||||||
// If search string same as previous, just do nothing
|
// If search string same as previous, just do nothing
|
||||||
if (H5PLibraryDetails.currentFilter === searchString) {
|
if(H5PLibraryDetails.currentFilter === searchString) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -220,7 +224,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
|
||||||
// If empty search, use the complete list
|
// If empty search, use the complete list
|
||||||
H5PLibraryDetails.currentContent = H5PLibraryDetails.library.content;
|
H5PLibraryDetails.currentContent = H5PLibraryDetails.library.content;
|
||||||
}
|
}
|
||||||
else if (H5PLibraryDetails.filterCache[searchString]) {
|
else if(H5PLibraryDetails.filterCache[searchString]) {
|
||||||
// If search is cached, no need to filter
|
// If search is cached, no need to filter
|
||||||
H5PLibraryDetails.currentContent = H5PLibraryDetails.filterCache[searchString];
|
H5PLibraryDetails.currentContent = H5PLibraryDetails.filterCache[searchString];
|
||||||
}
|
}
|
||||||
|
|
@ -228,10 +232,10 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
|
||||||
var listToFilter = H5PLibraryDetails.library.content;
|
var listToFilter = H5PLibraryDetails.library.content;
|
||||||
|
|
||||||
// Check if we can filter the already filtered results (for performance)
|
// Check if we can filter the already filtered results (for performance)
|
||||||
if (searchString.length > 1 && H5PLibraryDetails.currentFilter === searchString.substr(0, H5PLibraryDetails.currentFilter.length)) {
|
if(searchString.length > 1 && H5PLibraryDetails.currentFilter === searchString.substr(0, H5PLibraryDetails.currentFilter.length)) {
|
||||||
listToFilter = H5PLibraryDetails.currentContent;
|
listToFilter = H5PLibraryDetails.currentContent;
|
||||||
}
|
}
|
||||||
H5PLibraryDetails.currentContent = $.grep(listToFilter, function (content) {
|
H5PLibraryDetails.currentContent = $.grep(listToFilter, function(content) {
|
||||||
return content.title && content.title.match(new RegExp(searchString, 'i'));
|
return content.title && content.title.match(new RegExp(searchString, 'i'));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -257,7 +261,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
|
||||||
$('input', H5PLibraryDetails.$search).on('change keypress paste input', function () {
|
$('input', H5PLibraryDetails.$search).on('change keypress paste input', function () {
|
||||||
// Here we start the filtering
|
// Here we start the filtering
|
||||||
// We wait at least 500 ms after last input to perform search
|
// We wait at least 500 ms after last input to perform search
|
||||||
if (inputTimer) {
|
if(inputTimer) {
|
||||||
clearTimeout(inputTimer);
|
clearTimeout(inputTimer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* global H5PAdminIntegration H5PUtils */
|
/*jshint multistr: true */
|
||||||
var H5PLibraryList = H5PLibraryList || {};
|
var H5PLibraryList = H5PLibraryList || {};
|
||||||
|
|
||||||
(function ($) {
|
(function ($) {
|
||||||
|
|
@ -25,7 +25,7 @@ var H5PLibraryList = H5PLibraryList || {};
|
||||||
*/
|
*/
|
||||||
H5PLibraryList.createLibraryList = function (libraries) {
|
H5PLibraryList.createLibraryList = function (libraries) {
|
||||||
var t = H5PAdminIntegration.l10n;
|
var t = H5PAdminIntegration.l10n;
|
||||||
if (libraries.listData === undefined || libraries.listData.length === 0) {
|
if(libraries.listData === undefined || libraries.listData.length === 0) {
|
||||||
return $('<div>' + t.NA + '</div>');
|
return $('<div>' + t.NA + '</div>');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,12 +20,8 @@
|
||||||
// Make iframe responsive
|
// Make iframe responsive
|
||||||
iframe.style.width = '100%';
|
iframe.style.width = '100%';
|
||||||
|
|
||||||
// Bugfix for Chrome: Force update of iframe width. If this is not done the
|
|
||||||
// document size may not be updated before the content resizes.
|
|
||||||
iframe.getBoundingClientRect();
|
|
||||||
|
|
||||||
// Tell iframe that it needs to resize when our window resizes
|
// Tell iframe that it needs to resize when our window resizes
|
||||||
var resize = function () {
|
var resize = function (event) {
|
||||||
if (iframe.contentWindow) {
|
if (iframe.contentWindow) {
|
||||||
// Limit resize calls to avoid flickering
|
// Limit resize calls to avoid flickering
|
||||||
respond('resize');
|
respond('resize');
|
||||||
|
|
@ -68,7 +64,7 @@
|
||||||
* @param {Object} data Payload
|
* @param {Object} data Payload
|
||||||
* @param {Function} respond Send a response to the iframe
|
* @param {Function} respond Send a response to the iframe
|
||||||
*/
|
*/
|
||||||
actionHandlers.resize = function (iframe, data) {
|
actionHandlers.resize = function (iframe, data, respond) {
|
||||||
// Resize iframe so all content is visible. Use scrollHeight to make sure we get everything
|
// Resize iframe so all content is visible. Use scrollHeight to make sure we get everything
|
||||||
iframe.style.height = data.scrollHeight + 'px';
|
iframe.style.height = data.scrollHeight + 'px';
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
/* global H5PAdminIntegration*/
|
|
||||||
var H5PUtils = H5PUtils || {};
|
var H5PUtils = H5PUtils || {};
|
||||||
|
|
||||||
(function ($) {
|
(function ($) {
|
||||||
|
|
@ -10,7 +9,7 @@ var H5PUtils = H5PUtils || {};
|
||||||
H5PUtils.createTable = function (headers) {
|
H5PUtils.createTable = function (headers) {
|
||||||
var $table = $('<table class="h5p-admin-table' + (H5PAdminIntegration.extraTableClasses !== undefined ? ' ' + H5PAdminIntegration.extraTableClasses : '') + '"></table>');
|
var $table = $('<table class="h5p-admin-table' + (H5PAdminIntegration.extraTableClasses !== undefined ? ' ' + H5PAdminIntegration.extraTableClasses : '') + '"></table>');
|
||||||
|
|
||||||
if (headers) {
|
if(headers) {
|
||||||
var $thead = $('<thead></thead>');
|
var $thead = $('<thead></thead>');
|
||||||
var $tr = $('<tr></tr>');
|
var $tr = $('<tr></tr>');
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,24 +7,11 @@ H5P.Version = (function () {
|
||||||
* @param {String} version
|
* @param {String} version
|
||||||
*/
|
*/
|
||||||
function Version(version) {
|
function Version(version) {
|
||||||
|
|
||||||
if (typeof version === 'string') {
|
|
||||||
// Name version string (used by content upgrade)
|
|
||||||
var versionSplit = version.split('.', 3);
|
var versionSplit = version.split('.', 3);
|
||||||
|
|
||||||
|
// Public
|
||||||
this.major =+ versionSplit[0];
|
this.major =+ versionSplit[0];
|
||||||
this.minor =+ versionSplit[1];
|
this.minor =+ versionSplit[1];
|
||||||
}
|
|
||||||
else {
|
|
||||||
// Library objects (used by editor)
|
|
||||||
if (version.localMajorVersion !== undefined) {
|
|
||||||
this.major =+ version.localMajorVersion;
|
|
||||||
this.minor =+ version.localMinorVersion;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
this.major =+ version.majorVersion;
|
|
||||||
this.minor =+ version.minorVersion;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Public. Custom string for this object.
|
* Public. Custom string for this object.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
var H5P = window.H5P = window.H5P || {};
|
var H5P = H5P || {};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Used for xAPI events.
|
* Used for xAPI events.
|
||||||
|
|
@ -133,26 +133,13 @@ H5P.XAPIEvent.prototype.setObject = function (instance) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
var content = H5P.getContentForInstance(instance.contentId);
|
if (H5PIntegration && H5PIntegration.contents && H5PIntegration.contents['cid-' + instance.contentId].title) {
|
||||||
if (content && content.metadata && content.metadata.title) {
|
|
||||||
this.data.statement.object.definition.name = {
|
this.data.statement.object.definition.name = {
|
||||||
"en-US": H5P.createTitle(content.metadata.title)
|
"en-US": H5P.createTitle(H5PIntegration.contents['cid-' + instance.contentId].title)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
// Content types view always expect to have a contentId when they are displayed.
|
|
||||||
// This is not the case if they are displayed in the editor as part of a preview.
|
|
||||||
// The fix is to set an empty object with definition for the xAPI event, so all
|
|
||||||
// the content types that rely on this does not have to handle it. This means
|
|
||||||
// that content types that are being previewed will send xAPI completed events,
|
|
||||||
// but since there are no scripts that catch these events in the editor,
|
|
||||||
// this is not a problem.
|
|
||||||
this.data.statement.object = {
|
|
||||||
definition: {}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -163,6 +150,7 @@ H5P.XAPIEvent.prototype.setObject = function (instance) {
|
||||||
*/
|
*/
|
||||||
H5P.XAPIEvent.prototype.setContext = function (instance) {
|
H5P.XAPIEvent.prototype.setContext = function (instance) {
|
||||||
if (instance.parent && (instance.parent.contentId || instance.parent.subContentId)) {
|
if (instance.parent && (instance.parent.contentId || instance.parent.subContentId)) {
|
||||||
|
var parentId = instance.parent.subContentId === undefined ? instance.parent.contentId : instance.parent.subContentId;
|
||||||
this.data.statement.context = {
|
this.data.statement.context = {
|
||||||
"contextActivities": {
|
"contextActivities": {
|
||||||
"parent": [
|
"parent": [
|
||||||
|
|
@ -229,7 +217,7 @@ H5P.XAPIEvent.prototype.setActor = function () {
|
||||||
* @returns {number}
|
* @returns {number}
|
||||||
* The max score, or null if not defined
|
* The max score, or null if not defined
|
||||||
*/
|
*/
|
||||||
H5P.XAPIEvent.prototype.getMaxScore = function () {
|
H5P.XAPIEvent.prototype.getMaxScore = function() {
|
||||||
return this.getVerifiedStatementValue(['result', 'score', 'max']);
|
return this.getVerifiedStatementValue(['result', 'score', 'max']);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -239,7 +227,7 @@ H5P.XAPIEvent.prototype.getMaxScore = function () {
|
||||||
* @returns {number}
|
* @returns {number}
|
||||||
* The score, or null if not defined
|
* The score, or null if not defined
|
||||||
*/
|
*/
|
||||||
H5P.XAPIEvent.prototype.getScore = function () {
|
H5P.XAPIEvent.prototype.getScore = function() {
|
||||||
return this.getVerifiedStatementValue(['result', 'score', 'raw']);
|
return this.getVerifiedStatementValue(['result', 'score', 'raw']);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -251,7 +239,7 @@ H5P.XAPIEvent.prototype.getScore = function () {
|
||||||
*/
|
*/
|
||||||
H5P.XAPIEvent.prototype.getContentXAPIId = function (instance) {
|
H5P.XAPIEvent.prototype.getContentXAPIId = function (instance) {
|
||||||
var xAPIId;
|
var xAPIId;
|
||||||
if (instance.contentId && H5PIntegration && H5PIntegration.contents && H5PIntegration.contents['cid-' + instance.contentId]) {
|
if (instance.contentId && H5PIntegration && H5PIntegration.contents) {
|
||||||
xAPIId = H5PIntegration.contents['cid-' + instance.contentId].url;
|
xAPIId = H5PIntegration.contents['cid-' + instance.contentId].url;
|
||||||
if (instance.subContentId) {
|
if (instance.subContentId) {
|
||||||
xAPIId += '?subContentId=' + instance.subContentId;
|
xAPIId += '?subContentId=' + instance.subContentId;
|
||||||
|
|
@ -260,16 +248,6 @@ H5P.XAPIEvent.prototype.getContentXAPIId = function (instance) {
|
||||||
return xAPIId;
|
return xAPIId;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if this event is sent from a child (i.e not from grandchild)
|
|
||||||
*
|
|
||||||
* @return {Boolean}
|
|
||||||
*/
|
|
||||||
H5P.XAPIEvent.prototype.isFromChild = function () {
|
|
||||||
var parentId = this.getVerifiedStatementValue(['context', 'contextActivities', 'parent', 0, 'id']);
|
|
||||||
return !parentId || parentId.indexOf('subContentId') === -1;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Figure out if a property exists in the statement and return it
|
* Figure out if a property exists in the statement and return it
|
||||||
*
|
*
|
||||||
|
|
@ -279,7 +257,7 @@ H5P.XAPIEvent.prototype.isFromChild = function () {
|
||||||
* @returns {*}
|
* @returns {*}
|
||||||
* The value of the property if it is set, null otherwise.
|
* The value of the property if it is set, null otherwise.
|
||||||
*/
|
*/
|
||||||
H5P.XAPIEvent.prototype.getVerifiedStatementValue = function (keys) {
|
H5P.XAPIEvent.prototype.getVerifiedStatementValue = function(keys) {
|
||||||
var val = this.data.statement;
|
var val = this.data.statement;
|
||||||
for (var i = 0; i < keys.length; i++) {
|
for (var i = 0; i < keys.length; i++) {
|
||||||
if (val[keys[i]] === undefined) {
|
if (val[keys[i]] === undefined) {
|
||||||
|
|
@ -320,12 +298,5 @@ H5P.XAPIEvent.allowedXAPIVerbs = [
|
||||||
'shared',
|
'shared',
|
||||||
'suspended',
|
'suspended',
|
||||||
'terminated',
|
'terminated',
|
||||||
'voided',
|
'voided'
|
||||||
|
|
||||||
// Custom verbs used for action toolbar below content
|
|
||||||
'downloaded',
|
|
||||||
'copied',
|
|
||||||
'accessed-reuse',
|
|
||||||
'accessed-embed',
|
|
||||||
'accessed-copyright'
|
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
var H5P = window.H5P = window.H5P || {};
|
var H5P = H5P || {};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The external event dispatcher. Others, outside of H5P may register and
|
* The external event dispatcher. Others, outside of H5P may register and
|
||||||
|
|
@ -92,7 +92,7 @@ H5P.EventDispatcher.prototype.triggerXAPIScored = function (score, maxScore, ver
|
||||||
this.trigger(event);
|
this.trigger(event);
|
||||||
};
|
};
|
||||||
|
|
||||||
H5P.EventDispatcher.prototype.setActivityStarted = function () {
|
H5P.EventDispatcher.prototype.setActivityStarted = function() {
|
||||||
if (this.activityStartTime === undefined) {
|
if (this.activityStartTime === undefined) {
|
||||||
// Don't trigger xAPI events in the editor
|
// Don't trigger xAPI events in the editor
|
||||||
if (this.contentId !== undefined &&
|
if (this.contentId !== undefined &&
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,436 +0,0 @@
|
||||||
/**
|
|
||||||
* Queue requests and handle them at your convenience
|
|
||||||
*
|
|
||||||
* @type {RequestQueue}
|
|
||||||
*/
|
|
||||||
H5P.RequestQueue = (function ($, EventDispatcher) {
|
|
||||||
/**
|
|
||||||
* A queue for requests, will be automatically processed when regaining connection
|
|
||||||
*
|
|
||||||
* @param {boolean} [options.showToast] Show toast when losing or regaining connection
|
|
||||||
* @constructor
|
|
||||||
*/
|
|
||||||
const RequestQueue = function (options) {
|
|
||||||
EventDispatcher.call(this);
|
|
||||||
this.processingQueue = false;
|
|
||||||
options = options || {};
|
|
||||||
|
|
||||||
this.showToast = options.showToast;
|
|
||||||
this.itemName = 'requestQueue';
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add request to queue. Only supports posts currently.
|
|
||||||
*
|
|
||||||
* @param {string} url
|
|
||||||
* @param {Object} data
|
|
||||||
* @returns {boolean}
|
|
||||||
*/
|
|
||||||
RequestQueue.prototype.add = function (url, data) {
|
|
||||||
if (!window.localStorage) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
let storedStatements = this.getStoredRequests();
|
|
||||||
if (!storedStatements) {
|
|
||||||
storedStatements = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
storedStatements.push({
|
|
||||||
url: url,
|
|
||||||
data: data,
|
|
||||||
});
|
|
||||||
|
|
||||||
window.localStorage.setItem(this.itemName, JSON.stringify(storedStatements));
|
|
||||||
|
|
||||||
this.trigger('requestQueued', {
|
|
||||||
storedStatements: storedStatements,
|
|
||||||
processingQueue: this.processingQueue,
|
|
||||||
});
|
|
||||||
return true;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get stored requests
|
|
||||||
*
|
|
||||||
* @returns {boolean|Array} Stored requests
|
|
||||||
*/
|
|
||||||
RequestQueue.prototype.getStoredRequests = function () {
|
|
||||||
if (!window.localStorage) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const item = window.localStorage.getItem(this.itemName);
|
|
||||||
if (!item) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
return JSON.parse(item);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clear stored requests
|
|
||||||
*
|
|
||||||
* @returns {boolean} True if the storage was successfully cleared
|
|
||||||
*/
|
|
||||||
RequestQueue.prototype.clearQueue = function () {
|
|
||||||
if (!window.localStorage) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
window.localStorage.removeItem(this.itemName);
|
|
||||||
return true;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Start processing of requests queue
|
|
||||||
*
|
|
||||||
* @return {boolean} Returns false if it was not possible to resume processing queue
|
|
||||||
*/
|
|
||||||
RequestQueue.prototype.resumeQueue = function () {
|
|
||||||
// Not supported
|
|
||||||
if (!H5PIntegration || !window.navigator || !window.localStorage) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Already processing
|
|
||||||
if (this.processingQueue) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Attempt to send queued requests
|
|
||||||
const queue = this.getStoredRequests();
|
|
||||||
const queueLength = queue.length;
|
|
||||||
|
|
||||||
// Clear storage, failed requests will be re-added
|
|
||||||
this.clearQueue();
|
|
||||||
|
|
||||||
// No items left in queue
|
|
||||||
if (!queueLength) {
|
|
||||||
this.trigger('emptiedQueue', queue);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Make sure requests are not changed while they're being handled
|
|
||||||
this.processingQueue = true;
|
|
||||||
|
|
||||||
// Process queue in original order
|
|
||||||
this.processQueue(queue);
|
|
||||||
return true
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Process first item in the request queue
|
|
||||||
*
|
|
||||||
* @param {Array} queue Request queue
|
|
||||||
*/
|
|
||||||
RequestQueue.prototype.processQueue = function (queue) {
|
|
||||||
if (!queue.length) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.trigger('processingQueue');
|
|
||||||
|
|
||||||
// Make sure the requests are processed in a FIFO order
|
|
||||||
const request = queue.shift();
|
|
||||||
|
|
||||||
const self = this;
|
|
||||||
$.post(request.url, request.data)
|
|
||||||
.fail(self.onQueuedRequestFail.bind(self, request))
|
|
||||||
.always(self.onQueuedRequestProcessed.bind(self, queue))
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request fail handler
|
|
||||||
*
|
|
||||||
* @param {Object} request
|
|
||||||
*/
|
|
||||||
RequestQueue.prototype.onQueuedRequestFail = function (request) {
|
|
||||||
// Queue the failed request again if we're offline
|
|
||||||
if (!window.navigator.onLine) {
|
|
||||||
this.add(request.url, request.data);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An item in the queue was processed
|
|
||||||
*
|
|
||||||
* @param {Array} queue Queue that was processed
|
|
||||||
*/
|
|
||||||
RequestQueue.prototype.onQueuedRequestProcessed = function (queue) {
|
|
||||||
if (queue.length) {
|
|
||||||
this.processQueue(queue);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finished processing this queue
|
|
||||||
this.processingQueue = false;
|
|
||||||
|
|
||||||
// Run empty queue callback with next request queue
|
|
||||||
const requestQueue = this.getStoredRequests();
|
|
||||||
this.trigger('queueEmptied', requestQueue);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Display toast message on the first content of current page
|
|
||||||
*
|
|
||||||
* @param {string} msg Message to display
|
|
||||||
* @param {boolean} [forceShow] Force override showing the toast
|
|
||||||
* @param {Object} [configOverride] Override toast message config
|
|
||||||
*/
|
|
||||||
RequestQueue.prototype.displayToastMessage = function (msg, forceShow, configOverride) {
|
|
||||||
if (!this.showToast && !forceShow) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const config = H5P.jQuery.extend(true, {}, {
|
|
||||||
position: {
|
|
||||||
horizontal : 'centered',
|
|
||||||
vertical: 'centered',
|
|
||||||
noOverflowX: true,
|
|
||||||
}
|
|
||||||
}, configOverride);
|
|
||||||
|
|
||||||
H5P.attachToastTo(H5P.jQuery('.h5p-content:first')[0], msg, config);
|
|
||||||
};
|
|
||||||
|
|
||||||
return RequestQueue;
|
|
||||||
})(H5P.jQuery, H5P.EventDispatcher);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request queue for retrying failing requests, will automatically retry them when you come online
|
|
||||||
*
|
|
||||||
* @type {offlineRequestQueue}
|
|
||||||
*/
|
|
||||||
H5P.OfflineRequestQueue = (function (RequestQueue, Dialog) {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructor
|
|
||||||
*
|
|
||||||
* @param {Object} [options] Options for offline request queue
|
|
||||||
* @param {Object} [options.instance] The H5P instance which UI components are placed within
|
|
||||||
*/
|
|
||||||
const offlineRequestQueue = function (options) {
|
|
||||||
const requestQueue = new RequestQueue();
|
|
||||||
|
|
||||||
// We could handle requests from previous pages here, but instead we throw them away
|
|
||||||
requestQueue.clearQueue();
|
|
||||||
|
|
||||||
let startTime = null;
|
|
||||||
const retryIntervals = [10, 20, 40, 60, 120, 300, 600];
|
|
||||||
let intervalIndex = -1;
|
|
||||||
let currentInterval = null;
|
|
||||||
let isAttached = false;
|
|
||||||
let isShowing = false;
|
|
||||||
let isLoading = false;
|
|
||||||
const instance = options.instance;
|
|
||||||
|
|
||||||
const offlineDialog = new Dialog({
|
|
||||||
headerText: H5P.t('offlineDialogHeader'),
|
|
||||||
dialogText: H5P.t('offlineDialogBody'),
|
|
||||||
confirmText: H5P.t('offlineDialogRetryButtonLabel'),
|
|
||||||
hideCancel: true,
|
|
||||||
hideExit: true,
|
|
||||||
classes: ['offline'],
|
|
||||||
instance: instance,
|
|
||||||
skipRestoreFocus: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
const dialog = offlineDialog.getElement();
|
|
||||||
|
|
||||||
// Add retry text to body
|
|
||||||
const countDownText = document.createElement('div');
|
|
||||||
countDownText.classList.add('count-down');
|
|
||||||
countDownText.innerHTML = H5P.t('offlineDialogRetryMessage')
|
|
||||||
.replace(':num', '<span class="count-down-num">0</span>');
|
|
||||||
|
|
||||||
dialog.querySelector('.h5p-confirmation-dialog-text').appendChild(countDownText);
|
|
||||||
const countDownNum = countDownText.querySelector('.count-down-num');
|
|
||||||
|
|
||||||
// Create throbber
|
|
||||||
const throbberWrapper = document.createElement('div');
|
|
||||||
throbberWrapper.classList.add('throbber-wrapper');
|
|
||||||
const throbber = document.createElement('div');
|
|
||||||
throbber.classList.add('sending-requests-throbber');
|
|
||||||
throbberWrapper.appendChild(throbber);
|
|
||||||
|
|
||||||
requestQueue.on('requestQueued', function (e) {
|
|
||||||
// Already processing queue, wait until queue has finished processing before showing dialog
|
|
||||||
if (e.data && e.data.processingQueue) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isAttached) {
|
|
||||||
const rootContent = document.body.querySelector('.h5p-content');
|
|
||||||
if (!rootContent) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
offlineDialog.appendTo(rootContent);
|
|
||||||
rootContent.appendChild(throbberWrapper);
|
|
||||||
isAttached = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
startCountDown();
|
|
||||||
}.bind(this));
|
|
||||||
|
|
||||||
requestQueue.on('queueEmptied', function (e) {
|
|
||||||
if (e.data && e.data.length) {
|
|
||||||
// New requests were added while processing queue or requests failed again. Re-queue requests.
|
|
||||||
startCountDown(true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Successfully emptied queue
|
|
||||||
clearInterval(currentInterval);
|
|
||||||
toggleThrobber(false);
|
|
||||||
intervalIndex = -1;
|
|
||||||
if (isShowing) {
|
|
||||||
offlineDialog.hide();
|
|
||||||
isShowing = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
requestQueue.displayToastMessage(
|
|
||||||
H5P.t('offlineSuccessfulSubmit'),
|
|
||||||
true,
|
|
||||||
{
|
|
||||||
position: {
|
|
||||||
vertical: 'top',
|
|
||||||
offsetVertical: '100',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
}.bind(this));
|
|
||||||
|
|
||||||
offlineDialog.on('confirmed', function () {
|
|
||||||
// Show dialog on next render in case it is being hidden by the 'confirm' button
|
|
||||||
isShowing = false;
|
|
||||||
setTimeout(function () {
|
|
||||||
retryRequests();
|
|
||||||
}, 100);
|
|
||||||
}.bind(this));
|
|
||||||
|
|
||||||
// Initialize listener for when requests are added to queue
|
|
||||||
window.addEventListener('online', function () {
|
|
||||||
retryRequests();
|
|
||||||
}.bind(this));
|
|
||||||
|
|
||||||
// Listen for queued requests outside the iframe
|
|
||||||
window.addEventListener('message', function (event) {
|
|
||||||
const isValidQueueEvent = window.parent === event.source
|
|
||||||
&& event.data.context === 'h5p'
|
|
||||||
&& event.data.action === 'queueRequest';
|
|
||||||
|
|
||||||
if (!isValidQueueEvent) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.add(event.data.url, event.data.data);
|
|
||||||
}.bind(this));
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Toggle throbber visibility
|
|
||||||
*
|
|
||||||
* @param {boolean} [forceShow] Will force throbber visibility if set
|
|
||||||
*/
|
|
||||||
const toggleThrobber = function (forceShow) {
|
|
||||||
isLoading = !isLoading;
|
|
||||||
if (forceShow !== undefined) {
|
|
||||||
isLoading = forceShow;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isLoading && isShowing) {
|
|
||||||
offlineDialog.hide();
|
|
||||||
isShowing = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isLoading) {
|
|
||||||
throbberWrapper.classList.add('show');
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
throbberWrapper.classList.remove('show');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
/**
|
|
||||||
* Retries the failed requests
|
|
||||||
*/
|
|
||||||
const retryRequests = function () {
|
|
||||||
clearInterval(currentInterval);
|
|
||||||
toggleThrobber(true);
|
|
||||||
requestQueue.resumeQueue();
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Increments retry interval
|
|
||||||
*/
|
|
||||||
const incrementRetryInterval = function () {
|
|
||||||
intervalIndex += 1;
|
|
||||||
if (intervalIndex >= retryIntervals.length) {
|
|
||||||
intervalIndex = retryIntervals.length - 1;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Starts counting down to retrying queued requests.
|
|
||||||
*
|
|
||||||
* @param forceDelayedShow
|
|
||||||
*/
|
|
||||||
const startCountDown = function (forceDelayedShow) {
|
|
||||||
// Already showing, wait for retry
|
|
||||||
if (isShowing) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleThrobber(false);
|
|
||||||
if (!isShowing) {
|
|
||||||
if (forceDelayedShow) {
|
|
||||||
// Must force delayed show since dialog may be hiding, and confirmation dialog does not
|
|
||||||
// support this.
|
|
||||||
setTimeout(function () {
|
|
||||||
offlineDialog.show(0);
|
|
||||||
}, 100);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
offlineDialog.show(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
isShowing = true;
|
|
||||||
startTime = new Date().getTime();
|
|
||||||
incrementRetryInterval();
|
|
||||||
clearInterval(currentInterval);
|
|
||||||
currentInterval = setInterval(updateCountDown, 100);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates the count down timer. Retries requests when time expires.
|
|
||||||
*/
|
|
||||||
const updateCountDown = function () {
|
|
||||||
const time = new Date().getTime();
|
|
||||||
const timeElapsed = Math.floor((time - startTime) / 1000);
|
|
||||||
const timeLeft = retryIntervals[intervalIndex] - timeElapsed;
|
|
||||||
countDownNum.textContent = timeLeft.toString();
|
|
||||||
|
|
||||||
// Retry interval reached, retry requests
|
|
||||||
if (timeLeft <= 0) {
|
|
||||||
retryRequests();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add request to offline request queue. Only supports posts for now.
|
|
||||||
*
|
|
||||||
* @param {string} url The request url
|
|
||||||
* @param {Object} data The request data
|
|
||||||
*/
|
|
||||||
this.add = function (url, data) {
|
|
||||||
// Only queue request if it failed because we are offline
|
|
||||||
if (window.navigator.onLine) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
requestQueue.add(url, data);
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
return offlineRequestQueue;
|
|
||||||
})(H5P.RequestQueue, H5P.ConfirmationDialog);
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
||||||
/* global H5PDisableHubData */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Global data for disable hub functionality
|
|
||||||
*
|
|
||||||
* @typedef {object} H5PDisableHubData Data passed in from the backend
|
|
||||||
*
|
|
||||||
* @property {string} selector Selector for the disable hub check-button
|
|
||||||
* @property {string} overlaySelector Selector for the element that the confirmation dialog will mask
|
|
||||||
* @property {Array} errors Errors found with the current server setup
|
|
||||||
*
|
|
||||||
* @property {string} header Header of the confirmation dialog
|
|
||||||
* @property {string} confirmationDialogMsg Body of the confirmation dialog
|
|
||||||
* @property {string} cancelLabel Cancel label of the confirmation dialog
|
|
||||||
* @property {string} confirmLabel Confirm button label of the confirmation dialog
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
/**
|
|
||||||
* Utility that makes it possible to force the user to confirm that he really
|
|
||||||
* wants to use the H5P hub without proper server settings.
|
|
||||||
*/
|
|
||||||
(function ($) {
|
|
||||||
|
|
||||||
$(document).on('ready', function () {
|
|
||||||
|
|
||||||
// No data found
|
|
||||||
if (!H5PDisableHubData) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// No errors found, no need for confirmation dialog
|
|
||||||
if (!H5PDisableHubData.errors || !H5PDisableHubData.errors.length) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
H5PDisableHubData.selector = H5PDisableHubData.selector ||
|
|
||||||
'.h5p-settings-disable-hub-checkbox';
|
|
||||||
H5PDisableHubData.overlaySelector = H5PDisableHubData.overlaySelector ||
|
|
||||||
'.h5p-settings-container';
|
|
||||||
|
|
||||||
var dialogHtml = '<div>' +
|
|
||||||
'<p>' + H5PDisableHubData.errors.join('</p><p>') + '</p>' +
|
|
||||||
'<p>' + H5PDisableHubData.confirmationDialogMsg + '</p>';
|
|
||||||
|
|
||||||
// Create confirmation dialog, make sure to include translations
|
|
||||||
var confirmationDialog = new H5P.ConfirmationDialog({
|
|
||||||
headerText: H5PDisableHubData.header,
|
|
||||||
dialogText: dialogHtml,
|
|
||||||
cancelText: H5PDisableHubData.cancelLabel,
|
|
||||||
confirmText: H5PDisableHubData.confirmLabel
|
|
||||||
}).appendTo($(H5PDisableHubData.overlaySelector).get(0));
|
|
||||||
|
|
||||||
confirmationDialog.on('confirmed', function () {
|
|
||||||
enableButton.get(0).checked = true;
|
|
||||||
});
|
|
||||||
|
|
||||||
confirmationDialog.on('canceled', function () {
|
|
||||||
enableButton.get(0).checked = false;
|
|
||||||
});
|
|
||||||
|
|
||||||
var enableButton = $(H5PDisableHubData.selector);
|
|
||||||
enableButton.change(function () {
|
|
||||||
if ($(this).is(':checked')) {
|
|
||||||
confirmationDialog.show(enableButton.offset().top);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
})(H5P.jQuery);
|
|
||||||
|
|
@ -232,8 +232,7 @@ button.h5p-admin.disabled:hover {
|
||||||
.h5p-admin-header {
|
.h5p-admin-header {
|
||||||
margin-top: 1.5em;
|
margin-top: 1.5em;
|
||||||
}
|
}
|
||||||
#h5p-library-upload-form.h5p-admin-upload-libraries-form,
|
#h5p-library-upload-form.h5p-admin-upload-libraries-form {
|
||||||
#h5p-content-type-cache-update-form.h5p-admin-upload-libraries-form {
|
|
||||||
position: relative;
|
position: relative;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
|
|
||||||
|
|
@ -266,20 +265,6 @@ button.h5p-admin.disabled:hover {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.h5p-data-view .h5p-others-contents-toggler-wrapper {
|
|
||||||
float: right;
|
|
||||||
line-height: 2;
|
|
||||||
margin-right: 0.5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.h5p-data-view .h5p-others-contents-toggler-label {
|
|
||||||
font-size: 14px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.h5p-data-view .h5p-others-contents-toggler {
|
|
||||||
margin-right: 0.5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.h5p-data-view th[role="button"] {
|
.h5p-data-view th[role="button"] {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
@ -353,6 +338,3 @@ button.h5p-admin.disabled:hover {
|
||||||
.h5p-data-view .h5p-facet-tag > span:active {
|
.h5p-data-view .h5p-facet-tag > span:active {
|
||||||
color: #d20000;
|
color: #d20000;
|
||||||
}
|
}
|
||||||
.content-upgrade-log {
|
|
||||||
color: red;
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
.h5p-confirmation-dialog-background {
|
.h5p-confirmation-dialog-background {
|
||||||
position: fixed;
|
position: absolute;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
left: 0;
|
left: 0;
|
||||||
top: 0;
|
top: 0;
|
||||||
|
|
||||||
background: rgba(44, 44, 44, 0.9);
|
background: rgba(255, 255, 255, 0.85);
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
-webkit-transition: opacity 0.1s, linear 0s, visibility 0s linear 0s;
|
-webkit-transition: opacity 0.1s, linear 0s, visibility 0s linear 0s;
|
||||||
|
|
@ -46,7 +46,7 @@
|
||||||
transform: translate(-50%, 0%);
|
transform: translate(-50%, 0%);
|
||||||
|
|
||||||
color: #555;
|
color: #555;
|
||||||
box-shadow: 0 0 6px 6px rgba(10,10,10,0.3);
|
box-shadow: 0 0 6px 1px #ddd;
|
||||||
|
|
||||||
-webkit-transition: transform 0.1s ease-in;
|
-webkit-transition: transform 0.1s ease-in;
|
||||||
transition: transform 0.1s ease-in;
|
transition: transform 0.1s ease-in;
|
||||||
|
|
@ -61,7 +61,7 @@
|
||||||
.h5p-confirmation-dialog-header {
|
.h5p-confirmation-dialog-header {
|
||||||
padding: 1.5em;
|
padding: 1.5em;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
color: #356593;
|
color: #1a73d9;
|
||||||
}
|
}
|
||||||
|
|
||||||
.h5p-confirmation-dialog-header-text {
|
.h5p-confirmation-dialog-header-text {
|
||||||
|
|
@ -69,9 +69,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.h5p-confirmation-dialog-body {
|
.h5p-confirmation-dialog-body {
|
||||||
background: #fafbfc;
|
|
||||||
border-top: solid 1px #dde0e9;
|
|
||||||
padding: 1.25em 1.5em;
|
padding: 1.25em 1.5em;
|
||||||
|
background: #fafafa;
|
||||||
}
|
}
|
||||||
|
|
||||||
.h5p-confirmation-dialog-text {
|
.h5p-confirmation-dialog-text {
|
||||||
|
|
@ -91,14 +90,14 @@ button.h5p-confirmation-dialog-exit {
|
||||||
font-size: 2.5em;
|
font-size: 2.5em;
|
||||||
top: -0.9em;
|
top: -0.9em;
|
||||||
right: -1.15em;
|
right: -1.15em;
|
||||||
color: #fff;
|
color: #777;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
button.h5p-confirmation-dialog-exit:focus,
|
button.h5p-confirmation-dialog-exit:focus,
|
||||||
button.h5p-confirmation-dialog-exit:hover {
|
button.h5p-confirmation-dialog-exit:hover {
|
||||||
color: #E4ECF5;
|
color: #555;
|
||||||
}
|
}
|
||||||
|
|
||||||
.h5p-confirmation-dialog-exit:before {
|
.h5p-confirmation-dialog-exit:before {
|
||||||
|
|
@ -113,71 +112,4 @@ button.h5p-confirmation-dialog-exit:hover {
|
||||||
|
|
||||||
.h5p-core-button.h5p-confirmation-dialog-confirm-button:before {
|
.h5p-core-button.h5p-confirmation-dialog-confirm-button:before {
|
||||||
content: "\e601";
|
content: "\e601";
|
||||||
margin-top: -6px;
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.h5p-confirmation-dialog-popup.offline .h5p-confirmation-dialog-buttons {
|
|
||||||
float: none;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.h5p-confirmation-dialog-popup.offline .count-down {
|
|
||||||
font-family: Arial;
|
|
||||||
margin-top: 0.15em;
|
|
||||||
color: #000;
|
|
||||||
}
|
|
||||||
|
|
||||||
.h5p-confirmation-dialog-popup.offline .h5p-confirmation-dialog-confirm-button:before {
|
|
||||||
content: "\e90b";
|
|
||||||
font-weight: normal;
|
|
||||||
vertical-align: text-bottom;
|
|
||||||
}
|
|
||||||
|
|
||||||
.throbber-wrapper {
|
|
||||||
display: none;
|
|
||||||
position: absolute;
|
|
||||||
height: 100%;
|
|
||||||
width: 100%;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
z-index: 1;
|
|
||||||
background: rgba(44, 44, 44, 0.9);
|
|
||||||
}
|
|
||||||
|
|
||||||
.throbber-wrapper.show {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.throbber-wrapper .throbber-container {
|
|
||||||
position: absolute;
|
|
||||||
top: 50%;
|
|
||||||
left: 50%;
|
|
||||||
transform: translate(-50%, -50%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.throbber-wrapper .sending-requests-throbber{
|
|
||||||
position: absolute;
|
|
||||||
top: 7em;
|
|
||||||
left: 50%;
|
|
||||||
transform: translateX(-50%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.throbber-wrapper .sending-requests-throbber:before {
|
|
||||||
display: block;
|
|
||||||
font-family: 'H5P';
|
|
||||||
content: "\e90b";
|
|
||||||
color: white;
|
|
||||||
font-size: 10em;
|
|
||||||
animation: request-throbber 1.5s infinite linear;
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes request-throbber {
|
|
||||||
from {
|
|
||||||
transform: rotate(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
to {
|
|
||||||
transform: rotate(359deg);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,13 @@
|
||||||
button.h5p-core-button:visited,
|
button.h5p-core-button:visited,
|
||||||
button.h5p-core-button:link,
|
button.h5p-core-button:link,
|
||||||
button.h5p-core-button {
|
button.h5p-core-button {
|
||||||
font-family: "Open Sans", sans-serif;
|
|
||||||
font-weight: 600;
|
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
line-height: 1.2;
|
line-height: 1.2;
|
||||||
padding: 0.5em 1.25em;
|
padding: 0.5em 1.25em;
|
||||||
border-radius: 2em;
|
border-radius: 2em;
|
||||||
|
|
||||||
background: #2579c6;
|
background: #1a73d9;
|
||||||
color: #fff;
|
color: #ffffff;
|
||||||
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
border: none;
|
border: none;
|
||||||
|
|
@ -21,19 +19,24 @@ button.h5p-core-button {
|
||||||
text-shadow: none;
|
text-shadow: none;
|
||||||
vertical-align: baseline;
|
vertical-align: baseline;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
button.h5p-core-button:hover,
|
||||||
|
button.h5p-core-button:focus {
|
||||||
|
background: #1356a3;
|
||||||
|
color: #fff;
|
||||||
|
text-decoration: none;
|
||||||
-webkit-transition: initial;
|
-webkit-transition: initial;
|
||||||
transition: initial;
|
transition: initial;
|
||||||
}
|
}
|
||||||
button.h5p-core-button:focus {
|
|
||||||
background: #1f67a8;
|
|
||||||
}
|
|
||||||
button.h5p-core-button:hover {
|
|
||||||
background: rgba(31, 103, 168, 0.83);
|
|
||||||
}
|
|
||||||
button.h5p-core-button:active {
|
button.h5p-core-button:active {
|
||||||
|
position: relative;
|
||||||
background: #104888;
|
background: #104888;
|
||||||
|
|
||||||
|
-webkit-box-shadow: inset 0 4px 0 #0e407a;
|
||||||
|
-moz-box-shadow: inset 0 4px 0 #0e407a;
|
||||||
|
box-shadow: inset 0 4px 0 #0e407a;
|
||||||
}
|
}
|
||||||
|
|
||||||
button.h5p-core-button:before {
|
button.h5p-core-button:before {
|
||||||
font-family: 'H5P';
|
font-family: 'H5P';
|
||||||
padding-right: 0.15em;
|
padding-right: 0.15em;
|
||||||
|
|
@ -41,6 +44,7 @@ button.h5p-core-button:before {
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
line-height: 0.7;
|
line-height: 0.7;
|
||||||
}
|
}
|
||||||
|
|
||||||
button.h5p-core-cancel-button:visited,
|
button.h5p-core-cancel-button:visited,
|
||||||
button.h5p-core-cancel-button:link,
|
button.h5p-core-cancel-button:link,
|
||||||
button.h5p-core-cancel-button {
|
button.h5p-core-cancel-button {
|
||||||
|
|
@ -52,6 +56,7 @@ button.h5p-core-cancel-button {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
button.h5p-core-cancel-button:hover,
|
button.h5p-core-cancel-button:hover,
|
||||||
button.h5p-core-cancel-button:focus {
|
button.h5p-core-cancel-button:focus {
|
||||||
background: none;
|
background: none;
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
247
styles/h5p.css
247
styles/h5p.css
|
|
@ -3,27 +3,15 @@
|
||||||
/* Custom H5P font to use for icons. */
|
/* Custom H5P font to use for icons. */
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'h5p';
|
font-family: 'h5p';
|
||||||
src: url('../fonts/h5p-core-28.eot?h1atjl');
|
src: url('../fonts/h5p-core-14.eot?inh2er');
|
||||||
src: url('../fonts/h5p-core-28.eot?h1atjl#iefix') format('embedded-opentype'),
|
src: url('../fonts/h5p-core-14.eot?inh2er#iefix') format('embedded-opentype'),
|
||||||
url('../fonts/h5p-core-28.ttf?h1atjl') format('truetype'),
|
url('../fonts/h5p-core-14.ttf?inh2er') format('truetype'),
|
||||||
url('../fonts/h5p-core-28.woff?h1atjl') format('woff'),
|
url('../fonts/h5p-core-14.woff?inh2er') format('woff'),
|
||||||
url('../fonts/h5p-core-28.svg?h1atjl#h5p-core-28') format('svg');
|
url('../fonts/h5p-core-14.svg?inh2er#h5p-core-14') format('svg');
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'h5p-hub-publish';
|
|
||||||
src: url('../fonts/h5p-hub-publish.eot?wy8ylc');
|
|
||||||
src: url('../fonts/h5p-hub-publish.eot?wy8ylc#iefix') format('embedded-opentype'),
|
|
||||||
url('../fonts/h5p-hub-publish.ttf?wy8ylc') format('truetype'),
|
|
||||||
url('../fonts/h5p-hub-publish.woff?wy8ylc') format('woff'),
|
|
||||||
url('../fonts/h5p-hub-publish.svg?wy8ylc#h5p-hub') format('svg');
|
|
||||||
font-weight: normal;
|
|
||||||
font-style: normal;
|
|
||||||
font-display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
html.h5p-iframe, html.h5p-iframe > body {
|
html.h5p-iframe, html.h5p-iframe > body {
|
||||||
font-family: Sans-Serif; /* Use the browser's default sans-serif font. (Since Heletica doesn't look nice on Windows, and Arial on OS X.) */
|
font-family: Sans-Serif; /* Use the browser's default sans-serif font. (Since Heletica doesn't look nice on Windows, and Arial on OS X.) */
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
@ -42,21 +30,11 @@ html.h5p-iframe, html.h5p-iframe > body {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
-moz-box-sizing: border-box;
|
-moz-box-sizing: border-box;
|
||||||
}
|
}
|
||||||
.h5p-noselect
|
|
||||||
{
|
|
||||||
-khtml-user-select: none;
|
|
||||||
-ms-user-select: none;
|
|
||||||
-moz-user-select: none;
|
|
||||||
-webkit-user-select: none;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
html.h5p-iframe .h5p-content {
|
html.h5p-iframe .h5p-content {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
line-height: 1.5em;
|
line-height: 1.5em;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: auto;
|
height: auto;
|
||||||
-webkit-text-size-adjust: none;
|
|
||||||
text-size-adjust: none;
|
|
||||||
}
|
}
|
||||||
html.h5p-iframe .h5p-fullscreen .h5p-content,
|
html.h5p-iframe .h5p-fullscreen .h5p-content,
|
||||||
html.h5p-iframe .h5p-semi-fullscreen .h5p-content {
|
html.h5p-iframe .h5p-semi-fullscreen .h5p-content {
|
||||||
|
|
@ -120,22 +98,15 @@ body.h5p-semi-fullscreen {
|
||||||
line-height: 0.975em;
|
line-height: 0.975em;
|
||||||
font-size: 2em;
|
font-size: 2em;
|
||||||
width: 1.125em;
|
width: 1.125em;
|
||||||
height: 1em;
|
height: 0.925em;
|
||||||
text-indent: 0.04em;
|
text-indent: -0.0875em;
|
||||||
|
outline: none;
|
||||||
}
|
}
|
||||||
.h5p-disable-fullscreen {
|
.h5p-disable-fullscreen {
|
||||||
line-height: 0.925em;
|
line-height: 0.925em;
|
||||||
width: 1.1em;
|
width: 1.1em;
|
||||||
height: 0.9em;
|
height: 0.9em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.h5p-enable-fullscreen:focus,
|
|
||||||
.h5p-disable-fullscreen:focus {
|
|
||||||
outline-style: solid;
|
|
||||||
outline-width: 1px;
|
|
||||||
outline-offset: 0.25em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.h5p-enable-fullscreen:hover, .h5p-disable-fullscreen:hover {
|
.h5p-enable-fullscreen:hover, .h5p-disable-fullscreen:hover {
|
||||||
background: rgba(0,0,0,0.5);
|
background: rgba(0,0,0,0.5);
|
||||||
}
|
}
|
||||||
|
|
@ -176,11 +147,7 @@ div.h5p-fullscreen {
|
||||||
z-index: 20;
|
z-index: 20;
|
||||||
}
|
}
|
||||||
.h5p-iframe-wrapper iframe.h5p-iframe {
|
.h5p-iframe-wrapper iframe.h5p-iframe {
|
||||||
/* Hack for IOS landscape / portrait */
|
width: 100%;
|
||||||
width: 10px;
|
|
||||||
min-width: 100%;
|
|
||||||
*width: 100%;
|
|
||||||
/* End of hack */
|
|
||||||
height: 100%;
|
height: 100%;
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
@ -213,13 +180,13 @@ div.h5p-fullscreen {
|
||||||
background: none;
|
background: none;
|
||||||
padding: 0 0.75em 0 0.25em;
|
padding: 0 0.75em 0 0.25em;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
color: #707070;
|
color: #999;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
outline: none;
|
outline: none;
|
||||||
line-height: 22px;
|
line-height: 23px;
|
||||||
}
|
}
|
||||||
.h5p-actions > .h5p-button:hover {
|
.h5p-actions > .h5p-button:hover {
|
||||||
color: #333;
|
color: #666;
|
||||||
}
|
}
|
||||||
.h5p-actions > .h5p-button:active,
|
.h5p-actions > .h5p-button:active,
|
||||||
.h5p-actions > .h5p-button:focus,
|
.h5p-actions > .h5p-button:focus,
|
||||||
|
|
@ -236,13 +203,14 @@ div.h5p-fullscreen {
|
||||||
}
|
}
|
||||||
.h5p-actions > .h5p-button:before {
|
.h5p-actions > .h5p-button:before {
|
||||||
font-family: 'H5P';
|
font-family: 'H5P';
|
||||||
font-size: 20px;
|
font-size: 1em;
|
||||||
line-height: 23px;
|
|
||||||
vertical-align: bottom;
|
|
||||||
padding-right: 0;
|
padding-right: 0;
|
||||||
|
font-size: 1.7em;
|
||||||
|
line-height: 1.125em;
|
||||||
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
.h5p-actions > .h5p-button.h5p-export:before {
|
.h5p-actions > .h5p-button.h5p-export:before {
|
||||||
content: "\e90b";
|
content: "\e893";
|
||||||
}
|
}
|
||||||
.h5p-actions > .h5p-button.h5p-copyrights:before {
|
.h5p-actions > .h5p-button.h5p-copyrights:before {
|
||||||
content: "\e88f";
|
content: "\e88f";
|
||||||
|
|
@ -267,14 +235,13 @@ div.h5p-fullscreen {
|
||||||
}
|
}
|
||||||
.h5p-actions > li {
|
.h5p-actions > li {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
list-style: none;
|
|
||||||
}
|
}
|
||||||
.h5p-popup-dialog {
|
.h5p-popup-dialog {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-height: 100%;
|
height: 100%;
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
padding: 2em;
|
padding: 2em;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
@ -311,20 +278,13 @@ div.h5p-fullscreen {
|
||||||
padding: 0.325em 0.5em 0.25em;
|
padding: 0.325em 0.5em 0.25em;
|
||||||
line-height: 1.25em;
|
line-height: 1.25em;
|
||||||
border-bottom: 1px solid #ccc;
|
border-bottom: 1px solid #ccc;
|
||||||
z-index: 2;
|
|
||||||
}
|
}
|
||||||
.h5p-popup-dialog .h5p-inner > h2 > a {
|
.h5p-embed-dialog .h5p-inner {
|
||||||
font-size: 12px;
|
width: 300px;
|
||||||
margin-left: 1em;
|
|
||||||
}
|
|
||||||
.h5p-embed-dialog .h5p-inner,
|
|
||||||
.h5p-reuse-dialog .h5p-inner,
|
|
||||||
.h5p-content-user-data-reset-dialog .h5p-inner {
|
|
||||||
min-width: 316px;
|
|
||||||
max-width: 400px;
|
|
||||||
left: 50%;
|
left: 50%;
|
||||||
top: 50%;
|
top: 50%;
|
||||||
transform: translateX(-50%);
|
margin: 0 0 0 -150px;
|
||||||
|
transition: margin 250ms linear 100ms;
|
||||||
}
|
}
|
||||||
.h5p-embed-dialog .h5p-embed-code-container,
|
.h5p-embed-dialog .h5p-embed-code-container,
|
||||||
.h5p-embed-size {
|
.h5p-embed-size {
|
||||||
|
|
@ -360,14 +320,11 @@ div.h5p-fullscreen {
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
-moz-box-sizing: border-box;
|
-moz-box-sizing: border-box;
|
||||||
color: #555555;
|
height: 100%;
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
.h5p-popup-dialog.h5p-open .h5p-scroll-content {
|
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
height: 100%;
|
color: #555555;
|
||||||
}
|
}
|
||||||
.h5p-popup-dialog .h5p-scroll-content::-webkit-scrollbar {
|
.h5p-popup-dialog .h5p-scroll-content::-webkit-scrollbar {
|
||||||
width: 8px;
|
width: 8px;
|
||||||
|
|
@ -381,6 +338,11 @@ div.h5p-fullscreen {
|
||||||
}
|
}
|
||||||
.h5p-popup-dialog .h5p-close {
|
.h5p-popup-dialog .h5p-close {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
outline:none
|
||||||
|
}
|
||||||
|
.h5p-popup-dialog .h5p-close:after {
|
||||||
|
font-family: 'H5P';
|
||||||
|
content: "\e894";
|
||||||
font-size: 2em;
|
font-size: 2em;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
|
|
@ -391,11 +353,6 @@ div.h5p-fullscreen {
|
||||||
color: #656565;
|
color: #656565;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
text-indent: -0.065em;
|
text-indent: -0.065em;
|
||||||
z-index: 3
|
|
||||||
}
|
|
||||||
.h5p-popup-dialog .h5p-close:after {
|
|
||||||
font-family: 'H5P';
|
|
||||||
content: "\e894";
|
|
||||||
}
|
}
|
||||||
.h5p-popup-dialog .h5p-close:hover:after,
|
.h5p-popup-dialog .h5p-close:hover:after,
|
||||||
.h5p-popup-dialog .h5p-close:focus:after {
|
.h5p-popup-dialog .h5p-close:focus:after {
|
||||||
|
|
@ -426,6 +383,7 @@ div.h5p-fullscreen {
|
||||||
.h5p-expander {
|
.h5p-expander {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
font-size: 1.125em;
|
font-size: 1.125em;
|
||||||
|
outline: none;
|
||||||
margin: 0.5em 0 0;
|
margin: 0.5em 0 0;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
@ -478,148 +436,3 @@ div.h5p-fullscreen {
|
||||||
.h5p-dialog-ok-button:active {
|
.h5p-dialog-ok-button:active {
|
||||||
background: #eeffee;
|
background: #eeffee;
|
||||||
}
|
}
|
||||||
.h5p-big-button {
|
|
||||||
line-height: 1.25;
|
|
||||||
display: block;
|
|
||||||
position: relative;
|
|
||||||
cursor: pointer;
|
|
||||||
width: 100%;
|
|
||||||
padding: 1em 1em 1em 3.75em;
|
|
||||||
text-align: left;
|
|
||||||
border: 1px solid #dedede;
|
|
||||||
background: linear-gradient(#ffffff, #f1f1f2);
|
|
||||||
border-radius: 0.25em;
|
|
||||||
}
|
|
||||||
.h5p-big-button:before {
|
|
||||||
font-family: 'h5p';
|
|
||||||
content: "\e893";
|
|
||||||
line-height: 1;
|
|
||||||
font-size: 3em;
|
|
||||||
color: #2747f7;
|
|
||||||
position: absolute;
|
|
||||||
left: 0.125em;
|
|
||||||
top: 0.125em;
|
|
||||||
}
|
|
||||||
.h5p-copy-button:before {
|
|
||||||
content: "\e905";
|
|
||||||
}
|
|
||||||
.h5p-big-button:hover {
|
|
||||||
border: 1px solid #2747f7;
|
|
||||||
background: #eff1fe;
|
|
||||||
}
|
|
||||||
.h5p-big-button:active {
|
|
||||||
border: 1px solid #dedede;
|
|
||||||
background: #dfe4fe;
|
|
||||||
}
|
|
||||||
.h5p-button-title {
|
|
||||||
color: #2747f7;
|
|
||||||
font-size: 15px;
|
|
||||||
font-weight: bold;
|
|
||||||
margin-bottom: 0.5em;
|
|
||||||
}
|
|
||||||
.h5p-button-description {
|
|
||||||
color: #757575;
|
|
||||||
}
|
|
||||||
.h5p-horizontal-line-text {
|
|
||||||
border-top: 1px solid #dadada;
|
|
||||||
line-height: 1;
|
|
||||||
color: #474747;
|
|
||||||
text-align: center;
|
|
||||||
position: relative;
|
|
||||||
margin: 1.25em 0;
|
|
||||||
}
|
|
||||||
.h5p-horizontal-line-text > span {
|
|
||||||
background: white;
|
|
||||||
padding: 0.5em;
|
|
||||||
position: absolute;
|
|
||||||
top: -1em;
|
|
||||||
left: 50%;
|
|
||||||
transform: translateX(-50%);
|
|
||||||
}
|
|
||||||
.h5p-toast {
|
|
||||||
font-size: 0.75em;
|
|
||||||
background-color: rgba(0, 0, 0, 0.9);
|
|
||||||
color: #fff;
|
|
||||||
z-index: 110;
|
|
||||||
position: absolute;
|
|
||||||
padding: 0 0.5em;
|
|
||||||
line-height: 2;
|
|
||||||
border-radius: 4px;
|
|
||||||
white-space: nowrap;
|
|
||||||
pointer-events: none;
|
|
||||||
top: 0;
|
|
||||||
opacity: 1;
|
|
||||||
visibility: visible;
|
|
||||||
transition: opacity 1s;
|
|
||||||
}
|
|
||||||
.h5p-toast-disabled {
|
|
||||||
opacity: 0;
|
|
||||||
visibility: hidden;
|
|
||||||
}
|
|
||||||
.h5p-content code,
|
|
||||||
.h5peditor code {
|
|
||||||
color: #3d3d3d;
|
|
||||||
background: #e0e0e0;
|
|
||||||
border-radius: 2px;
|
|
||||||
padding: 0 5px;
|
|
||||||
}
|
|
||||||
.h5p-content pre > code,
|
|
||||||
.h5peditor pre > code {
|
|
||||||
background-color: #fafafa;
|
|
||||||
padding: 5px;
|
|
||||||
display: block;
|
|
||||||
line-height: normal;
|
|
||||||
border: 1px solid #c7c7c7;
|
|
||||||
border-left-width: 4px;
|
|
||||||
max-width: 100%;
|
|
||||||
white-space: pre;
|
|
||||||
overflow: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* This is loaded as part of Core and not Editor since this needs to be outside the editor iframe */
|
|
||||||
.h5peditor-semi-fullscreen {
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
z-index: 101;
|
|
||||||
}
|
|
||||||
iframe.h5peditor-semi-fullscreen {
|
|
||||||
background: #fff;
|
|
||||||
z-index: 100001;
|
|
||||||
}
|
|
||||||
|
|
||||||
.h5p-content.using-mouse *:not(textarea):focus {
|
|
||||||
outline: none !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.h5p-content-hub-button:before {
|
|
||||||
font-family: "h5p";
|
|
||||||
margin-right: 0.5em;
|
|
||||||
font-size: 0.7em;
|
|
||||||
line-height: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.h5p-content-hub-button.unpublish:before {
|
|
||||||
content: "\e916";
|
|
||||||
}
|
|
||||||
|
|
||||||
.h5p-content-hub-button.waiting:before,
|
|
||||||
.h5p-content-hub-button.sync:before {
|
|
||||||
content: "\e917";
|
|
||||||
}
|
|
||||||
|
|
||||||
.h5p-content-hub-button.waiting:before {
|
|
||||||
display: inline-block;
|
|
||||||
animation: rotate 2s linear infinite;
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes rotate {
|
|
||||||
to {
|
|
||||||
transform: rotate(360deg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue