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
6d4caf855d
Fixed error handling.
2015-03-04 11:30:20 +01:00
c91391e0bc
Fixed URLs.
...
Finishing touches on the time tracking.
2015-03-04 11:13:32 +01:00
812c3b5e7c
Merge branch 'master' into upgrade-speed
2015-03-04 10:21:29 +01:00
96b1014f80
Merge branch 'master' into new-embed
2015-03-03 18:10:07 +01:00
acca962775
Fixed misplaced stash (after merge).
2015-03-03 11:03:18 +01:00
22d085386e
Merge branch 'new-embed' of github.com:h5p/h5p-php-library into new-embed
2015-03-02 16:03:48 +01:00
e961f614a4
Fixed so that iframes can be loaded before resizer script.
2015-03-02 15:53:29 +01:00
99db5699fb
Handle anonymous users
2015-03-02 15:49:27 +01:00
553ae243d2
UX improvements to embed code system
2015-03-02 15:01:05 +01:00
8e53f62679
Make sure admin container is empty.
2015-03-02 13:42:15 +01:00
07cd5c0d42
Added a floating touch.
2015-02-27 15:37:16 +01:00
1c1829b13b
Fixed integration bug.
2015-02-27 14:53:38 +01:00
aac10b86fa
Make old embed code insert new.
2015-02-27 14:53:26 +01:00
f2595b2bce
Change how H5Ps are integrated.
2015-02-27 13:59:42 +01:00
77d589ec68
Fixed absolute URLs violating its parent.
2015-02-27 10:55:47 +01:00
1e4a7ff26f
Removed unused code.
2015-02-27 10:29:43 +01:00
4e594dd573
Fixed dialog pos and expand.
2015-02-27 10:26:57 +01:00
037e26f42b
Space support.
2015-02-27 08:57:02 +01:00
3463a3c671
Added support for multiple workers during content upgrade.
2015-02-26 16:16:20 +01:00
fabde2f1ce
Automatic positioning.
2015-02-25 13:05:45 +01:00
1861f696c1
Added new embed design.
2015-02-25 12:10:07 +01:00
0c5aacfa24
Fixed old fullscreen exit in iframe.
2015-02-24 16:02:14 +01:00
d6e69e63ee
Use this instead of self so that we're compatible with jsdoc
2015-02-20 15:34:38 +01:00
1fef537c8c
Merge branch 'new-embed' of github.com:h5p/h5p-php-library into new-embed
2015-02-20 13:17:52 +01:00
93cd6eea28
Removed empty file.
2015-02-20 13:17:41 +01:00
f76290cdde
Made user results work in new embed.
2015-02-20 11:41:09 +01:00
971a55df58
Satisfy JSHint and prevent crashing.
2015-02-20 10:26:33 +01:00
688b00f55e
Merge branch 'master' into new-embed
...
Conflicts:
js/h5p.js
2015-02-20 10:15:36 +01:00
2b1c894307
Merge branch 'master' into settings
...
Conflicts:
h5p.classes.php
2015-02-19 15:50:04 +01:00
c7c46bc779
Fix spelling error
2015-02-18 15:20:20 +01:00
0d8fe7498c
Remove code not being used
2015-02-18 15:08:55 +01:00
e981e7d605
Trigger xAPI events on top as well if inside ifra
2015-02-18 10:59:47 +01:00
d6db07481e
Make sure the contentId is set on content types
2015-02-18 09:07:57 +01:00
1995da20bb
Remove old todo items
2015-02-18 09:07:38 +01:00
a96e5cc7b9
Make the xAPI integration work for stuff that aren't content types
2015-02-18 09:07:19 +01:00
0a6dd4808b
Rename the external api
2015-02-17 10:57:21 +01:00
537c62ab33
Get url to the H5P content from the framework
2015-02-17 10:57:12 +01:00
c330282351
Refactor xAPI code
2015-02-16 16:47:04 +01:00
b575426f83
Add documentation
2015-02-16 15:30:49 +01:00
2237f026c9
Documentation updates
2015-02-16 14:26:09 +01:00
10fbca1549
Documentation updates
2015-02-16 14:22:54 +01:00
83a077be15
Rename api function
2015-02-12 15:46:25 +01:00
9fc5f82b2f
Fixed empty frame.
2015-02-12 11:52:55 +01:00
36b1fd2d8c
Add helper function to get verbs
2015-02-11 20:06:40 +01:00
5483a3f151
Remove event dispatcher
2015-02-11 18:02:58 +01:00
c4aedca522
Resolve conflicts
2015-02-11 18:02:25 +01:00
f8434bf788
Add scopes to event system
2015-02-11 17:31:01 +01:00
079f4992b4
bugfixes
2015-02-11 15:56:35 +01:00
c764d13b32
Moved display options helpers into core.
2015-02-10 16:29:16 +01:00
3c712193b3
Merge branch 'master' into settings
...
Conflicts:
styles/h5p.css
2015-02-09 15:25:09 +01:00
a0c5fe0e18
Comment out semi full screen.
2015-02-09 11:51:39 +01:00
11d9cb2f35
Trigger events.
2015-02-09 11:47:33 +01:00
18a3ed4a8f
Simplified integration code to avoid to much duplication.
...
Added resizing script for new embed code.
Added iframe communicator when embedding.
2015-02-09 10:22:14 +01:00
9a0da8614b
Add helper functions
2015-02-05 10:46:55 +01:00
c8a2465827
Add documentation and change function names for deprecated functions
2015-02-04 18:43:06 +01:00
21674d31ac
Merge branch 'master' into settings
...
Conflicts:
js/h5p.js
2015-02-04 09:32:03 +01:00
Thomas Marstrander
Frode Petterson
Paal Joergensen
Svein-Tore Griff With
Svein-Tore Griff With
Svein-Tore Griff With
Andrew Downes