Compare commits
7 Commits
JI-2176-tu
...
master
Author | SHA1 | Date |
---|---|---|
Ravi Majithia | c79f97a16f | |
Oliver Tacke | d3d003e978 | |
Ravi Majithia | 22115c0aea | |
Erik Langhaug | aaf26d584b | |
Frode Petterson | eeefc1228b | |
Oliver Tacke | a80773e8d6 | |
Oliver Tacke | ce373203b0 |
|
@ -704,15 +704,15 @@ class H5PValidator {
|
|||
'source' => '/^(http[s]?:\/\/.+)$/',
|
||||
'license' => '/^(CC BY|CC BY-SA|CC BY-ND|CC BY-NC|CC BY-NC-SA|CC BY-NC-ND|CC0 1\.0|GNU GPL|PD|ODC PDDL|CC PDM|U|C)$/',
|
||||
'licenseVersion' => '/^(1\.0|2\.0|2\.5|3\.0|4\.0)$/',
|
||||
'licenseExtras' => '/^.{1,5000}$/',
|
||||
'licenseExtras' => '/^.{1,5000}$/s',
|
||||
'yearsFrom' => '/^([0-9]{1,4})$/',
|
||||
'yearsTo' => '/^([0-9]{1,4})$/',
|
||||
'changes' => array(
|
||||
'date' => '/^[0-9]{2}-[0-9]{2}-[0-9]{2} [0-9]{1,2}:[0-9]{2}:[0-9]{2}$/',
|
||||
'author' => '/^.{1,255}$/',
|
||||
'log' => '/^.{1,5000}$/'
|
||||
'log' => '/^.{1,5000}$/s'
|
||||
),
|
||||
'authorComments' => '/^.{1,5000}$/',
|
||||
'authorComments' => '/^.{1,5000}$/s',
|
||||
'w' => '/^[0-9]{1,4}$/',
|
||||
'h' => '/^[0-9]{1,4}$/',
|
||||
// deprecated
|
||||
|
@ -2083,7 +2083,7 @@ class H5PCore {
|
|||
'js/h5p-utils.js',
|
||||
);
|
||||
|
||||
public static $defaultContentWhitelist = 'json png jpg jpeg gif bmp tif tiff svg eot ttf woff woff2 otf webm mp4 ogg mp3 m4a wav txt pdf rtf doc docx xls xlsx ppt pptx odt ods odp xml csv diff patch swf md textile vtt webvtt';
|
||||
public static $defaultContentWhitelist = 'json png jpg jpeg gif bmp tif tiff svg eot ttf woff woff2 otf webm mp4 ogg mp3 m4a wav txt pdf rtf doc docx xls xlsx ppt pptx odt ods odp xml csv diff patch swf md textile vtt webvtt gltf glb';
|
||||
public static $defaultLibraryWhitelistExtras = 'js css';
|
||||
|
||||
public $librariesJsonData, $contentJsonData, $mainJsonData, $h5pF, $fs, $h5pD, $disableFileCheck;
|
||||
|
@ -3736,7 +3736,8 @@ class H5PCore {
|
|||
'copyrightWarning' => $this->h5pF->t('Copyrighted material cannot be shared in the H5P Content Hub. If the content is licensed with a OER friendly license like Creative Commons, please choose the appropriate license. If not this content cannot be shared.'),
|
||||
'keywordsExits' => $this->h5pF->t('Keywords already exists!'),
|
||||
'someKeywordsExits' => $this->h5pF->t('Some of these keywords already exist'),
|
||||
|
||||
'width' => $this->h5pF->t('width'),
|
||||
'height' => $this->h5pF->t('height')
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -1348,7 +1348,7 @@ H5P.openReuseDialog = function ($element, contentData, library, instance, conten
|
|||
*/
|
||||
H5P.openEmbedDialog = function ($element, embedCode, resizeCode, size, instance) {
|
||||
var fullEmbedCode = embedCode + resizeCode;
|
||||
var dialog = new H5P.Dialog('embed', H5P.t('embed'), '<textarea class="h5p-embed-code-container" autocorrect="off" autocapitalize="off" spellcheck="false"></textarea>' + H5P.t('size') + ': <input type="text" value="' + Math.ceil(size.width) + '" class="h5p-embed-size"/> × <input type="text" value="' + Math.ceil(size.height) + '" class="h5p-embed-size"/> px<br/><div role="button" tabindex="0" class="h5p-expander">' + H5P.t('showAdvanced') + '</div><div class="h5p-expander-content"><p>' + H5P.t('advancedHelp') + '</p><textarea class="h5p-embed-code-container" autocorrect="off" autocapitalize="off" spellcheck="false">' + resizeCode + '</textarea></div>', $element);
|
||||
var dialog = new H5P.Dialog('embed', H5P.t('embed'), '<textarea class="h5p-embed-code-container" autocorrect="off" autocapitalize="off" spellcheck="false"></textarea>' + H5P.t('size') + ': <input aria-label="'+ H5P.t('width') +'" type="text" value="' + Math.ceil(size.width) + '" class="h5p-embed-size"/> × <input aria-label="'+ H5P.t('width') +'" type="text" value="' + Math.ceil(size.height) + '" class="h5p-embed-size"/> px<br/><div role="button" tabindex="0" class="h5p-expander">' + H5P.t('showAdvanced') + '</div><div class="h5p-expander-content"><p>' + H5P.t('advancedHelp') + '</p><textarea class="h5p-embed-code-container" autocorrect="off" autocapitalize="off" spellcheck="false">' + resizeCode + '</textarea></div>', $element);
|
||||
|
||||
// Selecting embed code when dialog is opened
|
||||
H5P.jQuery(dialog).on('dialog-opened', function (event, $dialog) {
|
||||
|
|
|
@ -55,6 +55,8 @@ html.h5p-iframe .h5p-content {
|
|||
line-height: 1.5em;
|
||||
width: 100%;
|
||||
height: auto;
|
||||
-webkit-text-size-adjust: none;
|
||||
text-size-adjust: none;
|
||||
}
|
||||
html.h5p-iframe .h5p-fullscreen .h5p-content,
|
||||
html.h5p-iframe .h5p-semi-fullscreen .h5p-content {
|
||||
|
|
Loading…
Reference in New Issue