EDUCATIC
/
h5p-memory-game
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Validate memory card params before use 

HFJ-1914
pull/12/head
Frode Petterson 2016-05-19 09:40:22 +02:00
parent e8ad552266
commit 3b79752b86
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
card.js
View File

@ -99,4 +99,17 @@
MemoryGame.Card.prototype = Object.create(EventDispatcher.prototype); MemoryGame.Card.prototype = Object.create(EventDispatcher.prototype);
MemoryGame.Card.prototype.constructor = MemoryGame.Card; MemoryGame.Card.prototype.constructor = MemoryGame.Card;
/**
* Check to see if the given object corresponds with the semantics for
* a memory game card.
*
* @param {object} params
* @returns {boolean}
*/
MemoryGame.Card.isValid = function (params) {
return (params !== undefined &&
params.image !== undefined &&
params.image.path !== undefined);
};
})(H5P.MemoryGame, H5P.EventDispatcher, H5P.jQuery); })(H5P.MemoryGame, H5P.EventDispatcher, H5P.jQuery);

12
memory-game.js
View File

@ -101,11 +101,13 @@ H5P.MemoryGame = (function (EventDispatcher, $) {
// Initialize cards. // Initialize cards.
for (var i = 0; i < parameters.cards.length; i++) { for (var i = 0; i < parameters.cards.length; i++) {
// Add two of each card if (MemoryGame.Card.isValid(parameters.cards[i])) {
var cardOne = new MemoryGame.Card(parameters.cards[i], id); // Add two of each card
var cardTwo = new MemoryGame.Card(parameters.cards[i], id); var cardOne = new MemoryGame.Card(parameters.cards[i], id);
addCard(cardOne, cardTwo); var cardTwo = new MemoryGame.Card(parameters.cards[i], id);
addCard(cardTwo, cardOne); addCard(cardOne, cardTwo);
addCard(cardTwo, cardOne);
}
} }
H5P.shuffleArray(cards); H5P.shuffleArray(cards);