Merge branch 'release' into stable
commit
b64f83cc02
|
@ -3,6 +3,8 @@ H5P Memory Game
|
|||
|
||||
Create your own memory games and test the memory of your site users with this simple yet beautiful HTML5 game.
|
||||
|
||||
[See it in action on H5P.org](https://h5p.org/memory-game)
|
||||
|
||||
## License
|
||||
|
||||
(The MIT License)
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
"semantics": [
|
||||
{
|
||||
"label": "Cartes",
|
||||
"entity": "une carte",
|
||||
"entity": "carte",
|
||||
"field": {
|
||||
"label": "Carte",
|
||||
"fields": [
|
||||
|
@ -17,19 +17,19 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"label": "Localisation",
|
||||
"label": "Interface",
|
||||
"fields": [
|
||||
{
|
||||
"label": "Texte pour une carte à retourner",
|
||||
"default": "Retourner"
|
||||
"label": "Texte pour le nombre de cartes retournées",
|
||||
"default": "Cartes retournées :"
|
||||
},
|
||||
{
|
||||
"label": "Texte pour le temps passé",
|
||||
"default": "Durée écoulée"
|
||||
"default": "Temps écoulé :"
|
||||
},
|
||||
{
|
||||
"label": "Texte de feedback",
|
||||
"default": "Bon travail!"
|
||||
"label": "Texte de l'appréciation finale",
|
||||
"default": "Bien joué !"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
"description": "See how many cards you can remember!",
|
||||
"majorVersion": 1,
|
||||
"minorVersion": 1,
|
||||
"patchVersion": 8,
|
||||
"patchVersion": 9,
|
||||
"runnable": 1,
|
||||
"author": "Amendor AS",
|
||||
"license": "MIT",
|
||||
|
|
|
@ -36,12 +36,15 @@ H5P.MemoryGame = (function (EventDispatcher, $) {
|
|||
var finished = (removed === cards.length);
|
||||
var desc = card.getDescription();
|
||||
|
||||
if (finished) {
|
||||
self.triggerXAPIScored(1, 1, 'completed');
|
||||
}
|
||||
|
||||
if (desc !== undefined) {
|
||||
// Pause timer and show desciption.
|
||||
timer.stop();
|
||||
popup.show(desc, card.getImage(), function () {
|
||||
if (finished) {
|
||||
self.triggerXAPIScored(1, 1, 'completed');
|
||||
// Game has finished
|
||||
$feedback.addClass('h5p-show');
|
||||
}
|
||||
|
@ -52,7 +55,6 @@ H5P.MemoryGame = (function (EventDispatcher, $) {
|
|||
});
|
||||
}
|
||||
else if (finished) {
|
||||
self.triggerXAPIScored(1, 1, 'completed');
|
||||
// Game has finished
|
||||
timer.stop();
|
||||
$feedback.addClass('h5p-show');
|
||||
|
|
Loading…
Reference in New Issue