Merge with HFP-1460

otacke · Jan 11, 2019 · 638b66f · 638b66f
1 parent ed3e941
commit 638b66f
Show file tree

Hide file tree

Showing 33 changed files with 137 additions and 101 deletions.
diff --git a/js/blanks.js b/js/blanks.js
@@ -77,8 +77,7 @@ H5P.Blanks = (function ($, Question) {
         caseSensitive: true,
         showSolutionsRequiresInput: true,
         autoCheck: false,
-        separateLines: false,
-        disableImageZooming: false
+        separateLines: false
       }
     }, params);
 
@@ -124,14 +123,14 @@ H5P.Blanks = (function ($, Question) {
     var self = this;
 
     // Check for task media
-    var media = self.params.media;
+    var media = self.params.media.type;
     if (media && media.library) {
       var type = media.library.split(' ')[0];
       if (type === 'H5P.Image') {
         if (media.params.file) {
           // Register task image
           self.setImage(media.params.file.path, {
-            disableImageZooming: self.params.behaviour.disableImageZooming,
+            disableImageZooming: self.params.media.disableImageZooming || false,
             alt: media.params.alt,
             title: media.params.title
           });

diff --git a/language/.en.json b/language/.en.json
@@ -6,6 +6,9 @@
         {
           "label": "Type",
           "description": "Optional media to display above the question."
+        },
+        {
+          "label": "Disable image zooming"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Put input fields on separate lines"
         },
-        {
-          "label": "Disable image zooming for question image"
-        },
         {
           "label": "Show confirmation dialog on \"Check\"",
           "description": "This options is not compatible with the \"Automatically check answers after input\" option"

diff --git a/language/af.json b/language/af.json
@@ -6,6 +6,9 @@
         {
           "label": "Type",
           "description": "Optional media to display above the question."
+        },
+        {
+          "label": "Disable image zooming"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Put input fields on separate lines"
         },
-        {
-          "label": "Disable image zooming for question image"
-        },
         {
           "label": "Show confirmation dialog on \"Check\"",
           "description": "This options is not compatible with the \"Automatically check answers after input\" option"

diff --git a/language/ar.json b/language/ar.json
@@ -6,6 +6,9 @@
         {
           "label": "النوع",
           "description": "وسائط اختيارية لعرضها فوق السؤال."
+        },
+        {
+          "label": "تعطيل تكبير الصورة لصورة السؤال"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "ضع حقول الإدخال على أسطر منفصلة"
         },
-        {
-          "label": "تعطيل تكبير الصورة لصورة السؤال"
-        },
         {
           "label": "إظهار مربع حوار التأكيد على  \"تحقق \" ",
           "description": "هذه الخيارات غير متوافقة مع الخيار 'التحقق التلقائي من الإجابات بعد الإدخال '."

diff --git a/language/bs.json b/language/bs.json
@@ -6,6 +6,9 @@
         {
           "label": "Tip",
           "description": "Opcionalni mediji koji mogu biti prikazani iznad zadatka."
+        },
+        {
+          "label": "Deaktivirati zumiranje slike"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Setze die Lücken jeweils in eine eigene Zeile"
         },
-        {
-          "label": "Deaktivirati zumiranje slike."
-        },
         {
           "label": "Prikazati dijalog potvrde nakon klika na dugme \"Provjeri\"",
           "description": "Ova opcija ne funkcionira zajedno sa \"Odgovore nakon unošenja automatski provjeri\""

diff --git a/language/ca.json b/language/ca.json
@@ -6,6 +6,9 @@
         {
           "label": "Tipus",
           "description": "Recursos opcionals per mostrar al damunt de la pregunta."
+        },
+        {
+          "label": "Disable image zooming"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Put input fields on separate lines"
         },
-        {
-          "label": "Disable image zooming for question image"
-        },
         {
           "label": "Show confirmation dialog on \"Check\"",
           "description": "This options is not compatible with the \"Automatically check answers after input\" option"

diff --git a/language/cs.json b/language/cs.json
@@ -6,6 +6,9 @@
         {
           "label": "Type",
           "description": "Optional media to display above the question."
+        },
+        {
+          "label": "Disable image zooming"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Put input fields on separate lines"
         },
-        {
-          "label": "Disable image zooming for question image"
-        },
         {
           "label": "Show confirmation dialog on \"Check\"",
           "description": "This options is not compatible with the \"Automatically check answers after input\" option"

diff --git a/language/da.json b/language/da.json
@@ -6,6 +6,9 @@
         {
           "label": "Type",
           "description": "Optional media to display above the question."
+        },
+        {
+          "label": "Disable image zooming"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Put input fields on separate lines"
         },
-        {
-          "label": "Disable image zooming for question image"
-        },
         {
           "label": "Show confirmation dialog on \"Check\"",
           "description": "This options is not compatible with the \"Automatically check answers after input\" option"

diff --git a/language/de.json b/language/de.json
@@ -6,6 +6,9 @@
         {
           "label": "Typ",
           "description": "Optionale Medien, die über der Frage angezeigt werden können."
+        },
+        {
+          "label": "Bildzoom deaktivieren"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Setze die Lücken jeweils in eine eigene Zeile"
         },
-        {
-          "label": "Bilderzoom für Bilder zu Fragen deaktivieren."
-        },
         {
           "label": "Bestätigungsdialog beim Klicken auf \"Überprüfen\" anzeigen",
           "description": "Diese Option funktioniert nicht zusammen mit \"Antworten nach Eingabe automatisch prüfen\""

diff --git a/language/el.json b/language/el.json
@@ -6,6 +6,9 @@
         {
           "label": "Type",
           "description": "Optional media to display above the question."
+        },
+        {
+          "label": "Disable image zooming"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Put input fields on separate lines"
         },
-        {
-          "label": "Disable image zooming for question image"
-        },
         {
           "label": "Show confirmation dialog on \"Check\"",
           "description": "This options is not compatible with the \"Automatically check answers after input\" option"

diff --git a/language/es.json b/language/es.json
@@ -6,6 +6,9 @@
         {
           "label": "Tipo",
           "description": "Optional media to display above the question."
+        },
+        {
+          "label": "Disable image zooming"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Put input fields on separate lines"
         },
-        {
-          "label": "Disable image zooming for question image"
-        },
         {
           "label": "Show confirmation dialog on \"Check\"",
           "description": "This options is not compatible with the \"Automatically check answers after input\" option"

diff --git a/language/et.json b/language/et.json
@@ -6,6 +6,9 @@
         {
           "label": "Tüüp",
           "description": "Pilt või video, mida kuvatakse küsimuse juures (mittekohustuslik element)."
+        },
+        {
+          "label": "Disable image zooming"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Put input fields on separate lines"
         },
-        {
-          "label": "Disable image zooming for question image"
-        },
         {
           "label": "Show confirmation dialog on \"Check\"",
           "description": "This options is not compatible with the \"Automatically check answers after input\" option"

diff --git a/language/fi.json b/language/fi.json
@@ -6,6 +6,9 @@
         {
           "label": "Tyyppi",
           "description": "Valinnainen kuva tai video, joka näkyy kysymyksen yläpuolella."
+        },
+        {
+          "label": "Estä kysymykseen liitetyn kuvan suurentaminen"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Järjestä vastauskentät eri riveille"
         },
-        {
-          "label": "Estä kysymykseen liitetyn kuvan suurentaminen"
-        },
         {
           "label": "Näytä varmistusdialogi, kun käyttäjä klikkaa \"Tarkista\"",
           "description": "Tämä valinta ei toimi yhdessä \"Tarkista vastaukset automaattisesti\" valinnan kanssa"

diff --git a/language/fr.json b/language/fr.json
@@ -6,6 +6,9 @@
         {
           "label": "Type de média",
           "description": "Fichier média à afficher en option au-dessus de la question."
+        },
+        {
+          "label": "Désactiver l'agrandissement de l'image"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Afficher les blancs sur des lignes séparées."
         },
-        {
-          "label": "Désactiver l'agrandissement de l'image de la question."
-        },
         {
           "label": "Afficher la fenêtre de confirmation pour \"Vérifier\"",
           "description": "Cette option n'est pas compatible avec l'option \"Vérifier les réponses instantanément dès la saisie.\""

diff --git a/language/he.json b/language/he.json
@@ -6,6 +6,9 @@
         {
           "label": "Type",
           "description": "Optional media to display above the question."
+        },
+        {
+          "label": "Disable image zooming"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Put input fields on separate lines"
         },
-        {
-          "label": "Disable image zooming for question image"
-        },
         {
           "label": "Show confirmation dialog on \"Check\"",
           "description": "This options is not compatible with the \"Automatically check answers after input\" option"

diff --git a/language/hu.json b/language/hu.json
@@ -6,6 +6,9 @@
         {
           "label": "Type",
           "description": "Optional media to display above the question."
+        },
+        {
+          "label": "Disable image zooming"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Put input fields on separate lines"
         },
-        {
-          "label": "Disable image zooming for question image"
-        },
         {
           "label": "Show confirmation dialog on \"Check\"",
           "description": "This options is not compatible with the \"Automatically check answers after input\" option"

diff --git a/language/it.json b/language/it.json
@@ -6,6 +6,9 @@
         {
           "label": "Tipo",
           "description": "Media opzionale da mostrare sopra la domanda."
+        },
+        {
+          "label": "Disabilita lo zoom dell'immagine"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Inserire campi di input in righe separate"
         },
-        {
-          "label": "Disabilita lo zoom dell'immagine su immagini-domanda"
-        },
         {
           "label": "Mostra la finestra di dialogo di conferma su \"Verifica\"",
           "description": "Questa scelta non è compatibile con l'opzione \"Controlla automaticamente le risposte dopo l'immissione\""

diff --git a/language/ja.json b/language/ja.json
@@ -6,6 +6,9 @@
         {
           "label": "タイプ",
           "description": "設問の上に表示するオプションのメディア。"
+        },
+        {
+          "label": "Disable image zooming"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Put input fields on separate lines"
         },
-        {
-          "label": "Disable image zooming for question image"
-        },
         {
           "label": "Show confirmation dialog on \"Check\"",
           "description": "This options is not compatible with the \"Automatically check answers after input\" option"

diff --git a/language/ko.json b/language/ko.json
@@ -6,6 +6,9 @@
         {
           "label": "Type",
           "description": "Optional media to display above the question."
+        },
+        {
+          "label": "Disable image zooming"
         }
       ]
     },
@@ -129,9 +132,6 @@
         {
           "label": "Put input fields on separate lines"
         },
-        {
-          "label": "Disable image zooming for question image"
-        },
         {
           "label": "Show confirmation dialog on \"Check\"",
           "description": "This options is not compatible with the \"Automatically check answers after input\" option"