738dced286
Added utility function for figuriong out if event is from child [HFP-436]
2017-01-04 16:16:28 +01:00
20042fba85
Merge branch 'master' into improved-file-handling
2016-12-21 13:34:06 +01:00
671c079eee
Merge branch 'improved-embed-and-download'
2016-12-21 13:21:39 +01:00
e2634070d4
Ignore overrideSettings parameter fields.
...
HFP-391
2016-12-21 11:34:51 +01:00
b91be29cec
Add return statement to recursive function
...
HFP-391
2016-12-20 15:46:36 +01:00
117e1457b7
Merge branch 'master' into improved-embed-and-download
2016-12-20 14:37:52 +01:00
1341768c90
Fixed problem with empty actionbar [HFP-277]
2016-12-20 14:37:31 +01:00
87ec43d687
Using constants for the different display options, and avoid special cases [HFP-277]
2016-12-16 14:22:03 +01:00
a1e68d212b
Updated comments [HFP-277]
2016-12-16 11:38:47 +01:00
526d7ddd7e
Made copyright button being shown [HFP-277]
2016-12-16 11:30:59 +01:00
28e34c1c09
Simplify fullscreenSupported
...
HFP-339
2016-12-14 16:21:42 +01:00
bbe16fb8da
Revert changes for canHasFullScreen
...
HFP-339
2016-12-13 19:46:21 +01:00
f0d65d4f9d
Refactor canHasFullscreen
...
HFP-339
2016-12-13 16:04:57 +01:00
52dc1b2a81
Refactor canHasFullScreen
...
HFP-339
2016-12-13 10:33:11 +01:00
0a23dc043d
Download and embed granularity (HFP-277)
2016-12-13 10:29:33 +01:00
a4d6f3aaab
Restore deprecated variable H5P.canHasFullScreen for backwards compatability
...
HFP-339
2016-12-12 11:28:59 +01:00
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
d100c5102a
Merge branch 'release' into ignoreBuildFiles
2016-12-02 13:47:21 +01:00
5ec651e696
Merge branch 'release' into ignoreBuildFiles
2016-11-30 13:24:33 +01:00
ed1fb00745
Merge branch 'release' into improved-file-handling
2016-11-30 11:19:08 +01:00
ece72fcfbe
Merge pull request #32 from h5p/semi-fullscreen-api-function
...
Added semi fullscreen function
2016-11-30 09:40:17 +01:00
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
9b0d77a721
Check instanceof score as well to validate number.
...
HFP-215
2016-11-19 12:29:38 +01:00
f82f3a354c
Removed debug
...
HFP-86
2016-11-17 13:27:41 +01:00
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
6001b68b99
Making naming harder to misunderstand
2016-11-11 11:57:54 +01:00
7e90871cb7
Fixing typo
2016-11-11 11:51:20 +01:00
96f84a430a
Added semi fullscreen function
2016-11-11 11:45:59 +01:00
1173341b76
Merge branch 'release' into improved-file-handling
2016-11-01 16:30:32 +01:00
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
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
c88c049438
Check if contents is set before using
...
h5p/h5p-moodle-plugin#112
2016-09-09 09:19:55 +02:00
e8f90c9116
Allow overriding of content URLs
...
h5p/h5p-moodle-plugin#112
2016-09-08 16:34:53 +02:00
d946f32b81
Merge branch 'master' into improved-file-handling
2016-08-02 13:37:26 +02:00
9f7b545f02
Added lost part of old fix
...
HVP-212
2016-07-15 16:14:32 +02:00
61219a7d84
Merge branch 'master' into improved-file-handling
2016-07-14 10:29:30 +02:00
a6656c2e6f
Support for when cookies are disabled
...
HFJ-1915
2016-06-20 14:57:14 +02:00
ba2f7c5e67
Merge branch 'release' into improved-file-handling
2016-06-15 10:34:34 +02:00
ec2e0fbb71
Removed JS error on empty results
2016-06-13 14:46:15 +02:00
fca0537a4d
Use context and token in URL prefix
2016-06-13 10:31:09 +02:00
5e87aee63c
Merge branch 'release' into improved-file-handling
2016-06-13 09:58:18 +02:00
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
51851f14c3
Use aria-labelledby to describe dialog, instead of alert.
...
HFJ-2003
2016-06-09 13:18:09 +02:00
e10594fb49
Hide redundant confirmation dialog exit button for assistive technologies.
...
HFJ-2004
2016-06-09 11:26:11 +02:00
8615deb23b
Hide elements that confirmation dialog covers from assistive technologies.
...
HFJ-1995
2016-06-08 11:06:03 +02:00
10e1a7ba65
Use DOM Level 2 events.
...
HFJ-1999
2016-06-07 15:09:59 +02:00
8bd9e9c2db
Merge remote-tracking branch 'origin/release' into release
2016-06-07 14:32:12 +02:00
77fb832221
Added focus capturing, redirecting it to the open confirmation dialog
...
HFJ-1995
2016-06-07 14:31:41 +02:00
b261754cf1
Merge branch 'release' into improved-file-handling
2016-06-07 14:28:12 +02:00
2ebc9225ee
Merge branch 'release' of github.com:h5p/h5p-php-library into release
2016-06-07 12:58:40 +02:00
f4cee6e284
Moved deletion of content user data to after dialog is closed [HFJ-1989]
2016-06-07 11:09:42 +02:00
87658ed42b
Accessibility - reads confirmation dialog text on show.
...
HFJ-1992
2016-06-07 11:04:21 +02:00
7807b8af68
Making sure reset dialog is only shown once [HFJ-1989]
2016-06-06 16:09:35 +02:00
e3b29a2199
Accessibility - reads confirmation dialog text on show.
...
HFJ-1992
2016-06-06 14:57:51 +02:00
ed13203254
Use buttons instead of anchors in Confirmation Dialog.
...
HFJ-1930
(cherry picked from commit 27bc158
2016-06-06 09:47:15 +02:00
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
b102a7de21
Only add editor context when in editor.
...
HFJ-1972
2016-05-31 14:43:12 +02:00
594d992f19
Merge branch 'master' into improved-file-handling
2016-05-31 12:42:29 +02:00
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
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
73a23d4679
Send context id together with post data in order to determine our context.
...
HFJ-1964
2016-05-30 10:35:06 +02:00
27bc158708
Use buttons instead of anchors in Confirmation Dialog.
...
HFJ-1930
2016-05-23 14:34:56 +02:00
2c4edb7b56
Merge branch 'master' into release
2016-05-13 14:56:40 +02:00
e412c3a228
Make sure focus is set after timeout, to not skewer content.
...
HFJ-1867
2016-05-04 12:37:59 +02:00
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
acaccea977
Allow pagination widget to handle empty pages
2016-05-03 12:47:16 +02:00
6e7e144900
Confirmation dialog - Focus confirm button on show.
...
HFJ-1860
2016-05-03 11:15:21 +02:00
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
926ff4af3a
Avoid confirmation dialog skewering content.
...
HFJ-1572
2016-04-21 14:58:21 +02:00
6869ecbb09
Handling several digits in major and minor version
2016-04-21 13:22:01 +02:00
e26a662341
Merge branch 'release'
2016-04-12 15:06:30 +02:00
b93b7082dc
Reset page offset when filtering by facets
2016-04-12 15:01:10 +02:00
84d93af447
Merge branch 'master' of github.com:h5p/h5p-php-library
2016-04-08 13:19:31 +02:00
9741dd882d
Improved action bar buttons
...
Now supports space bar.
HFJ-1549
2016-04-08 13:18:35 +02:00
233b5e7653
Programmatically set focus to confirmation dialog.
...
HFJ-1572
2016-04-08 10:23:55 +02:00
ea620e12f0
Reverted left adjustment of confirmation dialog.
...
HFJ-1572
2016-04-07 15:22:19 +02:00
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
35a7213a67
Added confirmation dialog.
...
HFJ-1572
2016-04-05 18:35:02 +02:00
0c5971d6d4
Use numbers when comparing versions
2016-04-04 12:39:57 +02:00
4d277b2304
Added version number and links to licenses.
...
HFJ-1734
2016-03-31 16:07:45 +02:00
6b31d467a0
Merge branch 'master' of github.com:h5p/h5p-php-library
2016-03-21 12:51:04 +01:00
2ac631458f
Merge branch 'master' into content-tags
2016-03-18 13:52:53 +01:00
14605dc790
A more natural tabindex
...
HFJ-1549
2016-03-17 14:22:23 +01:00
35a0d09b9b
Only use one filter for each column
...
HFJ-1620
2016-03-01 11:34:34 +01:00
a41ecccb9a
Added em-dash when facet cell is empty.
...
Other minor visual adjustments.
HFJ-1620
2016-03-01 10:43:13 +01:00
a398589c80
Added support for Tags in data views
...
HFJ-1620
2016-02-29 16:35:22 +01:00
b42193729e
Merge branch 'improved-ajax' into improved-ajax-moodle
...
Conflicts:
h5p.classes.php
2016-02-25 14:55:27 +01:00
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
4e06733ffb
Use correct message
2016-02-22 12:01:18 +01:00
0aebdb345b
Lets use a simpler solution
2016-02-22 11:58:25 +01:00
256bf1b6d2
Revert "Improved results and contentuserdata saving by queueing requests"
...
This reverts commit 3849f3a054
2016-02-22 11:56:52 +01:00
bfcf4228db
Use variable with complete path HFJ-1695
2016-02-22 10:38:33 +01:00
3849f3a054
Improved results and contentuserdata saving by queueing requests
2016-02-19 12:57:53 +01:00
b42b28ab03
Use correct jQuery
...
HFJ-1610
2016-02-11 15:00:08 +01:00
dc8b70748f
Fixed once()
...
HFJ-1646
2016-02-09 13:53:17 +01:00
3991875439
Avoid navigating inside iframe
...
HFJ-1479
2016-01-27 12:42:55 +01:00
604218f2e3
Hide buttons if there are no URLs
2016-01-15 14:12:24 +01:00
11481c3b4b
Merge branch 'master' into file-storage-interface
2016-01-13 15:44:31 +01:00
1bf393a9af
Allow custom URL for libraries
2016-01-13 08:45:00 +01:00
510016b1cc
Merge branch 'release' of github.com:h5p/h5p-php-library into release
2016-01-05 13:58:20 +01:00
59901fd1c9
Fixed resizing script trying to access iframe content
...
HFJ-1512
2016-01-05 13:57:16 +01:00
919ac77f35
Readded check for undefined contentid in setActivityStarted()
2015-12-18 10:26:59 +01:00
e83b213183
Made content state saving more robust [HFJ-1450]
2015-12-18 10:06:33 +01:00
5e45e7d7dd
Merge branch 'master' into release
...
Conflicts:
js/h5p-x-api.js
2015-12-17 14:04:58 +01:00
e6ec257c6d
Made setActivityStarted a little more robust [HFJ-1474]
2015-12-16 15:42:26 +01:00
2d0e409ac4
Made content state beeing saved on safari@iPad when closing tab and leaving tab
2015-12-16 09:50:58 +01:00
2bc4dee85a
Prevent crashing editor for old libraries
2015-12-10 14:49:30 +01:00
3a2bb0a2fd
Trigger attempted event the first time a user sees a question - HFJ-1397
2015-11-27 20:49:49 +01:00
3c34ab223a
Prevent assigning to the htmlcollection.
2015-11-13 11:18:53 +01:00
16aa6813ae
Use correct variable
2015-11-06 15:35:06 +01:00
2f5e1fcc91
Use correct variable.
2015-11-05 16:52:38 +01:00
7a369de7e7
Avoid undefined errors
2015-11-04 17:30:58 +01:00
e29be52de5
Merge branch 'master' of https://github.com/h5p/h5p-php-library
2015-11-01 00:32:55 +01:00
b077af0981
Merge branch 'stable'
2015-11-01 00:32:47 +01:00
ccfa2d516f
Make sure we get answered statements in the result log
2015-11-01 00:30:45 +01:00
844883a1cf
triggerXAPICompleted is deprecated so we don't change it. Also fixes doc
2015-11-01 00:23:10 +01:00
cc6521c4a1
completed default value depends on verb
2015-11-01 00:19:56 +01:00
e7fe53c235
Merge pull request #4 from garemoko/garemoko-issue-2
...
Add support for result.success & completion
2015-11-01 00:14:42 +01:00
f0530957ad
Improved semi-fullscreen for iPad.
2015-10-27 16:57:28 +01:00
876135436c
Made resize script smarter to avoid flickering.
2015-10-26 14:13:21 +01:00
76a02867aa
Update triggerXAPICompleted and triggerXAPIScored
...
Added support for completion and success.
2015-10-20 11:29:01 +01:00
f9ea9adb1b
Add support for result.success & completion
2015-10-20 11:13:08 +01:00
2d43942c48
Use parent window instead of top for communications.
2015-09-10 14:27:12 +02:00
47d0f830d3
Removed asd
2015-09-02 15:44:38 +02:00
7737559dec
Fixed off().
2015-08-27 11:36:07 +02:00
d8d7fdabdd
Replaced nbsp.
2015-08-26 15:58:49 +02:00
8d9781f4ae
Also add class when framed
2015-07-30 18:11:59 +02:00
71f147058d
Rename isStandalone to isRoot and use ned libraryInfo instead of the so called ubername
2015-07-20 13:40:59 +02:00
aa96d726bd
Merge branch 'master' of https://github.com/h5p/h5p-php-library
2015-07-20 13:05:48 +02:00
5d1cd188d0
Add duration and scaled to result
2015-07-20 13:05:41 +02:00
56e74c2d68
Renamed H5P.Base to H5P.ContentType.
...
Moved H5P.ContentType code to separate file.
Made H5P.ContentType extend H5P.EventDispatcher.
2015-07-17 13:32:35 +02:00
8cf384f46a
Fixed H5P.Base.getLibraryFilePath() bug
2015-07-14 14:46:35 +02:00
e36582c714
Added H5P base class that all H5P libraries automatically extends
2015-07-14 14:37:39 +02:00
03370c9500
Add info about the library being used to the xAPI statements
2015-07-10 12:58:02 +02:00
8431304dd0
Remove todos
2015-07-10 11:41:28 +02:00
1764e80511
Merge branch 'master' of github.com:h5p/h5p-php-library
2015-06-25 15:15:04 +02:00
3e21226b3b
No decimals in embed dialog.
2015-06-25 15:14:55 +02:00
3d4165df55
Use local variable.
2015-06-23 14:24:19 +02:00
b9229ba75f
Don't try to get data when there's no user.
2015-06-23 11:12:29 +02:00
c40d273704
Fixed this arg for external dispatcher.
2015-06-04 14:39:02 +02:00
8e82b515a2
Prevent updating pagination when there's no table.
2015-05-21 09:50:58 +02:00
227e0829fd
Avoid printing very scary error message for all old interactive videos
2015-05-18 15:14:33 +02:00
3f6abd722d
Prevent crashing if getCopyrights fail.
2015-05-15 12:21:23 +02:00
eb6ec29cb6
Remove deprecated name
2015-05-12 16:09:36 +02:00
ca0c848e0f
Use correct element.
2015-05-12 10:04:21 +02:00
5568a59854
Pre-generate copyright information.
2015-05-11 16:00:55 +02:00
ba862f0078
Embed: Always br. Get w/h from correct el.
2015-05-07 15:16:59 +02:00
e0534dd778
Fixed frame disable broken. Probably a merge gone wrong.
2015-05-07 15:13:28 +02:00
ccc03782df
Cleaned up docs to make JSdoc generation more meaningful.
2015-05-05 13:13:57 +02:00
9ee8130aae
Added copyrights fix.
2015-04-27 13:21:31 +02:00
260b6fe044
Restrict IE FullScreen.
2015-04-22 12:55:18 +02:00
886c631461
Use correct variable.
2015-04-22 10:58:59 +02:00
1c6b818841
Merge branch 'release'
...
Conflicts:
js/h5p.js
2015-04-22 09:51:36 +02:00
af8e9e8f30
Relay events to top window.
2015-04-22 09:49:58 +02:00
c13e0a0a9a
Fixed fullscreen checker.
2015-04-21 16:55:23 +02:00
cdceb41d74
Prevent running multiple resizer.
2015-04-21 16:55:04 +02:00
b3dea65fd8
Remove element from DOM the correct way.
2015-04-21 16:54:31 +02:00
28f8a8dc8a
Create a spaceholder when resizing iframes.
2015-04-21 09:09:41 +02:00
fba8badf1a
Use URL template to support URLs of different formatting.
2015-04-20 10:30:52 +02:00
165db6ff6c
externalEmbed is either false or undefined it seems
2015-04-16 20:14:53 +02:00
cf7ae066ad
Add disable support for uploads as well
2015-04-15 13:54:46 +02:00
09c6d5c4f8
Handle cases where a field don't have params
2015-04-14 14:01:28 +02:00
80a80aef7a
Better debugging
2015-04-14 14:01:14 +02:00
9a92a61484
Make sure state is ignored when disabled
2015-04-13 20:31:21 +02:00
ba2355c2ec
Make sure state is ignored when disabled
2015-04-13 20:30:40 +02:00
868c06929d
Whitespace changes
2015-04-13 18:41:53 +02:00
fba425220e
Resolve conflicts
2015-04-13 18:32:33 +02:00
912a670607
Merge branch 'master' into upgrade-speed
2015-04-13 18:16:19 +02:00
497301d6ad
Add triggerXAPIScored and deprecate triggerXAPICompleted
2015-04-09 19:42:05 +02:00
5b36e468ac
Rewrite so that we add options as an object instead of a very long list of parameters
2015-04-09 14:00:00 +02:00
ea26ae95db
Merge tag 'wp-1.4.0' into upgrade-speed
2015-04-08 09:35:57 +02:00
5b55b78ded
createH5PTitle->createTitle
2015-04-07 19:52:18 +02:00
5c3620c637
Bubbling for event system
2015-04-07 19:33:21 +02:00
efbe56001d
User data fixes
2015-04-07 19:32:44 +02:00
58d0d3e32c
Merge branch 'no-url-fopen' into aggregated-xapi
2015-03-24 18:27:23 +01:00
c746457a87
Make xAPI work in editor
2015-03-24 18:24:07 +01:00
9ae40ad739
Merge branch 'master' into no-url-fopen
2015-03-23 10:53:47 +01:00
acd3aa2dba
Merge branch 'master' of github.com:h5p/h5p-php-library
2015-03-23 10:53:30 +01:00
cfe73006a2
Added back deprecated function.
2015-03-23 10:53:21 +01:00
eee77519b7
Always use complete URLs.
2015-03-23 09:45:02 +01:00
8e113ff792
Add parameter set as parameter 5 to new runnable, and blacklist libraries that already have a custom third parameter for their constructor
2015-03-22 20:39:16 +01:00
9d38f83886
Refactor completed listener to use more of the new xAPI api functions
2015-03-22 20:38:57 +01:00
eb02a5942d
Make externalDispatcher from framed content work again
2015-03-22 20:38:33 +01:00
d3453b8637
Context bug fix
2015-03-22 20:38:17 +01:00
5d6d22a13f
Accept other verbs than the adl verbs
2015-03-22 20:37:48 +01:00
46c9260755
Don't bubble by default
2015-03-22 20:37:28 +01:00
6b3e550a48
Don't bubble by default
2015-03-22 20:37:10 +01:00
9a204b3d8f
Make sure title are added
2015-03-22 15:14:28 +01:00
c4e488f9c8
Get contentId from the right place in the statement
2015-03-22 13:27:40 +01:00
5a882e4d55
Improve title generator
2015-03-22 12:45:03 +01:00
93f2bcc01a
Use uuid instead of h5pUUID
2015-03-22 12:44:55 +01:00
e14c24cc07
Fix xAPI statement structure to follow the standard better
2015-03-22 12:43:07 +01:00
3da0de4626
Fix bubble system
2015-03-22 11:17:58 +01:00
313bb757ba
Add bubble system and xAPI context
2015-03-21 16:45:38 +01:00
76b0fc04f8
Make UUID creator available for everyone
2015-03-21 14:16:31 +01:00
fb82328535
Fullscreen fix
2015-03-13 12:51:31 +01:00
7ef9ffbf1f
Added default sort option to data view. Improved buttons.
2015-03-11 11:40:07 +01:00
efd79c9e79
Support init target.
2015-03-10 10:09:31 +01:00
72db596bac
Make sure H5P.externalEmbed is set inside the iframe. Run H5P.init from external resource to ensure correct execution order in IE9.
2015-03-10 09:53:33 +01:00
b45bfe770b
Critical bug fix for safari
2015-03-06 12:56:41 +01:00
Paal Joergensen
thomasmars
Timothy Lim
Tom Arild Jakobsen
Frode Petterson
Svein-Tore Griff With
Svein-Tore Griff With
Svein-Tore Griff With
Andrew Downes