Commit Graph

545 Commits (master)

Author SHA1 Message Date
Oliver Tacke e241ec6963 HFP-1905 Fix for LibraryNames with many elements 2018-06-28 18:36:58 +02:00
Oliver Tacke 14bcb913b7 HFP-1905 Include metadata in findCopyrights 2018-06-28 18:21:30 +02:00
Frode Petterson 1605581608 Merge branch 'copy-paste' into HFP-1905-metadata-system 2018-06-27 13:42:13 +02:00
Frode Petterson d24fd0e667 HFP-2072 Improve copy-paste API behavior 2018-06-26 11:52:57 +02:00
Frode Petterson b1446e8d60 HFP-2027 Add copy paste helpers to core 2018-06-25 15:59:17 +02:00
Oliver Tacke d113809e80 HFP-1905 Fix source and link in copyright view 2018-06-25 14:14:13 +02:00
Oliver Tacke 17162f32ef HFP-2052 Fix undefined source 2018-06-20 16:25:27 +02:00
Oliver Tacke e179ec2934 HFP-2052 Make changes requested in UX review
- Add link for source
- Change URLs for licenses
2018-06-13 16:41:49 +02:00
Oliver Tacke 367763a215 Merge remote-tracking branch 'origin/master' into HFP-1905-metadata-system 2018-06-05 13:07:01 +02:00
Oliver Tacke 0fbc6ef5a8 HFP-1905 Fix potential undefined values 2018-06-01 17:44:21 +02:00
Oliver Tacke 8f45ea4d79 HFP-1905 Fix finding copyright edge case bug 2018-06-01 15:45:09 +02:00
thomasmars 3ce0adf418 HFP-1942 Add crossorigin api call.
Update minor version of core since interface changes
2018-06-01 11:09:45 +02:00
Oliver Tacke 3deda27f9b HFP-1898 Move mocked semantics to backend 2018-05-25 18:38:42 +02:00
Frode Petterson 942a083afa JI-575 Fix content upgrade script 2018-05-16 15:16:34 +02:00
Frode Petterson 022695ac74 JI-575 Add support for file aggregation 2018-05-03 10:27:06 +02:00
Oliver Tacke 58597460f6 HFP-1905 Fix updating for scripts with old update functions
"params" (and "extras", e.g. metadata) flow through each update function
and are changed if necessary. Since "extras" was added later and old
update functions don't return it, we need to ignore undefined values
-- or change every single update function in all content types.
2018-04-09 11:43:48 +02:00
Oliver Tacke fbc21f6368 HFP-1905 Remove console output 2018-04-05 17:22:31 +02:00
Oliver Tacke ef063ce5cb HFP-1905 Fix image in "rights of use" view 2018-04-05 17:17:56 +02:00
Oliver Tacke 83e3c58ba3 HFP-1943 Include metadata information in "rights of use" popup
Add copyright information of main content in popup
Add copyright information of subcontent in popup
HFP-1902 is intended to make the styling better
2018-04-04 15:46:30 +02:00
Oliver Tacke 95d99d0ad3 HFP-1905 Add update functionality for metadata 2018-04-03 15:17:46 +02:00
Oliver Tacke 011c7df675 HFP-1905 Add metadata to contentData 2018-03-16 20:11:08 +01:00
Frode Petterson f090e651e1 HFP-1405 Fix targeting wrong parent iframe element
Just in case there are two elements with the same ID avoid misbehaving
2017-08-23 12:44:15 +02:00
Paal Joergensen 7c3a322fda HFP-1317 Made library detail pager behave good 2017-08-07 16:38:09 +02:00
Frode Petterson f112f761c3 Prevent JS error when no pager is available 2017-08-04 11:04:10 +02:00
Frode Petterson 0dddbf654e Merge branch 'master' into release 2017-08-02 13:10:27 +02:00
Frode Petterson b1531bcbc0 Add support for temporary file suffix
HFP-1100
2017-07-07 10:51:57 +02:00
thomasmars f07ce1b3c3 Merge branch 'master' of https://github.com/h5p/h5p-php-library 2017-06-22 10:56:42 +02:00
thomasmars d2746b18b4 Make fullscreen button keyboard accessible
HFP-1199
2017-06-22 10:56:15 +02:00
Tom Arild Jakobsen 9ea6f277e1 Merge branch 'master' of github.com:h5p/h5p-php-library into HFP-574-remove-override-settings 2017-06-07 11:49:47 +02:00
Frode Petterson 278586ef58 Add forgotten symbol 2017-06-06 14:21:18 +02:00
Frode Petterson 3192f0fe19 Add default license when no version is selected 2017-06-06 13:51:51 +02:00
Frode Petterson aaa0861355 Fix copyright not being display processes correctly
HFP-1079
2017-05-31 09:33:10 +02:00
Frode Petterson 9adc92d3c4 Move license definition for localization to work
HFP-1079
2017-05-30 15:43:26 +02:00
Frode Petterson 59fd08594f Support localized licenses
HFP-1079
2017-05-30 15:23:25 +02:00
Frode Petterson 42e0c99fd3 Add version info to license
HFP-1079
2017-05-30 14:12:22 +02:00
Tom Arild Jakobsen 87bd3c7e11 Resize h5p container instead of body by default. HFP-574 2017-05-11 17:09:44 +02:00
Tom Arild Jakobsen 481322e6ae Deprecate 'overrideSettings'
* Deprecate and log warning to console when 'overrideSettings' is used
 * Change confirmation dialog be 'fixed' e.g relative to viewport instead of
   and arbitrary relative parent element
 * Same for the overlay mask
 * Set minimum height on body element, to fit confirmation dialog
 * Remove the minimum height on close dialog

