jclic 2.1.26 → 2.2.1

package/src/activities/text/FillInBlanks.js

@@ -109,7 +109,7 @@ export class FillInBlanksPanel extends TextActivityBasePanel {
       if (target.options[0].trim() !== '')
         $('<option selected/>', { value: '', text: '' }).appendTo($span);
       target.options.forEach(op => $('<option/>', { value: op, text: op }).appendTo($span));
-      target.$comboList = $span.bind('focus change', event => {
+      target.$comboList = $span.on('focus change', event => {
         event.textTarget = target;
         this.processEvent(event);
       });
@@ -124,10 +124,10 @@ export class FillInBlanksPanel extends TextActivityBasePanel {
         id: idLabel,
         autocomplete: 'off',
         spellcheck: 'false'
-      }).bind('focus input blur', event => {
+      }).on('focus input blur', event => {
         event.textTarget = target;
         this.processEvent(event);
-      }).bind('keydown keyup', event => {
+      }).on('keydown keyup', event => {
         // Catch `enter` key in Firefox
         if (event.keyCode === 13) {
           event.preventDefault();
@@ -204,10 +204,10 @@ export class FillInBlanksPanel extends TextActivityBasePanel {
 
       const destTarget = this.targets[p];
       if (destTarget.$span) {
-        destTarget.$span.focus();
+        destTarget.$span.trigger('focus');
         setSelectionRange(destTarget.$span.get(-1), 0, 0);
       } else if (destTarget.$comboList)
-        destTarget.$comboList.focus();
+        destTarget.$comboList.trigger('focus');
     }
     return ok;
   }
@@ -283,7 +283,7 @@ export class FillInBlanksPanel extends TextActivityBasePanel {
     // `pre-wrap` (needed for tabulated texts)
     $('.JClicTextTarget').css('white-space', 'normal');
     if (this.targets.length > 0 && this.targets[0].$span)
-      this.targets[0].$span.focus();
+      this.targets[0].$span.trigger('focus');
   }
 
   /**
@@ -294,9 +294,9 @@ export class FillInBlanksPanel extends TextActivityBasePanel {
   finishActivity(result) {
     this.targets.forEach(target => {
       if (target.$span)
-        target.$span.removeAttr('contenteditable').blur();
+        target.$span.removeAttr('contenteditable').trigger('blur');
       else if (target.$comboList)
-        target.$comboList.attr('disabled', 'true').blur();
+        target.$comboList.prop('disabled', true).trigger('blur');
     });
     return super.finishActivity(result);
   }

package/src/activities/text/IdentifyText.js

@@ -77,7 +77,7 @@ class IdentifyTextPanel extends TextActivityBasePanel {
   $createTargetElement(target, $span) {
     super.$createTargetElement(target, $span);
     const idLabel = `target${`000${this.targets.length - 1}`.slice(-3)}`;
-    $span.bind('click', event => {
+    $span.on('click', event => {
       event.textTarget = target;
       event.idLabel = idLabel;
       this.processEvent(event);
@@ -86,7 +86,7 @@ class IdentifyTextPanel extends TextActivityBasePanel {
   }
 
   $createSpanElement($span) {
-    $span.bind('click', event => {
+    $span.on('click', event => {
       event.$spanElement = $span;
       this.processEvent(event);
     });

package/src/activities/text/OrderText.js

@@ -155,7 +155,7 @@ export class OrderTextPanel extends TextActivityBasePanel {
   $createTargetElement(target, $span) {
     super.$createTargetElement(target, $span);
     const idLabel = `target${`000${this.targets.length - 1}`.slice(-3)}`;
-    $span.addClass('JClicTextTarget').bind('click', event => {
+    $span.addClass('JClicTextTarget').on('click', event => {
       event.textTarget = target;
       event.idLabel = idLabel;
       this.processEvent(event);

package/src/activities/text/TextActivityBase.js

@@ -264,7 +264,7 @@ export class TextActivityBasePanel extends ActivityPanel {
 
               // Catch on-demand popups with `F1`, cancel with `Escape`
               if ($popup !== null && target.infoMode === 'onDemand') {
-                $span.keydown(ev => {
+                $span.on('keydown', ev => {
                   if (ev.key === target.popupKey) {
                     ev.preventDefault();
                     this.showPopup($popup, target.popupMaxTime, target.popupDelay);
@@ -374,7 +374,7 @@ export class TextActivityBasePanel extends ActivityPanel {
 
     const prevScreenEnd = () => {
       this.showingPrevScreen = false;
-      this.$div.unbind('click');
+      this.$div.off('click');
       if (this.prevScreenTimer) {
         window.clearTimeout(this.prevScreenTimer);
         this.prevScreenTimer = null;
@@ -432,7 +432,7 @@ export class TextActivityBasePanel extends ActivityPanel {
       this.$checkButton.prop('disabled', true);
     this.targets.forEach(t => {
       if (t.$comboList)
-        t.$comboList.attr('disabled', true);
+        t.$comboList.prop('disabled', true);
     });
     this.showPopup(null);
     super.finishActivity(result);

package/src/activities/text/TextActivityDocument.js

@@ -29,6 +29,8 @@
  *  @module
  */
 
+/* global structuredClone */
+
 import $ from 'jquery';
 import { log, attrForEach, checkColor, getBoolean, getAttr, setAttr, getVal, getNumber, settings } from '../../Utils.js';
 import ActiveBoxContent from '../../boxes/ActiveBoxContent.js';
@@ -46,7 +48,7 @@ export class TextActivityDocument {
    */
   constructor() {
     // Make a deep clone of the default style
-    this.style = { 'default': { ...TextActivityDocument.DEFAULT_DOC_STYLE } };
+    this.style = { 'default': structuredClone(TextActivityDocument.DEFAULT_DOC_STYLE) };
     this.p = [];
   }
 

package/src/activities/text/WrittenAnswer.js

@@ -464,7 +464,7 @@ export class WrittenAnswerPanel extends ActivityPanel {
     if (bx)
       this.currentCell = bx.idLoc;
     this.$textField.val('');
-    this.$textField.focus();
+    this.$textField.trigger('focus');
     this.invalidate().update();
     if (bx)
       bx.playMedia(this.ps, delayedActions);
@@ -491,7 +491,7 @@ export class WrittenAnswerPanel extends ActivityPanel {
 
           // Avoid clicks on the text field
           if (this.bgB.contains(p)) {
-            this.$textField.focus();
+            this.$textField.trigger('focus');
             break;
           }
 

package/src/activities/textGrid/CrossWord.js

@@ -154,7 +154,7 @@ export class CrossWordPanel extends ActivityPanel {
       'background-image': `url(${type === 'acrossClues' ? this.hIcon : this.vIcon})`,
       'background-repeat': 'no-repeat',
       'background-position': 'center',
-      'border-radius': 6,
+      'border-radius': '6px',
       'z-index': 10
     }).on('click', () => {
       this.advance = type === 'acrossClues' ?
@@ -247,7 +247,7 @@ export class CrossWordPanel extends ActivityPanel {
       this.setAndPlayMsg('initial', 'start');
       this.invalidate().update();
       this.$div.attr("tabindex", 0);
-      this.$div.focus();
+      this.$div.trigger('focus');
       this.playing = true;
     }
   }

package/src/boxes/ActiveBox.js

@@ -723,9 +723,9 @@ export class ActiveBox extends AbstractBox {
         disabled = this.isInactive() && !this.accessibleAlwaysActive;
       this.$accessibleElement = $('<button/>', {
         tabindex: disabled ? -1 : 0,
-        id: `AE${id}`,
-        disabled: disabled
+        id: `AE${id}`
       })
+        .prop('disabled', disabled ? true : null)
         .html(this.toString())
         .on('click', ev => {
           // Check if event was produced by a mouse click

package/src/skins/Skin.js

@@ -735,10 +735,8 @@ export class Skin extends Container {
    * @param {boolean} enabled
    */
   setEnabled($object, enabled) {
-    if ($object && enabled)
-      $object.removeAttr('disabled');
-    else if ($object)
-      $object.attr('disabled', true);
+    if ($object)
+      $object.prop('disabled', enabled ? null : true);
   }
 
   /**