jsxgraph 1.3.1 → 1.4.2

package/src/parser/jessiescript.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,

package/src/reader/cinderella.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,

package/src/reader/file.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,

package/src/reader/geogebra.js

@@ -1,5 +1,5 @@
 /*
- Copyright 2008-2021
+ Copyright 2008-2022
  Matthias Ehmann,
  Michael Gerhaeuser,
  Carsten Miller,

package/src/reader/geonext.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,

package/src/reader/graph.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,

package/src/reader/intergeo.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,

package/src/reader/sketch.js

@@ -1,5 +1,5 @@
 /*
-Copyright 2008-2021
+Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -45,14 +45,14 @@ Copyright 2008-2021
  utils/type
  */
 
-(function () {
+(function() {
 
     'use strict';
 
     // this is a small workaround to adapt the SketchReader to our new file API
     // we don't have to change anything in sketchometry.
-    JXG.SketchReader = function (board, str) {
-        this.read = function () {
+    JXG.SketchReader = function(board, str) {
+        this.read = function() {
             var i, t, arr, unzipped, meta, constr;
 
             unzipped = new JXG.Util.Unzip(JXG.Util.Base64.decodeAsArray(str)).unzip();
@@ -101,11 +101,11 @@ Copyright 2008-2021
 
     // No prototype here
     JXG.extend(JXG.SketchReader, /** @lends JXG.SketchReader */ {
-        generateJCodeMeta: function () {
+        generateJCodeMeta: function() {
             return ['', '', '', ''];
         },
 
-        id: function () {
+        id: function() {
             return JXG.Util.genUUID();
         },
 
@@ -129,7 +129,7 @@ Copyright 2008-2021
          * @param {Array} step_log The complete step log
          * @returns {Array} JessieCode to set and reset the step.
          */
-        generateJCode: function (step, board, step_log) {
+        generateJCode: function(step, board, step_log) {
             var i, j, k, sub_id, str, str1, str2, objects, pid1, pid2, pid3,
                 xstart, ystart, el, arr, step2, options, assign, attrid,
                 le, x, y,
@@ -144,7 +144,7 @@ Copyright 2008-2021
 
                 // print number -- helper to prepare numbers
                 // for printing, e.g. trim them with toFixed()
-                pn = function (v) {
+                pn = function(v) {
                     if (options.toFixed > 0) {
                         v = parseFloat(v);
                         return JXG.toFixed(v, options.toFixed);
@@ -153,7 +153,7 @@ Copyright 2008-2021
                     return v;
                 },
 
-                getObject = function (v) {
+                getObject = function(v) {
                     var o;
 
                     if (options.useSymbols) {
@@ -1125,13 +1125,17 @@ Copyright 2008-2021
                     break;
 
                 case JXG.GENTYPE_TEXT:
+                    if (step.args.str.substr(0, 1) !== '\'' && step.args.str.substr(0, 1) !== '"' && step.args.str.substr(0, 8) !== 'function') {
+                        step.args.str = '\'' + step.args.str + '\'';
+                    }
+
                     set_str = assign + 'text(' + pn(step.args.x) + ', ' + pn(step.args.y) + ', ' + step.args.str + ') <<';
                     set_str += attrid + 'name: \'\'';
                     if (typeof step.args.anchor != 'undefined') {
                         set_str += ', anchor: ' + step.args.anchor;
                     }
-                    set_str += '>>; ' + step.dest_id + '.setText(' + step.args.str;
-                    set_str += '); ';
+                    set_str += '>>; ';
+                    // set_str += step.dest_id + '.setText(' + step.args.str + '); ';
                     reset_str = 'remove(' + step.dest_id + '); ';
                     break;
 
@@ -1314,7 +1318,11 @@ Copyright 2008-2021
                     set_str += 'dot: <<priv:true, id: \'' + step.dest_sub_ids[0] + '\', name: \'\'>>, ';
                     set_str += attrid + ' fillOpacity: ' + JXG.Options.opacityLevel;
                     if (JXG.exists(step.args) && JXG.exists(step.args.radius))
-                        set_str += ', radius: ' + step.args.radius;
+                        if (JXG.isNumber(step.args.radius)) {
+                            set_str += ', radius: ' + step.args.radius;
+                        } else {
+                            set_str += ', radius: \'' + step.args.radius + '\'';
+                        }
                     set_str += '>>; ';
                     reset_str = 'remove(' + step.dest_id + '); ';
                     reset_str += 'remove(' + step.dest_sub_ids[0] + '); ';
@@ -1368,10 +1376,10 @@ Copyright 2008-2021
 
                     set_str = assign + step.args.plot_type + '(' + step.args.func;
 
-                    if (isNaN(step.args.a) || step.args.a === null || step.args.a === undefined)
-                        step.args.a = '-infinity';
-                    if (isNaN(step.args.b) || step.args.b === null || step.args.b === undefined)
-                        step.args.b = 'infinity';
+                    if (isNaN(step.args.a) || step.args.a === null || step.args.a === undefined|| step.args.a ==='-infinity')
+                        step.args.a = '';
+                    if (isNaN(step.args.b) || step.args.b === null || step.args.b === undefined|| step.args.b ==='infinity')
+                        step.args.b = '';
 
                     if (step.args.a != step.args.b)
                         set_str += ', ' + step.args.a + ', ' + step.args.b;
@@ -1714,7 +1722,7 @@ Copyright 2008-2021
             return [set_str, ctx_set_str, reset_str, ctx_reset_str];
         },
 
-        replaceStepDestIds: function (step, id_map) {
+        replaceStepDestIds: function(step, id_map) {
             var i, j, copy_ids = [];
 
             for (i = 0; i < id_map.length; i++) {

package/src/renderer/abstract.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -38,6 +38,7 @@
     newcap:   AsciiMathMl exposes non-constructor functions beginning with upper case letters
 */
 /*jslint nomen: true, plusplus: true, newcap: true, unparam: true*/
+/*eslint no-unused-vars: "off"*/
 
 /* depends:
  jxg
@@ -1010,7 +1011,8 @@ define([
          * @see JXG.AbstractRenderer#updateTextStyle
          */
         updateText: function (el) {
-            var content = el.plaintext, v, c,
+            var content = el.plaintext,
+                v, c,
                 parentNode,
                 scale, vshift, id, wrap_id,
                 ax, ay;
@@ -1091,10 +1093,18 @@ define([
                     // Set the content
                     if (el.htmlStr !== content) {
                         try {
-                            el.rendNode.innerHTML = content;
+                            if (el.type === Type.OBJECT_TYPE_BUTTON) {
+                                el.rendNodeButton.innerHTML = content;
+                            } else if (el.type === Type.OBJECT_TYPE_CHECKBOX ||
+                                el.type === Type.OBJECT_TYPE_INPUT) {
+                                el.rendNodeLabel.innerHTML = content;
+                            } else {
+                                el.rendNode.innerHTML = content;
+                            }
                         } catch (e) {
-                            // Setting innerHTML sometimes fails in IE8. A workaround is to
-                            // take the node off the DOM, assign innerHTML, then append back.
+                            // Setting innerHTML sometimes fails in IE8.
+                            // A workaround is to take the node off the DOM, assign innerHTML,
+                            // then append back.
                             // Works for text elements as they are absolutely positioned.
                             parentNode = el.rendNode.parentNode;
                             el.rendNode.parentNode.removeChild(el.rendNode);
@@ -1130,9 +1140,11 @@ define([
                             }
                         } else if (Type.evaluate(el.visProp.usekatex)) {
                             try {
+                                /* eslint-disable no-undef */
                                 katex.render(content, el.rendNode, {
                                     throwOnError: false
                                 });
+                                /* eslint-enable no-undef */
                             } catch (e) {
                                 JXG.debug('KaTeX (not yet) loaded');
                             }
@@ -1418,6 +1430,9 @@ define([
             el.rendNode.className = Type.evaluate(doHighlight ? el.visProp.highlightcssclass : el.visProp.cssclass);
         },
 
+        drawForeignObject: function (el) { /* stub */ },
+
+        updateForeignObject: function(el) { /* stub */ },
 
         /* **************************
          * Render primitive objects
@@ -1569,8 +1584,11 @@ define([
 
         setTabindex: function(element) {
             var val;
-            if (Type.exists(element.rendNode)) {
+            if (element.board.attr.keyboard.enabled && Type.exists(element.rendNode)) {
                 val = Type.evaluate(element.visProp.tabindex);
+                if (!element.visPropCalc.visible || Type.evaluate(element.visProp.fixed)) {
+                    val = null;
+                }
                 if (val !== element.visPropOld.tabindex) {
                     element.rendNode.setAttribute('tabindex', val);
                     element.visPropOld.tabindex = val;
@@ -1923,7 +1941,7 @@ define([
 
                 if (board.attr.showfullscreen) {
                     createButton(board.attr.fullscreen.symbol, function () {
-                        board.toFullscreen();
+                        board.toFullscreen(board.attr.fullscreen.id);
                     });
                 }
 

package/src/renderer/canvas.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -56,7 +56,8 @@ define([
 
     /**
      * Uses HTML Canvas to implement the rendering methods defined in {@link JXG.AbstractRenderer}.
-     * @class JXG.AbstractRenderer
+     * 
+     * @class JXG.CanvasRenderer
      * @augments JXG.AbstractRenderer
      * @param {Node} container Reference to a DOM node containing the board.
      * @param {Object} dim The dimensions of the board
@@ -88,13 +89,17 @@ define([
                 'px" height="', dim.height,
                 'px"><', '/canvas>'].join('');
             this.canvasRoot = this.container.ownerDocument.getElementById(this.canvasId);
-            this.context =  this.canvasRoot.getContext('2d');
             this.canvasRoot.style.display = 'block';
+            this.context = this.canvasRoot.getContext('2d');
 
         } else if (Env.isNode()) {
-            this.canvasId = (typeof module === 'object' ? module.require('canvas') : require('canvas'));
-            this.canvasRoot = new this.canvasId(500, 500);
-            this.context = this.canvasRoot.getContext('2d');
+            try {
+                this.canvasId = (typeof module === 'object' ? module.require('canvas') : require('canvas'));
+                this.canvasRoot = new this.canvasId(500, 500);
+                this.context = this.canvasRoot.getContext('2d');
+            } catch (err) {
+                console.log("Warning: 'canvas' not found. You might need to call 'npm install canvas'");
+            }
         }
 
         this.dashArray = [[2, 2], [5, 5], [10, 10], [20, 20], [20, 10, 10, 10], [20, 5, 10, 5]];
@@ -1059,7 +1064,7 @@ define([
          *    Text related stuff
          * **************************/
 
-        // already documented in JXG.AbstractRenderer
+        // Already documented in JXG.AbstractRenderer
         displayCopyright: function (str, fontSize) {
             var context = this.context;
 
@@ -1072,7 +1077,7 @@ define([
             context.restore();
         },
 
-        // already documented in JXG.AbstractRenderer
+        // Already documented in JXG.AbstractRenderer
         drawInternalText: function (el) {
             var ev_fs = Type.evaluate(el.visProp.fontsize),
                 fontUnit = Type.evaluate(el.visProp.fontunit),
@@ -1106,7 +1111,7 @@ define([
             return null;
         },
 
-        // already documented in JXG.AbstractRenderer
+        // Already documented in JXG.AbstractRenderer
         updateInternalText: function (el) {
             this.drawInternalText(el);
         },
@@ -1152,7 +1157,7 @@ define([
          *    Image related stuff
          * **************************/
 
-        // already documented in JXG.AbstractRenderer
+        // Already documented in JXG.AbstractRenderer
         drawImage: function (el) {
             el.rendNode = new Image();
             // Store the file name of the image.
@@ -1164,7 +1169,7 @@ define([
             this.updateImage(el);
         },
 
-        // already documented in JXG.AbstractRenderer
+        // Already documented in JXG.AbstractRenderer
         updateImage: function (el) {
             var context = this.context,
                 o = Type.evaluate(el.visProp.fillopacity),
@@ -1195,7 +1200,7 @@ define([
             }
         },
 
-        // already documented in JXG.AbstractRenderer
+        // Already documented in JXG.AbstractRenderer
         transformImage: function (el, t) {
             var m, len = t.length,
                 ctx = this.context;
@@ -1208,7 +1213,7 @@ define([
             }
         },
 
-        // already documented in JXG.AbstractRenderer
+        // Already documented in JXG.AbstractRenderer
         updateImageURL: function (el) {
             var url;
 
@@ -1312,7 +1317,7 @@ define([
             this._stroke(el);
         },
 
-        // already documented in JXG.AbstractRenderer
+        // Already documented in JXG.AbstractRenderer
         updatePathStringBezierPrim: function (el) {
             var i, j, k, scr, lx, ly, len,
                 symbm = 'M',
@@ -1418,7 +1423,7 @@ define([
 
         // **************************  Set Attributes *************************
 
-        // already documented in JXG.AbstractRenderer
+        // Already documented in JXG.AbstractRenderer
         display: function(el, val) {
              if (el && el.rendNode) {
                  el.visPropOld.visible = val;

package/src/renderer/no.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -32,6 +32,7 @@
 
 /*global JXG: true, define: true, AMprocessNode: true, MathJax: true, document: true */
 /*jslint nomen: true, plusplus: true, newcap:true, unparam: true*/
+/*eslint no-unused-vars: "off"*/
 
 /* depends:
  jxg
@@ -52,8 +53,11 @@ define(['jxg', 'renderer/abstract'], function (JXG, AbstractRenderer) {
 
     /**
      * This renderer draws nothing. It is intended to be used in environments where none of our rendering engines
-     * are available, e.g. WebWorkers.
-     * @class JXG.AbstractRenderer
+     * are available, e.g. WebWorkers. All methods are empty.
+     * 
+     * @class JXG.NoRenderer
+     * @augments JXG.AbstractRenderer
+     * @see JXG.AbstractRenderer
      */
     JXG.NoRenderer = function () {
         /**
@@ -75,7 +79,7 @@ define(['jxg', 'renderer/abstract'], function (JXG, AbstractRenderer) {
         this.type = 'no';
     };
 
-    JXG.extend(JXG.NoRenderer.prototype, /** @lends JXG.AbstractRenderer.prototype */ {
+    JXG.extend(JXG.NoRenderer.prototype, /** @lends JXG.NoRenderer.prototype */ {
         /* ******************************** *
          *    Point drawing and updating    *
          * ******************************** */
@@ -656,6 +660,9 @@ define(['jxg', 'renderer/abstract'], function (JXG, AbstractRenderer) {
 
     });
 
+    /**
+     * @ignore
+     */
     JXG.NoRenderer.prototype = new AbstractRenderer();
 
     return JXG.NoRenderer;