Fix checkAnswer triggered by input fields

src/scripts/h5p-crossword-input.js

@@ -199,6 +199,10 @@ export default class CrosswordInput {
           return;
         }
 
+        if (this.noListeners) {
+          return;
+        }
+
         const start = inputField.selectionStart;
         inputField.value = `${inputField.value.substr(0, start + 1)}${inputField.value.substr(start + 1)}`;
         inputField.selectionEnd = start + 1;
@@ -236,6 +240,10 @@ export default class CrosswordInput {
           return; // workaround for Android specific code
         }
 
+        if (this.noListeners) {
+          return;
+        }
+
         if (Util.CONTROL_KEY_CODES.indexOf(event.keyCode) !== -1) {
           if ([8, 35, 36, 37, 38, 39, 40, 46].indexOf(event.keyCode) === -1) {
             // None of backspace, home, end, left, right, up, down, delete
@@ -632,8 +640,10 @@ export default class CrosswordInput {
 
   /**
    * Enable input fields.
+   *
+   * @param {boolean} [noListeners] If true, no listeners will be active.
    */
-  enable() {
+  enable(noListeners = false) {
     this.inputFields.forEach((field) => {
       field.inputField.removeAttribute('disabled');
     });
@@ -644,13 +654,15 @@ export default class CrosswordInput {
     this.content.classList.remove('h5p-crossword-disabled');
 
     this.disabled = false;
+    this.noListeners = noListeners;
   }
 
   /**
    * Disable input fields.
    */
   disable() {
     this.disabled = true;
+    this.noListeners = true;
 
     this.extraClues.forEach((extraClue) => {
       extraClue.setAttribute('disabled', true);

src/scripts/h5p-crossword-table.js

@@ -909,14 +909,18 @@ export default class CrosswordTable {
    * @param {object} params Parameters.
    */
   fillGrid(params) {
+    let hasSomeCellChanged = false;
     const cells = [].concat(...this.cells)
       .filter((cell) => cell.getClueId(params.orientation) === params.clueId);
 
     cells.forEach((cell, index) => {
+      const answerBefore = cell.getAnswer();
       cell.setAnswer(
         params.text[index] || '',
         (params.readOffset === -1) ? false : index === params.cursorPosition - params.readOffset
       );
+      hasSomeCellChanged = hasSomeCellChanged ||
+        answerBefore !== cell.getAnswer();
 
       // At crossection, other input fields needs to be updated
       if (cell.getClueId('down') && cell.getClueId('across')) {
@@ -952,7 +956,7 @@ export default class CrosswordTable {
 
     // Check if table is filled
     this.callbacks.onInput({
-      checkFilled: true
+      checkFilled: hasSomeCellChanged
     });
   }
 

src/scripts/h5p-crossword.js

@@ -246,6 +246,10 @@ export default class Crossword extends H5P.Question {
    * Check answer.
    */
   checkAnswer() {
+    if (this.getViewState().id !== Crossword.VIEW_STATES.task) {
+      return; // Prevent double checking
+    }
+
     if (!this.content) {
       return; // Call by previous state, not ready yet
     }