Fixes HFP-574
2017-05-08 14:17:29 +02:00
Tom Arild Jakobsen 86ee19905e Fix confirmation dialog confirm icon
* Position icon up a bit
 * Fix icon not showing in IE at all

Relates to: HFP-889
2017-04-07 10:28:17 +02:00
otacke bd83ddc5e7 make actionbar buttons unselectable 2017-03-31 13:36:40 +02:00
thomasmars a32f210188 Fixed enable hub button state after confirming dialog
HFP-502
2017-02-23 14:22:56 +01:00
thomasmars aa861fc8ce Make disable hub, into enable hub to match the checkbox state.
Implemented write access check
HFP-502
2017-02-23 14:20:56 +01:00
thomasmars 46d4d403f4 Added default selectors for disable hub elements.
HFP-503
2017-02-21 20:01:30 +01:00
thomasmars c4affb23dd Added confirmation dialog functionality when disabling hub.
Refactored server setup check into check and var updates.
Moved bytes string parsing out of server setup check and fixed naming convention.
Fixed indentation to match library core instead of Moodle style.
2017-02-21 17:37:01 +01:00
Frode Petterson c4b88c3992 Add reveling field support for settings
HFP-495
2017-02-20 15:06:42 +01:00
Frode Petterson bb71ea20a3 Update JSDoc 2017-02-07 13:48:42 +01:00
Frode Petterson b555e4d7a4 Merge branch 'master' of github.com:h5p/h5p-php-library 2017-02-06 14:40:56 +01:00
Frode Petterson 26d0a3a341 Double check that contents settings exist
… before using them.
HFP-714
2017-02-06 14:39:59 +01:00
Frode Petterson 39d7ddc6b8 Merge branch 'master' of github.com:h5p/h5p-php-library 2017-01-31 13:36:32 +01:00
Frode Petterson e548b3575f Add custom xAPI events for action toolbar buttons 2017-01-31 13:35:23 +01:00
Paal Joergensen 6ab68eb6e2 Minor cleaning 2017-01-30 08:43:47 +01:00
Paal Joergensen 6e135d0319 Merge branch 'release' into improved-file-handling 2017-01-11 16:21:15 +01:00
Paal Joergensen 738dced286 Added utility function for figuriong out if event is from child [HFP-436] 2017-01-04 16:16:28 +01:00
Paal Joergensen 20042fba85 Merge branch 'master' into improved-file-handling 2016-12-21 13:34:06 +01:00
Paal Joergensen 671c079eee Merge branch 'improved-embed-and-download' 2016-12-21 13:21:39 +01:00
thomasmars e2634070d4 Ignore overrideSettings parameter fields.
HFP-391
2016-12-21 11:34:51 +01:00
Timothy Lim b91be29cec Add return statement to recursive function
HFP-391
2016-12-20 15:46:36 +01:00
Paal Joergensen 117e1457b7 Merge branch 'master' into improved-embed-and-download 2016-12-20 14:37:52 +01:00
Paal Joergensen 1341768c90 Fixed problem with empty actionbar [HFP-277] 2016-12-20 14:37:31 +01:00
Paal Joergensen 87ec43d687 Using constants for the different display options, and avoid special cases [HFP-277] 2016-12-16 14:22:03 +01:00
Paal Joergensen a1e68d212b Updated comments [HFP-277] 2016-12-16 11:38:47 +01:00
Paal Joergensen 526d7ddd7e Made copyright button being shown [HFP-277] 2016-12-16 11:30:59 +01:00
Timothy Lim 28e34c1c09 Simplify fullscreenSupported
HFP-339
2016-12-14 16:21:42 +01:00
Timothy Lim bbe16fb8da Revert changes for canHasFullScreen
HFP-339
2016-12-13 19:46:21 +01:00
Timothy Lim f0d65d4f9d Refactor canHasFullscreen
HFP-339
2016-12-13 16:04:57 +01:00
Timothy Lim 52dc1b2a81 Refactor canHasFullScreen
HFP-339
2016-12-13 10:33:11 +01:00
Paal Joergensen 0a23dc043d Download and embed granularity (HFP-277) 2016-12-13 10:29:33 +01:00
Timothy Lim a4d6f3aaab Restore deprecated variable H5P.canHasFullScreen for backwards compatability
HFP-339
2016-12-12 11:28:59 +01:00
thomasmars d76ce3f3a5 Applied fix for Safari full screen in version > 9
Big thanks to Lest@t at Drupal for providing the patch.
HFP-342
2016-12-12 11:22:34 +01:00
thomasmars d100c5102a Merge branch 'release' into ignoreBuildFiles 2016-12-02 13:47:21 +01:00
thomasmars 5ec651e696 Merge branch 'release' into ignoreBuildFiles 2016-11-30 13:24:33 +01:00
Paal Joergensen ed1fb00745 Merge branch 'release' into improved-file-handling 2016-11-30 11:19:08 +01:00
Pål Jørgensen ece72fcfbe Merge pull request #32 from h5p/semi-fullscreen-api-function
Added semi fullscreen function
2016-11-30 09:40:17 +01:00
Tom Arild Jakobsen 5494443533 validateGroup must handle isSubContent
* Update validateGroup in h4p.classes.php to allow subContentId into the data
 * Fix h5p-content-upgrade-process.js to take into account isSubContent

