EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release' into improved-file-handling

JI-92-path-fix
Paal Joergensen 2017-01-11 16:21:15 +01:00
parent a41df0ad9e 738dced286
commit 6e135d0319
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/h5p-x-api-event.js
View File

@ -248,6 +248,16 @@ H5P.XAPIEvent.prototype.getContentXAPIId = function (instance) {
return xAPIId; return xAPIId;
}; };
/**
* Check if this event is sent from a child (i.e not from grandchild)
*
* @return {Boolean}
*/
H5P.XAPIEvent.prototype.isFromChild = function () {
var parentId = this.getVerifiedStatementValue(['context', 'contextActivities', 'parent', 0, 'id']);
return !parentId || parentId.indexOf('subContentId') === -1;
}
/** /**
* Figure out if a property exists in the statement and return it * Figure out if a property exists in the statement and return it
* *

27
styles/h5p-core-button.css
View File

@ -8,7 +8,7 @@ button.h5p-core-button {
padding: 0.5em 1.25em; padding: 0.5em 1.25em;
border-radius: 2em; border-radius: 2em;
background: #488ac9; background: #2579c6;
color: #fff; color: #fff;
cursor: pointer; cursor: pointer;
@ -21,24 +21,19 @@ button.h5p-core-button {
text-shadow: none; text-shadow: none;
vertical-align: baseline; vertical-align: baseline;
text-decoration: none; text-decoration: none;
}
button.h5p-core-button:hover,
button.h5p-core-button:focus {
background: #3b71a5;
color: #fff;
text-decoration: none;
-webkit-transition: initial; -webkit-transition: initial;
transition: initial; transition: initial;
} }
button.h5p-core-button:active { button.h5p-core-button:focus {
position: relative; background: #1f67a8;
background: #104888; }
button.h5p-core-button:hover {
-webkit-box-shadow: inset 0 4px 0 #0e407a; background: rgba(31, 103, 168, 0.83);
-moz-box-shadow: inset 0 4px 0 #0e407a; }
box-shadow: inset 0 4px 0 #0e407a; button.h5p-core-button:active {
background: #104888;
} }
button.h5p-core-button:before { button.h5p-core-button:before {
font-family: 'H5P'; font-family: 'H5P';
padding-right: 0.15em; padding-right: 0.15em;
@ -46,7 +41,6 @@ button.h5p-core-button:before {
vertical-align: middle; vertical-align: middle;
line-height: 0.7; line-height: 0.7;
} }
button.h5p-core-cancel-button:visited, button.h5p-core-cancel-button:visited,
button.h5p-core-cancel-button:link, button.h5p-core-cancel-button:link,
button.h5p-core-cancel-button { button.h5p-core-cancel-button {
@ -58,7 +52,6 @@ button.h5p-core-cancel-button {
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
} }
button.h5p-core-cancel-button:hover, button.h5p-core-cancel-button:hover,
button.h5p-core-cancel-button:focus { button.h5p-core-cancel-button:focus {
background: none; background: none;