Merge 7564c66d0c into d623b91afd

memory-game.css

@@ -183,21 +183,22 @@
   -ms-transform: scale(1,1) rotate(0deg);
   transform: scale(1,1) rotate(0deg);
 }
-
 .h5p-memory-game .h5p-status {
   clear: left;
   padding: 0 1em;
   margin: 0.25em 0 1em 0;
 }
-.h5p-memory-game .h5p-status > dt {
+.h5p-memory-game .h5p-status > div {
+  margin: 0;
+}
+.h5p-memory-game .h5p-status .h5p-statusLine > dt {
   float: left;
   margin: 0 1em 0 0;
   font-weight: bold;
 }
-.h5p-memory-game .h5p-status > dd {
+.h5p-memory-game .h5p-status .h5p-statusLine > dd {
   margin: 0;
 }
-
 .h5p-memory-game .h5p-memory-pop {
   display: none;
   background: #fff;

memory-game.js

@@ -37,7 +37,7 @@ H5P.MemoryGame = (function (EventDispatcher, $) {
         feedback: 'Good work!',
         tryAgain: 'Reset',
         closeLabel: 'Close',
-        label: 'Memory Game. Find the matching cards.',
+        label: 'Memory Game. Find the matching cards.',
         done: 'All of the cards have been found.',
         cardPrefix: 'Card %num: ',
         cardUnturned: 'Unturned.',
@@ -459,19 +459,32 @@ H5P.MemoryGame = (function (EventDispatcher, $) {
           appendTo: $bottom
         });
 
-        $feedback = $('<div class="h5p-feedback">' + parameters.l10n.feedback + '</div>').appendTo($bottom);
+        $feedback = $('<div class="h5p-feedback">' + '<div class="h5p-statusLine" id="h5p-showFeedback" hidden="true">' + parameters.l10n.feedback + '</div>'+ '</div>').appendTo($bottom);
+
+        if(parameters.behaviour && parameters.behaviour.showFeedback){
+          $feedback.find('div#h5p-showFeedback').show();
+        }
 
         // Add status bar
-        var $status = $('<dl class="h5p-status">' +
+          var $status = $('<dl class="h5p-status">' + '<div class="h5p-statusLine" id="h5p-showTime" hidden="true">' +
-                        '<dt>' + parameters.l10n.timeSpent + ':</dt>' +
+                          '<dt>' + parameters.l10n.timeSpent + ':</dt>' +
-                        '<dd class="h5p-time-spent"><time role="timer" datetime="PT0M0S">0:00</time><span class="h5p-memory-hidden-read">.</span></dd>' +
+                          '<dd class="h5p-time-spent"><time role="timer" datetime="PT0M0S">0:00</time><span class="h5p-memory-hidden-read">.</span></dd>' +
-                        '<dt>' + parameters.l10n.cardTurns + ':</dt>' +
+                          '</div>' + '<div class="h5p-statusLine" id="h5p-showTurns" hidden="true">' + '<dt>' + parameters.l10n.cardTurns + ':</dt>' +
-                        '<dd class="h5p-card-turns">0<span class="h5p-memory-hidden-read">.</span></dd>' +
+                          '<dd class="h5p-card-turns">0<span class="h5p-memory-hidden-read">.</span></dd>' +
-                        '</dl>').appendTo($bottom);
+                          '</div>' + '</dl>').appendTo($bottom);
 
-        timer = new MemoryGame.Timer($status.find('time')[0]);
+          timer = new MemoryGame.Timer($status.find('time')[0]);
-        counter = new MemoryGame.Counter($status.find('.h5p-card-turns'));
+          counter = new MemoryGame.Counter($status.find('.h5p-card-turns'));
-        popup = new MemoryGame.Popup($container, parameters.l10n);
+          popup = new MemoryGame.Popup($container, parameters.l10n);
+
+          if (parameters.behaviour){
+            if(parameters.behaviour.showTime){
+              $status.find('div#h5p-showTime').show();
+            }
+            if(parameters.behaviour.showTurns){
+              $status.find('div#h5p-showTurns').show();
+            }
+          }
 
         $container.click(function () {
           popup.close();

semantics.json

@@ -111,6 +111,27 @@
         "label": "Add button for retrying when the game is over",
         "importance": "low",
         "default": true
+      },
+      {
+        "name": "showTime",
+        "type": "boolean",
+        "label": "Show timer",
+        "importance": "low",
+        "default": true
+      },
+      {
+        "name": "showTurns",
+        "type": "boolean",
+        "label": "Show card turns",
+        "importance": "low",
+        "default": true
+      },
+      {
+        "name": "showFeedback",
+        "type": "boolean",
+        "label": "Show feedback",
+        "importance": "low",
+        "default": true
       }
     ]
   },
@@ -193,7 +214,7 @@
         "importance": "low",
         "name": "label",
         "type": "text",
-        "default": "Memory Game. Find the matching cards."
+        "default": "Memory Game. Find the matching cards."
       },
       {
         "label": "Game finished label",

upgrades.js

@@ -37,6 +37,9 @@ H5PUpgrades['H5P.MemoryGame'] = (function () {
         parameters.behaviour = {};
         parameters.behaviour.useGrid = false;
         parameters.behaviour.allowRetry = false;
+        parameters.behaviour.showTime = true;
+        parameters.behaviour.showTurns = true;
+        parameters.behaviour.showFeedback = true;
 
         finished(null, parameters);
       }