jsxgraph 1.4.0 → 1.4.3

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,
@@ -886,7 +886,7 @@ Copyright 2008-2021
                             str1[i] = pn(step.args.p1[i]);
                         }
 
-                        set_str = 'point(' + str1.join(', ') + ') <<id: \'' + pid1 + '\', name: \'\', visible: false, ';
+                        set_str = 'point(' + str1.join(', ') + ') <<id: \'' + pid1 + '\', name: \'\', visible: false, isinfinit: true, ';
                         set_str += 'snaptogrid: false, snaptopoints: false, priv: true>>; ';
                         reset_str = 'remove(' + pid1 + '); ';
                     } else {
@@ -901,7 +901,7 @@ Copyright 2008-2021
                             str1[i] = pn(step.args.p2[i]);
                         }
 
-                        set_str += 'point(' + str1.join(', ') + ') <<id: \'' + pid2 + '\', name: \'\', visible: false, ';
+                        set_str += 'point(' + str1.join(', ') + ') <<id: \'' + pid2 + '\', name: \'\', visible: false, isinfinit: true, ';
                         set_str += 'snaptogrid: false, snaptopoints: false, priv: true>>; ';
                         reset_str = 'remove(' + pid2 + '); ' + reset_str;
                     } else {
@@ -1376,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;

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
@@ -1139,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');
                             }
@@ -1581,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;

package/src/renderer/canvas.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -89,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]];

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