Relates to: #HFP-285
2016-11-29 15:44:32 +01:00
thomasmars 9b0d77a721 Check instanceof score as well to validate number.
HFP-215
2016-11-19 12:29:38 +01:00
thomasmars f82f3a354c Removed debug
HFP-86
2016-11-17 13:27:41 +01:00
thomasmars d55134151c Moved registering of external dispatcher listener.
- This will dispatch events that are dispatched inside the constructor of
  content types
HFP-86
2016-11-17 12:56:15 +01:00
Paal Joergensen 6001b68b99 Making naming harder to misunderstand 2016-11-11 11:57:54 +01:00
Paal Joergensen 7e90871cb7 Fixing typo 2016-11-11 11:51:20 +01:00
Paal Joergensen 96f84a430a Added semi fullscreen function 2016-11-11 11:45:59 +01:00
Frode Petterson 1173341b76 Merge branch 'release' into improved-file-handling 2016-11-01 16:30:32 +01:00
thomasmars 426f51caa0 Check that score is a number before storing it to the database.
HFP-173

(cherry picked from commit bae3145)
2016-10-28 13:49:03 +02:00
thomasmars b4949c0d83 Don't store results if they have no score.
HFP-173

(cherry picked from commit 516c70a)
2016-10-28 10:46:40 +02:00
Frode Petterson c88c049438 Check if contents is set before using
h5p/h5p-moodle-plugin#112
2016-09-09 09:19:55 +02:00
Frode Petterson e8f90c9116 Allow overriding of content URLs
h5p/h5p-moodle-plugin#112
2016-09-08 16:34:53 +02:00
Frode Petterson d946f32b81 Merge branch 'master' into improved-file-handling 2016-08-02 13:37:26 +02:00
Frode Petterson 9f7b545f02 Added lost part of old fix
HVP-212
2016-07-15 16:14:32 +02:00
Frode Petterson 61219a7d84 Merge branch 'master' into improved-file-handling 2016-07-14 10:29:30 +02:00
Frode Petterson a6656c2e6f Support for when cookies are disabled
HFJ-1915
2016-06-20 14:57:14 +02:00
Frode Petterson ba2f7c5e67 Merge branch 'release' into improved-file-handling 2016-06-15 10:34:34 +02:00
Frode Petterson ec2e0fbb71 Removed JS error on empty results 2016-06-13 14:46:15 +02:00
Frode Petterson fca0537a4d Use context and token in URL prefix 2016-06-13 10:31:09 +02:00
Frode Petterson 5e87aee63c Merge branch 'release' into improved-file-handling 2016-06-13 09:58:18 +02:00
Thomas Marstrander b3c55928e3 Remove tabindex of exitButton in confirmation dialog.
Trapped focus between confirm and cancel button.
HFJ-2004
2016-06-09 15:26:15 +02:00
Thomas Marstrander 51851f14c3 Use aria-labelledby to describe dialog, instead of alert.
HFJ-2003
2016-06-09 13:18:09 +02:00
Thomas Marstrander e10594fb49 Hide redundant confirmation dialog exit button for assistive technologies.
HFJ-2004
2016-06-09 11:26:11 +02:00
Thomas Marstrander 8615deb23b Hide elements that confirmation dialog covers from assistive technologies.
HFJ-1995
2016-06-08 11:06:03 +02:00
Thomas Marstrander 10e1a7ba65 Use DOM Level 2 events.
HFJ-1999
2016-06-07 15:09:59 +02:00
Thomas Marstrander 8bd9e9c2db Merge remote-tracking branch 'origin/release' into release 2016-06-07 14:32:12 +02:00
Thomas Marstrander 77fb832221 Added focus capturing, redirecting it to the open confirmation dialog
HFJ-1995
2016-06-07 14:31:41 +02:00
Frode Petterson b261754cf1 Merge branch 'release' into improved-file-handling 2016-06-07 14:28:12 +02:00
Frode Petterson 2ebc9225ee Merge branch 'release' of github.com:h5p/h5p-php-library into release 2016-06-07 12:58:40 +02:00
Paal Joergensen f4cee6e284 Moved deletion of content user data to after dialog is closed [HFJ-1989] 2016-06-07 11:09:42 +02:00
Thomas Marstrander 87658ed42b Accessibility - reads confirmation dialog text on show.
HFJ-1992
2016-06-07 11:04:21 +02:00
Paal Joergensen 7807b8af68 Making sure reset dialog is only shown once [HFJ-1989] 2016-06-06 16:09:35 +02:00
Thomas Marstrander e3b29a2199 Accessibility - reads confirmation dialog text on show.
HFJ-1992
2016-06-06 14:57:51 +02:00
Thomas Marstrander ed13203254 Use buttons instead of anchors in Confirmation Dialog.
HFJ-1930
(cherry picked from commit 27bc158)
2016-06-06 09:47:15 +02:00
Thomas Marstrander 93a07d2e9b Merge branch 'improved-file-handling' of https://github.com/h5p/h5p-php-library into improved-file-handling 2016-05-31 14:43:34 +02:00
Thomas Marstrander b102a7de21 Only add editor context when in editor.
HFJ-1972
2016-05-31 14:43:12 +02:00
Frode Petterson 594d992f19 Merge branch 'master' into improved-file-handling 2016-05-31 12:42:29 +02:00
Thomas Marstrander eba774c863 Prevent DOM pollution when having many confirmation dialogs.
Append confirmation dialog on show and detach it on hide.
HFJ-1969
(cherry picked from commit 0a63d12)
2016-05-31 11:49:26 +02:00
Thomas Marstrander 0a63d123cf Prevent DOM pollution when having many confirmation dialogs.
Append confirmation dialog on show and detach it on hide.
HFJ-1969
2016-05-31 10:19:07 +02:00
Thomas Marstrander 73a23d4679 Send context id together with post data in order to determine our context.
HFJ-1964
2016-05-30 10:35:06 +02:00
Thomas Marstrander 27bc158708 Use buttons instead of anchors in Confirmation Dialog.
HFJ-1930
2016-05-23 14:34:56 +02:00
Paal Joergensen 2c4edb7b56 Merge branch 'master' into release 2016-05-13 14:56:40 +02:00
Thomas Marstrander e412c3a228 Make sure focus is set after timeout, to not skewer content.
HFJ-1867
2016-05-04 12:37:59 +02:00
Thomas Marstrander 7782b19e99 Do not set offset initially, sometimes ended up overflowing parent element.
Do calculation before setting popup offset.
HFJ-1867
2016-05-04 11:53:46 +02:00
Frode Petterson acaccea977 Allow pagination widget to handle empty pages 2016-05-03 12:47:16 +02:00
Thomas Marstrander 6e7e144900 Confirmation dialog - Focus confirm button on show.
HFJ-1860
2016-05-03 11:15:21 +02:00
Thomas Marstrander 8a6733ceb4 Specified confirmation dialog css rules so they wont get overwritten by standard anchor styling.
Enabled iframe resize functionality for confirmation dialog.
HFJ-1572
2016-04-25 13:17:24 +02:00
Thomas Marstrander 926ff4af3a Avoid confirmation dialog skewering content.
HFJ-1572
2016-04-21 14:58:21 +02:00
Paal Joergensen 6869ecbb09 Handling several digits in major and minor version 2016-04-21 13:22:01 +02:00
Frode Petterson e26a662341 Merge branch 'release' 2016-04-12 15:06:30 +02:00
Frode Petterson b93b7082dc Reset page offset when filtering by facets 2016-04-12 15:01:10 +02:00
Frode Petterson 84d93af447 Merge branch 'master' of github.com:h5p/h5p-php-library 2016-04-08 13:19:31 +02:00
Frode Petterson 9741dd882d Improved action bar buttons
Now supports space bar.
HFJ-1549
2016-04-08 13:18:35 +02:00
Thomas Marstrander 233b5e7653 Programmatically set focus to confirmation dialog.
HFJ-1572
2016-04-08 10:23:55 +02:00
Thomas Marstrander ea620e12f0 Reverted left adjustment of confirmation dialog.
HFJ-1572
2016-04-07 15:22:19 +02:00
Thomas Marstrander bf7f5c863c Confirmation dialog adjustments.
Translated copyright dialog default texts.
Removed focus on click.
Adjusted left positioning when showing dialog.
Adjusted max width of dialog.
HFJ-1572
2016-04-07 14:51:56 +02:00
Thomas Marstrander 35a7213a67 Added confirmation dialog.
HFJ-1572
2016-04-05 18:35:02 +02:00
Frode Petterson 0c5971d6d4 Use numbers when comparing versions 2016-04-04 12:39:57 +02:00
Thomas Marstrander 4d277b2304 Added version number and links to licenses.
HFJ-1734
2016-03-31 16:07:45 +02:00
Frode Petterson 6b31d467a0 Merge branch 'master' of github.com:h5p/h5p-php-library 2016-03-21 12:51:04 +01:00
Frode Petterson 2ac631458f Merge branch 'master' into content-tags 2016-03-18 13:52:53 +01:00
Frode Petterson 14605dc790 A more natural tabindex
HFJ-1549
2016-03-17 14:22:23 +01:00
Frode Petterson 35a0d09b9b Only use one filter for each column
HFJ-1620
2016-03-01 11:34:34 +01:00
Frode Petterson a41ecccb9a Added em-dash when facet cell is empty.
Other minor visual adjustments.
HFJ-1620
2016-03-01 10:43:13 +01:00
Frode Petterson a398589c80 Added support for Tags in data views
HFJ-1620
2016-02-29 16:35:22 +01:00
Frode Petterson b42193729e Merge branch 'improved-ajax' into improved-ajax-moodle
Conflicts:
	h5p.classes.php
