Skip to content

Commit

Permalink
JI-5408 update wordpress branch (#181)
Browse files Browse the repository at this point in the history
* Allow the dependency path to be overridden by child classes

This allows an implementor to choose how the library is served.

* Revert "Allow the dependency path to be overridden by child classes"

* Allow the dependency path to be overridden by child classes

This allows an implementor to choose how the library is served.

* Add Travis for all supported PHP versions

* Revert "Revert "Allow the dependency path to be overridden by child classes""

This reverts commit 87f6f3c.

* Remove incompatible code

* JI-1497 Add audio icon to H5P core font

* Change lint check to report fails correctly

* Remove type-hint from h5p.classes

* Add jQuery 3.5.1

* Add gltf to list of allowed file extensions

* Add binary variant of glTF files

glTF files can also be compressed making them smaller

* Add backwards compatibility for old libraries using jQuery's .load()

* Change fallback to original jquery .load() if first arg is not a function

* HFP-3006 Change contrast for iframe action buttons

* Add content hub and a11y changes from Drupal git

See Drupal 7 git for git history for these commits.

* Remove unused font

* Fix missing merge from Drupal git

* Reverts content hub interface change

Moved content hub changes to its own feature branch until it is ready to be implemented for all plugins

* HFP-3008 Add content language to iframe document

* HFP-3048 Add UI for getting content data

+ Update sharing UI

* HFP-3048 Add support for updating existing content

* HFP-3040 Move account registration logic into core

* Add separate trigger to trigger content sync

* Update translations and sharing UI

* Update sharing UI

* HFP-3092 Update sharing ui

* HFP-3095 Add error message if unable to contact hub

Fix translation
Update hub registration ui

* HFP-3095 Throw error if retrieving content from hub failed

* HFP-3102 Add error handling for the content hub

* HFP-3108 Adjust translations

Removed duplicate strings

* HFP-3107 Add UI strings for remove and removeImage

* HFP-3109 Update hub sharing ui

* HFP-3049 Add UI strings for cancel publish dialog

* JI-1923 Change title text of registration ui

* JI-1923 Rename 'Hub' -> 'H5P Hub'

* HFP-3120 Add UI string for content hub disciplines

* JI-1958 Add UI string needed

* Fix syntax error

* Update to latest version of registration/sharing UI

* Revert "Reverts content hub interface change"

This reverts commit 16c71b4.

* Fix cleanup after reverting revert

* Fix using Core language

* Revert "Fix using Core language"

This reverts commit 4d7dcca.

* Update sharing UI

* Update Sharing UI

* Add support for 404 when trying to update content

* Remove token validation from Core

Causes issues for other platforms.

* Remove token validation from Core

Causes issues for other platforms.

* Update Hub Sharing + Registration clients

* JI-2081 Add translations

Move token verification to the individual integrations
Add error message to UI if logo validation fails

* Update Core font to include hub molecule icon

* HFP-3089 Update registration UI + translations

* Update hub sharing ui

* JI-2271 Add translations for the content hub

* JI-2271 Update hub sharing ui

* HFP-3232 Change placeholder text for disciplines selector

* HFP-3233 Add hub sharing ui keyword tip strings

* HFP-3234 Adjust notification text when content is shared

* Update sharing ui

* Update hub sharing ui

* JI-2366 Update sharing UI

* JI-2359 Update sharing UI

* JI-2366 Update hub sharing UI

* Update to use production content hub api

* Update hub sharing

* Update keywords description text

Fixes issue 5 from Hub review april

* Fix iframe for back button in Edge Chromium

When navigating to the previous page in Edge Chromium the H5P would often break due to it not being loaded when the page is ready. This fix will force a reload of the iframe if it is broken on initialization.

* Fix check/use of incorrect API function

This will solve fullscreen issues in Firefox

* Fix using undefined $ function

* JI-2176 Add new icons for tutorial and example links

* JI-2176 Fix incorrect paths to h5p font files

* JI-2899 Add aria label to width and height for embed popup (#110)

* HFP-3465 Fix line breaks breaking metadata field validation (#109)

* Fix linebreaks breaking metadata field validation
* HFP-3465 Use "single line" flag for regexp

* JI-2872 Fix h5p content font size in safari ios devices (#114)

* Fix double prefix when copying copy pasted content

* JI-1127 Stop import google fonts remotely
Fix #116

* JI-1127 Add License text

* Simplify code (#120)

Resize is triggered unconditionally regardless of the state of 
`H5P.isFullscreen`

* JI-3494 Add fonts to the core library (#123)

* JI-3494 Add fonts to the core library
- Added latest version of the font
- Remove unnecessary font files
- Upgrade the way it was included

* JI-3494 Make font available

* JI-3494 Fix remove unwanted inclusion of font file

* JI-3485 Include patch version in library folder name (in storage)

* JI-3485 Add support for deleting previous minor version library

* JI-3485 Fix overwriting `$new` when comparing patch versions

* Stop supporting PHP 5

* Fix Chrome fullscreen error (#113)

When embedding h5p and using the fullscreen enter/exit feature, Chrome can produce the following error:
TypeError: 'caller', 'callee', and 'arguments' properties may not be accessed on strict mode functions or the arguments objects for calls to them
    at HTMLDocument.<anonymous> 

This happens because arguments.callee is not accessible. To fix this, it is sufficient to name the anonymous callback function and reference it by name.

* JI-3577 Fix upgradescript for params that are null instead of undefined

* HFP-3542 Change alt text in copyright thumbnail

* HFP-3542 Give image empty alt text

* HFP-3573 Include exitButton in the tab flow

* HFP-3563 Fix Rights of Use focus and aria

* HFP-3564 Add button inside <li> for aria

* HFP-3535 H5P toolbar buttons contrast issue

* HFP-3573 Replace deprecated attribute

* HFP-3564 Change span to button

* HFP-3564 Make cursor pointer on action button

* HFP-3564 Fix indentation

* HFP-3548 Implement H5P.Tooltip (#132)

* HFP-3548 Implement H5P.Tooltip

* HFP-3548 Improve code and avoid duplication

* HFP-3548 Implement configurable position for tooltip

* HFP-3548 Add positional css to tooltip

* HFP-3548 Change tooltip on aria-label change

* HFP-3548 Add H5P.Tooltip support for Firefox

* HFP-3548 Dynamically change options.text

* HFP-3548 Remove unneccesary EventDispatcher

* HFP-3548 Prevent propogation of clicks on tooltip

* HFP-3548 Use document.body if in editor

* HFP-3548 Fix universal state bug

* HFP-3548 Remove dependency on known container

* HFP-3548 Minor fixes

* HFP-3548 Prevent overlap when adjusting

* HFP-3548 Increase z-index for tooltip

Co-authored-by: Paal Joergensen <[email protected]>

* HFP-3584 H5P actionbar: Fix semantics + stop using title (#133)

* HFP-3548 Implement H5P.Tooltip

* HFP-3548 Improve code and avoid duplication

* HFP-3548 Implement configurable position for tooltip

* HFP-3548 Add positional css to tooltip

* HFP-3584 Add accessible tooltip to action-bar

Co-authored-by: Pål Jørgensen <[email protected]>

* HFP-3584 Fix tooltip on actionbar

* Avoid PHP8 warning

* Remove unused parameter for libraryToString

* Improve how regexp filter works

* Fix existing library check when saving libraries

* Fixed dynamic properties deprecation in PHP 8.2 (#146)

* CH-147 Improve error messages

* JI-4911 Add support for account removed on hub

* JI-4911 Fix improved hub account removal

* Revert "JI-4911 Fix improved hub account removal"

This reverts commit b4b1df3.

* Revert "JI-4911 Add support for account removed on hub"

This reverts commit 079191e.

* JI-5135 fix confirmation dialog double screen read (#151)

* Ji 5135 fix confirmation dialog double screenread (#152)

* JI-5135 fix confirmation dialog double screen read

* JI-5135 read popup header once

* JI-5135 remove unused id

* JI-5135 revert changes (#156)

* JI-5135 revert changes

* JI-5135 tweak comment

* Add helper H5P.isEmpty

* Bump core API minor version

* Fix dynamic properties deprecation warning in v8.2 (#148)

This is a continuation of the work to avoid dynamic property depreciation warnings in PHP 8.2

* TypeError: count(): Argument #1 ($value) must be of type Countable|array, string given (#121)

* fix: Fixed PHP8 compatibility

TypeError: count(): Argument #1 ($value) must be of type Countable|array, string given

* fix: Fixed (TypeError) PHP8 compatibility

TypeError: count(): Argument #1 ($value) must be of type Countable|array, string given

* JI-5682 add cropper translations

* JI-6152 add fonts to h5p core that are used by drag and drop widget (#177)

Co-authored-by: William Almnes <[email protected]>

* JI-6295 Fix invalid folder name in H5P export file

* JI-6286 add changes to file upload

* HFP-3875 Add icons for expand and collapse (#176)

* HFP-3875 Add icons for expand and collapse

* HFP-3875 Use font file provided by UX

* HFP-3875 Clean up font assets

---------

Co-authored-by: Andrew Nicols <[email protected]>
Co-authored-by: Thomas <[email protected]>
Co-authored-by: Pål Jørgensen <[email protected]>
Co-authored-by: Frode Petterson <[email protected]>
Co-authored-by: Oliver Tacke <[email protected]>
Co-authored-by: Erik Langhaug <[email protected]>
Co-authored-by: Hannaes <[email protected]>
Co-authored-by: Ravi Majithia <[email protected]>
Co-authored-by: j0kerZ <[email protected]>
Co-authored-by: Alex Kennberg <[email protected]>
Co-authored-by: Lars-Magnus Underhaug <[email protected]>
Co-authored-by: Zouhair Loucif <[email protected]>
Co-authored-by: Meirza <[email protected]>
Co-authored-by: makmentins <[email protected]>
Co-authored-by: devland <[email protected]>
Co-authored-by: Erik Langhaug <[email protected]>
Co-authored-by: Sagar Desai <[email protected]>
Co-authored-by: devland <[email protected]>
Co-authored-by: William Almnes <[email protected]>
Co-authored-by: William Almnes <[email protected]>
Co-authored-by: Lars-Magnus Underhaug <[email protected]>
  • Loading branch information
22 people authored May 21, 2024
1 parent c265346 commit a927307
Show file tree
Hide file tree
Showing 57 changed files with 3,540 additions and 199 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_Store
vendor
*~
.idea
.idea
40 changes: 40 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
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
4 changes: 4 additions & 0 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ See existing implementations for details. For instance the Drupal H5P module loc
We will make available documentation and tutorials for creating platform integrations in the future.

The H5P PHP library is GPL licensed due to GPL code being used for purifying HTML provided by authors.

## License

Open Sans font is licensed under Apache license, Version 2.0
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}
],
"require": {
"php": ">=5.3.0"
"php": ">=7.0.0"
},
"autoload": {
"files": [
Expand Down
Binary file removed fonts/h5p-core-23.eot
Binary file not shown.
62 changes: 0 additions & 62 deletions fonts/h5p-core-23.svg

This file was deleted.

Binary file removed fonts/h5p-core-23.ttf
Binary file not shown.
Binary file removed fonts/h5p-core-23.woff
Binary file not shown.
Binary file added fonts/h5p-core-29.eot
Binary file not shown.
599 changes: 599 additions & 0 deletions fonts/h5p-core-29.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fonts/h5p-core-29.ttf
Binary file not shown.
Binary file added fonts/h5p-core-29.woff
Binary file not shown.
Binary file added fonts/h5p-core-29.woff2
Binary file not shown.
Binary file added fonts/h5p-core-30.eot
Binary file not shown.
123 changes: 123 additions & 0 deletions fonts/h5p-core-30.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fonts/h5p-core-30.ttf
Binary file not shown.
Binary file added fonts/h5p-core-30.woff
Binary file not shown.
Binary file added fonts/h5p-core-30.woff2
Binary file not shown.
Binary file added fonts/h5p-hub-publish.eot
Binary file not shown.
38 changes: 38 additions & 0 deletions fonts/h5p-hub-publish.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fonts/h5p-hub-publish.ttf
Binary file not shown.
Binary file added fonts/h5p-hub-publish.woff
Binary file not shown.
202 changes: 202 additions & 0 deletions fonts/open-sans/LICENSE-2.0.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit a927307

Please sign in to comment.