package/src/renderer/svg.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -1579,7 +1579,6 @@ define([
                     canvas.height = images[i].getAttribute("height");
                     try {
                         ctx.drawImage(images[i], 0, 0, canvas.width, canvas.height);
-                        //ctx.drawImage(document.getElementById('testimg2'), 0, 0, canvas.width, canvas.height);
 
                         // If the image is not png, the format must be specified here
                         ur = canvas.toDataURL();
@@ -1587,7 +1586,6 @@ define([
                     } catch (err) {
                         console.log("CORS problem! Image can not be used", err);
                     }
-                    //};
                 }
                 //canvas.remove();
             }
@@ -1650,8 +1648,8 @@ define([
             // }
 
             // In IE we have to remove the namespace again.
-            if ((svg.match(/xmlns=\"http:\/\/www.w3.org\/2000\/svg\"/g) || []).length > 1) {
-                svg = svg.replace(/xmlns=\"http:\/\/www.w3.org\/2000\/svg\"/g, '');
+            if ((svg.match(/xmlns="http:\/\/www.w3.org\/2000\/svg"/g) || []).length > 1) {
+                svg = svg.replace(/xmlns="http:\/\/www.w3.org\/2000\/svg"/g, '');
             }
 
             // Safari fails if the svg string contains a " "
@@ -1696,17 +1694,16 @@ define([
          * 	setTimeout(function() { console.log('done'); }, 400);
          */
         dumpToCanvas: function (canvasId, w, h, ignoreTexts) {
-            var //svgRoot = this.svgRoot,
-                svg, tmpImg, cv, ctx;
-                // wOrg, hOrg;
-
-            // wOrg = svgRoot.getAttribute('width');
-            // hOrg = svgRoot.getAttribute('height');
+            var svg, tmpImg, cv, ctx;
 
             // Prepare the canvas element
             cv = document.getElementById(canvasId);
+
             // Clear the canvas
+            /* eslint-disable no-self-assign */
             cv.width = cv.width;
+            /* eslint-enable no-self-assign */
+
             ctx = cv.getContext("2d");
             if (w !== undefined && h !== undefined) {
                 cv.style.width = parseFloat(w) + 'px';
@@ -1793,8 +1790,8 @@ define([
                 return this;
             }
 
-            w = bas.scale * parseFloat(this.container.style.width);
-            h = bas.scale * parseFloat(this.container.style.height);
+            w = bas.scale * this.container.getBoundingClientRect().width;
+            h = bas.scale * this.container.getBoundingClientRect().height;
 
             if (imgId === undefined || imgId === '') {
                 newImg = true;

package/src/renderer/vml.js

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

package/src/server/server.js

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

package/src/utils/base64.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -134,7 +134,7 @@ define(['jxg', 'utils/encoding'], function (JXG, Encoding) {
 
             // deactivate regexp linting. Our regex is secure, because we replace everything with ''
             /*jslint regexp:true*/
-            encInput = input.replace(/[^A-Za-z0-9\+\/=]/g, '');
+            encInput = input.replace(/[^A-Za-z0-9+/=]/g, '');
             /*jslint regexp:false*/
 
             len = encInput.length;

package/src/utils/color.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -45,7 +45,7 @@
  * Stoyan Stefanov <sstoo@gmail.com> (see http://www.phpied.com/rgb-color-parser-in-javascript/)
  */
 
-define(['jxg', 'utils/type', 'math/math'], 
+define(['jxg', 'utils/type', 'math/math'],
     function (JXG, Type, Mat) {
 
     "use strict";
@@ -202,7 +202,7 @@ define(['jxg', 'utils/type', 'math/math'],
 
         // array of color definition objects
         colorDefs = [{
-            re: /^\s*rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*([\d\.]{1,3})\s*\)\s*$/,
+            re: /^\s*rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*([\d.]{1,3})\s*\)\s*$/,
             example: ['rgba(123, 234, 45, 0.5)', 'rgba(255,234,245,1.0)'],
             process: function (bits) {
                 return [
@@ -988,8 +988,7 @@ define(['jxg', 'utils/type', 'math/math'],
             green: '#009E73', // bluishgreen
             purple: '#CC79A7', // reddishpurple
             white: '#ffffff'
-        },
-
+        }
     });
 
     /**
@@ -1004,16 +1003,16 @@ define(['jxg', 'utils/type', 'math/math'],
      * <li> white
      * <li> yellow
      * </ul>
-     * 
+     *
      * @name JXG.palette
      * @type Object
      * @default JXG.paletteWong
      * @see JXG.paletteWong
-     * 
+     *
      * @example
-     * 
+     *
      * var p = board.create('line', [[-1, 1], [2, -3]], {strokeColor: JXG.palette.yellow});
-     * 
+     *
      */
     JXG.palette = JXG.paletteWong;
 

package/src/utils/dump.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -304,7 +304,7 @@ define(['jxg', 'utils/type'], function (JXG, Type) {
                 }
                 return 'null';
             case 'string':
-                return '\'' + obj.replace(/(["'])/g, '\\$1') + '\'';
+                return '\'' + obj.replace(/\\/g,'\\\\').replace(/(["'])/g, '\\$1') + '\'';
             case 'number':
             case 'boolean':
                 return obj.toString();
@@ -319,7 +319,7 @@ define(['jxg', 'utils/type'], function (JXG, Type) {
          * @returns {String} JessieCode
          */
         toJessie: function (board) {
-            var i, elements,
+            var i, elements, id,
                 dump = this.dump(board),
                 script = [];
 
@@ -331,8 +331,15 @@ define(['jxg', 'utils/type'], function (JXG, Type) {
                 if (elements[i].attributes.name.length > 0) {
                     script.push('// ' + elements[i].attributes.name);
                 }
-
                 script.push('s' + i + ' = ' + elements[i].type + '(' + elements[i].parents.join(', ') + ') ' + this.toJCAN(elements[i].attributes).replace(/\n/, '\\n') + ';');
+
+                if (elements[i].type === 'axis') {
+                    // Handle the case that remove[All]Ticks had been called.
+                    id = elements[i].attributes.id;
+                    if (board.objects[id].defaultTicks === null) {
+                        script.push('s' + i + '.removeAllTicks();');
+                    }
+                }
                 script.push('');
             }
 
@@ -355,7 +362,7 @@ define(['jxg', 'utils/type'], function (JXG, Type) {
          * @returns {String} JavaScript
          */
         toJavaScript: function (board) {
-            var i, elements,
+            var i, elements, id,
                 dump = this.dump(board),
                 script = [];
 
@@ -365,6 +372,14 @@ define(['jxg', 'utils/type'], function (JXG, Type) {
 
             for (i = 0; i < elements.length; i++) {
                 script.push('board.create("' + elements[i].type + '", [' + elements[i].parents.join(', ') + '], ' + Type.toJSON(elements[i].attributes) + ');');
+
+                if (elements[i].type === 'axis') {
+                    // Handle the case that remove[All]Ticks had been called.
+                    id = elements[i].attributes.id;
+                    if (board.objects[id].defaultTicks === null) {
+                        script.push('board.objects["' + id + '"].removeTicks(board.objects["' + id + '"].defaultTicks);');
+                    }
+                }
             }
 
             for (i = 0; i < dump.methods.length; i++) {

package/src/utils/env.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -253,7 +253,7 @@ define(['jxg', 'utils/type'], function (JXG, Type) {
          * @returns {Boolean}
          */
         isWebkitApple: function () {
-            return this.isApple() && (navigator.userAgent.search(/Mobile\/[0-9A-Za-z\.]*Safari/) > -1);
+            return this.isApple() && (navigator.userAgent.search(/Mobile\/[0-9A-Za-z.]*Safari/) > -1);
         },
 
         /**
@@ -802,8 +802,8 @@ define(['jxg', 'utils/type'], function (JXG, Type) {
          * @see JXG.Board#fullscreenListener
          * @private
          */
-        _getScaleFactors: function(node) {
-            var width  = node.getBoundingClientRect().width,
+        _getScaleFactors: function (node) {
+            var width = node.getBoundingClientRect().width,
                 height = node.getBoundingClientRect().height,
 
                 // Determine the maximum scale factor.
@@ -827,7 +827,7 @@ define(['jxg', 'utils/type'], function (JXG, Type) {
             }
             scale *= 0.85;
 
-            return {scale: scale, vshift: vshift};
+            return { scale: scale, vshift: vshift, width: width };
         },
 
         /**
@@ -842,14 +842,14 @@ define(['jxg', 'utils/type'], function (JXG, Type) {
          * @param  {Number} vshift   Vertical shift (in pixel)
          *
          * @private
-         * @see JXG#toFullscreen
+         * @see JXG.Board#toFullscreen
          * @see JXG.Board#fullscreenListener
          *
          */
         scaleJSXGraphDiv: function (wrap_id, inner_id, scale, vshift) {
             var len = document.styleSheets.length, style,
 
-                pseudo_keys = [':fullscreen', ':-webkit-full-screen', ':-moz-full-screen',':-ms-fullscreen'],
+                pseudo_keys = [':fullscreen', ':-webkit-full-screen', ':-moz-full-screen', ':-ms-fullscreen'],
                 len_pseudo = pseudo_keys.length, i,
 
                 // CSS rules to center the inner div horizontally and vertically.
@@ -860,7 +860,7 @@ define(['jxg', 'utils/type'], function (JXG, Type) {
                 regex = new RegExp('.*#' + wrap_id + ':.*full.*screen.*#' + inner_id + '.*auto;.*transform:.*matrix');
 
             if (len === 0) {
-                // In case there is not a single CSS rule defined.
+                // In case there is not a single CSS rule defined at all.
                 style = document.createElement('style');
                 // WebKit hack :(
                 style.appendChild(document.createTextNode(''));
@@ -883,54 +883,13 @@ define(['jxg', 'utils/type'], function (JXG, Type) {
                     document.styleSheets[len - 1].insertRule('#' + wrap_id + pseudo_keys[i] + ' #' + inner_id + rule_inner, 0);
                     break;
                 } catch (err) {
-                    console.log('JXG.scaleJSXGraphDiv: Could not add CSS rule "' + pseudo_keys[i] + '".');
-                    console.log('One possible reason could be that the id of the JSXGraph container does not start with a letter.');
+                    // console.log('JXG.scaleJSXGraphDiv: Could not add CSS rule "' + pseudo_keys[i] + '".');
+                    // console.log('One possible reason could be that the id of the JSXGraph container does not start with a letter.');
                 }
             }
-        },
-
-        /**
-         * Set the DOM element with id='wrap_id' containing the JSXGraph div
-         * element in fullscreen mode.
-         * The JSXGraph element is scaled as large as possible while
-         * retaining its proportions.
-         *
-         * @param  {String} wrap_id     id of DOM element containing the JSXGraph
-         * div element.
-         *
-         * @example
-         *
-         * <div id="outer" class="JXG_wrap_private">
-         *      <div id='jxgbox' class='jxgbox' style='width:300px; height:300px;'></div>
-         * </div>
-         * <button onClick="JXG.toFullscreen('outer')">Fullscreen</button>
-         * <script>
-         *     var board = JXG.JSXGraph.initBoard('jxgbox', {axis:true, boundingbox:[-8, 8, 8,-8]});
-         *     var p = board.create('point', [0, 1]);
-         * </script>
-         *
-         * </pre><div id="JXGf9b973ea4_outer" class="JXG_wrap_private"><div id="JXGd9b973ea4-fd43-11e8-ab14-901b0e1b8723" class="jxgbox" style="width: 300px; height: 300px;"></div></div>
-         * <button onClick="JXG.toFullscreen('JXGf9b973ea4_outer')">Fullscreen</button>
-         * <script type="text/javascript">
-         *     (function() {
-         *         var board = JXG.JSXGraph.initBoard('JXGd9b973ea4-fd43-11e8-ab14-901b0e1b8723',
-         *             {boundingbox: [-8, 8, 8,-8], axis: true, showcopyright: false, shownavigation: false});
-         *         var p = board.create('point', [0, 1]);
-         *     })();
-         * </script><pre>
-         *
-         */
-        toFullscreen: function (wrap_id) {
-            var node = document.getElementById(wrap_id);
-
-            // Trigger the fullscreen mode
-            node.requestFullscreen = node.requestFullscreen ||
-                node.webkitRequestFullscreen ||
-                node.mozRequestFullScreen ||
-                node.msRequestFullscreen;
-
-            if (node.requestFullscreen) {
-                node.requestFullscreen();
+            if (i === len_pseudo) {
+                console.log('JXG.scaleJSXGraphDiv: Could not add any CSS rule.');
+                console.log('One possible reason could be that the id of the JSXGraph container does not start with a letter.');
             }
         }
     });

package/src/utils/event.js

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

package/src/utils/expect.js

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

package/src/utils/type.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -197,9 +197,11 @@ define([
          * @returns {Boolean} True, if v is neither undefined nor null.
          */
         exists: function (v, checkEmptyString) {
+            /* eslint-disable eqeqeq */
             var result = !(v == undefined || v === null);
+            /* eslint-enable eqeqeq */
             checkEmptyString = checkEmptyString || false;
-            
+
             if (checkEmptyString) {
                 return result && v !== '';
             }
@@ -210,7 +212,7 @@ define([
         //         var result = !(v === undef || v === null);
 
         //         checkEmptyString = checkEmptyString || false;
-                
+
         //         if (checkEmptyString) {
         //             return result && v !== '';
         //         }
@@ -712,12 +714,12 @@ define([
          * is returned by JavaScript's toFixed()
          *
          * @memberOf JXG
-         * @param  {Number} num       Number tp be rounded
-         * @param  {Number} precision Decimal digits
-         * @return {String}           Rounded number is returned as string
+         * @param  {Number} num    Number tp be rounded
+         * @param  {Number} digits Decimal digits
+         * @return {String}        Rounded number is returned as string
          */
-        toFixed: function (num, precision) {
-            return this._round10(num, -precision).toFixed(precision);
+        toFixed: function (num, digits) {
+            return this._round10(num, -digits).toFixed(digits);
         },
 
         /**
@@ -975,7 +977,7 @@ define([
             }
 
             // options from attributes
-            o = attributes;
+            o = (typeof attributes === 'object') ? attributes : {};
             isAvail = true;
             for (i = 3; i < len; i++) {
                 if (this.exists(o[arguments[i]])) {
@@ -1281,7 +1283,7 @@ define([
                 return html_sanitize(str, function () { return undefined; }, function (id) { return id; });
             }
 
-            if (str) {
+            if (str && typeof str === 'string') {
                 str = str.replace(/</g, '&lt;').replace(/>/g, '&gt;');
             }
 

package/src/utils/xml.js

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

package/src/utils/zip.js

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