2016-02-25 14:55:27 +01:00
Thomas Marstrander 92e4ab0f9e Merge branches 'file-storage-interface' and 'master' of https://github.com/h5p/h5p-php-library into file-storage-interface 2016-02-24 09:49:11 +01:00
Frode Petterson 4e06733ffb Use correct message 2016-02-22 12:01:18 +01:00
Frode Petterson 0aebdb345b Lets use a simpler solution 2016-02-22 11:58:25 +01:00
Frode Petterson 256bf1b6d2 Revert "Improved results and contentuserdata saving by queueing requests"
This reverts commit 3849f3a054.
2016-02-22 11:56:52 +01:00
Thomas Marstrander bfcf4228db Use variable with complete path HFJ-1695 2016-02-22 10:38:33 +01:00
Frode Petterson 3849f3a054 Improved results and contentuserdata saving by queueing requests 2016-02-19 12:57:53 +01:00
Frode Petterson b42b28ab03 Use correct jQuery
HFJ-1610
2016-02-11 15:00:08 +01:00
Frode Petterson dc8b70748f Fixed once()
HFJ-1646
2016-02-09 13:53:17 +01:00
Frode Petterson 3991875439 Avoid navigating inside iframe
HFJ-1479
2016-01-27 12:42:55 +01:00
Frode Petterson 604218f2e3 Hide buttons if there are no URLs 2016-01-15 14:12:24 +01:00
Frode Petterson 11481c3b4b Merge branch 'master' into file-storage-interface 2016-01-13 15:44:31 +01:00
Frode Petterson 1bf393a9af Allow custom URL for libraries 2016-01-13 08:45:00 +01:00