jsxgraph 1.4.0 → 1.4.1

package/src/base/board.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -1213,7 +1213,7 @@ define([
                 op = (new Coords(Const.COORDS_BY_SCREEN, [moveEl.Xprev, moveEl.Yprev], this)).usrCoords;
                 // New finger position
                 np = (new Coords(Const.COORDS_BY_SCREEN, [moveEl.X, moveEl.Y], this)).usrCoords;
-                
+
                 // Old and new directions
                 od = Mat.crossProduct(fix, op);
                 nd = Mat.crossProduct(fix, np);
@@ -1296,7 +1296,7 @@ define([
                 op = (new Coords(Const.COORDS_BY_SCREEN, [moveEl.Xprev, moveEl.Yprev], this)).usrCoords;
                 // New finger position
                 np = (new Coords(Const.COORDS_BY_SCREEN, [moveEl.X, moveEl.Y], this)).usrCoords;
-                
+
                 alpha = Geometry.rad(op.slice(1), fix.slice(1), np.slice(1));
 
                 // Rotate and scale by the movement of the second finger
@@ -2161,7 +2161,7 @@ define([
             type = this._inputDevice;
             this.options.precision.hasPoint = this.options.precision[type];
 
-            // Handling of multi touch with pointer events should be easier than the touch events. 
+            // Handling of multi touch with pointer events should be easier than the touch events.
             // Every pointer device has its own pointerId, e.g. the mouse
             // always has id 1 or 0, fingers and pens get unique ids every time a pointerDown event is fired and they will
             // keep this id until a pointerUp event is fired. What we have to do here is:
@@ -2203,7 +2203,7 @@ define([
                 target = elements[elements.length - 1];
                 found = false;
 
-                // Reminder: this.touches is the list of elements which 
+                // Reminder: this.touches is the list of elements which
                 // currently "possess" a pointer (mouse, pen, finger)
                 for (i = 0; i < this.touches.length; i++) {
                     // An element receives a further touch, i.e.
@@ -2257,10 +2257,11 @@ define([
 
                 // Touch events on empty areas of the board are handled here, see also touchStartListener
                 // 1. case: one finger. If allowed, this triggers pan with one finger
-                if (evt.touches.length == 1 &&
+                if (evt.touches.length === 1 &&
                     this.mode === this.BOARD_MODE_NONE &&
                     this.touchStartMoveOriginOneFinger(evt)) {
-                } else if (evt.touches.length == 2 &&
+                        // Empty by purpose
+                } else if (evt.touches.length === 2 &&
                             (this.mode === this.BOARD_MODE_NONE || this.mode === this.BOARD_MODE_MOVE_ORIGIN)
                         ) {
                     // 2. case: two fingers: pinch to zoom or pan with two fingers needed.
@@ -2342,7 +2343,7 @@ define([
                         // Run through all touch events which have been started on this jsxgraph element.
                         for (j = 0; j < touchTargets.length; j++) {
                             if (touchTargets[j].num === evt.pointerId) {
-                                
+
                                 pos = this.getMousePosition(evt);
                                 touchTargets[j].X = pos[0];
                                 touchTargets[j].Y = pos[1];
@@ -2582,7 +2583,7 @@ define([
                             Yprev: NaN,
                             Xstart: [],
                             Ystart: [],
-                            Zstart: [] 
+                            Zstart: []
                         };
 
                         if (Type.isPoint(obj) ||
@@ -2590,7 +2591,7 @@ define([
                                 obj.type === Const.OBJECT_TYPE_TICKS ||
                                 obj.type === Const.OBJECT_TYPE_IMAGE) {
                             // It's a point, so it's single touch, so we just push it to our touches
-                            targets = [target_obj];
+                            targets = [obj];
 
                             // For the UNDO/REDO of object moves
                             this.saveStartPos(obj, targets[0]);
@@ -2670,8 +2671,8 @@ define([
          * @returns {Boolean}
          */
         touchMoveListener: function (evt) {
-            var i, pos1, pos2, 
-                time, touchTargets,
+            var i, pos1, pos2,
+                touchTargets,
                 evtTouches = evt[JXG.touchProperty];
 
             if (!this.checkFrameRate(evt)) {
@@ -3189,7 +3190,7 @@ define([
                         sX = 1.1 * Type.evaluate(el.visProp.attractordistance);
                         sY = sX;
 
-                        if (Type.evaluate(el.visProp.attractorunit) == 'screen') {
+                        if (Type.evaluate(el.visProp.attractorunit) === 'screen') {
                             sX /= this.unitX;
                             sY /= this.unitX;
                         }
@@ -3704,11 +3705,11 @@ define([
          *                 // Shorter version:
          *                 //somePoint = board.create('point', a, {name:'SomePoint',size:4});
          *             });
-         * 
+         *
          *     })();
          *
          * </script><pre>
-         * 
+         *
          * @see JXG.Board#getScrCoordsOfMouse
          * @see JXG.Board#getAllUnderMouse
          */
@@ -3830,7 +3831,7 @@ define([
         addConditions: function (str) {
             var term, m, left, right, name, el, property,
                 functions = [],
-                plaintext = 'var el, x, y, c, rgbo;\n',
+                // plaintext = 'var el, x, y, c, rgbo;\n',
                 i = str.indexOf('<data>'),
                 j = str.indexOf('<' + '/data>'),
 
@@ -3914,7 +3915,7 @@ define([
                 if (!Type.exists(this.elementsByName[name])) {
                     JXG.debug("debug conditions: |" + name + "| undefined");
                 } else {
-                    plaintext += "el = this.objects[\"" + el.id + "\"];\n";
+                    // plaintext += "el = this.objects[\"" + el.id + "\"];\n";
 
                     switch (property) {
                     case 'x':
@@ -4389,34 +4390,38 @@ define([
          * @returns {JXG.Board} Reference to the board
          */
         resizeContainer: function (canvasWidth, canvasHeight, dontset, dontSetBoundingBox) {
-            var box_act, box, w, h, cx, cy,
-                shift_x = 0,
-                shift_y = 0;
+            var box;
+                // w, h, cx, cy;
+                // box_act,
+                // shift_x = 0,
+                // shift_y = 0;
 
             if (!dontSetBoundingBox) {
-                box_act = this.getBoundingBox();    // This is the actual bounding box.
+                // box_act = this.getBoundingBox();    // This is the actual bounding box.
+                box = this.getBoundingBox();    // This is the actual bounding box.
             }
 
             this.canvasWidth = parseFloat(canvasWidth);
             this.canvasHeight = parseFloat(canvasHeight);
 
-            if (!dontSetBoundingBox) {
-                box     = this.attr.boundingbox;    // This is the intended bounding box.
-                
-                // The shift values compensate the follow-up correction
-                // in setBoundingBox in case of "this.keepaspectratio==true"
-                // Otherwise, shift_x and shift_y will be zero.
-                shift_x = box_act[0] - box[0] / this.zoomX;
-                shift_y = box_act[1] - box[1] / this.zoomY;
+            // if (!dontSetBoundingBox) {
+            //     box     = this.attr.boundingbox;    // This is the intended bounding box.
 
-                cx = (box[2] + box[0]) * 0.5 + shift_x;
-                cy = (box[3] + box[1]) * 0.5 + shift_y;
+            //     // The shift values compensate the follow-up correction
+            //     // in setBoundingBox in case of "this.keepaspectratio==true"
+            //     // Otherwise, shift_x and shift_y will be zero.
+            //     // Obsolet since setBoundingBox centers in case of "this.keepaspectratio==true".
+            //     // shift_x = box_act[0] - box[0] / this.zoomX;
+            //     // shift_y = box_act[1] - box[1] / this.zoomY;
 
-                w = (box[2] - box[0]) * 0.5 / this.zoomX;
-                h = (box[1] - box[3]) * 0.5 / this.zoomY;
+            //     cx = (box[2] + box[0]) * 0.5; // + shift_x;
+            //     cy = (box[3] + box[1]) * 0.5; // + shift_y;
 
-                box = [cx - w, cy + h, cx + w, cy - h];
-            }
+            //     w = (box[2] - box[0]) * 0.5 / this.zoomX;
+            //     h = (box[1] - box[3]) * 0.5 / this.zoomY;
+
+            //     box = [cx - w, cy + h, cx + w, cy - h];
+            // }
 
             if (!dontset) {
                 this.containerObj.style.width = (this.canvasWidth) + 'px';
@@ -4532,7 +4537,7 @@ define([
 
             for (el = 0; el < this.objectsList.length; el++) {
                 pEl = this.objectsList[el];
-                if (this.needsFullUpdate && pEl.elementClass == Const.OBJECT_CLASS_TEXT) {
+                if (this.needsFullUpdate && pEl.elementClass === Const.OBJECT_CLASS_TEXT) {
                     pEl.updateSize();
                 }
 
@@ -4919,11 +4924,14 @@ define([
          */
         setBoundingBox: function (bbox, keepaspectratio, setZoom) {
             var h, w, ux, uy,
+                offX = 0,
+                offY = 0,
                 dim = Env.getDimensions(this.container, this.document);
 
             if (!Type.isArray(bbox)) {
                 return this;
             }
+
             if (bbox[0] < this.maxboundingbox[0] ||
                 bbox[1] > this.maxboundingbox[1] ||
                 bbox[2] > this.maxboundingbox[2] ||
@@ -4942,14 +4950,17 @@ define([
             this.canvasHeight = parseInt(dim.height, 10);
             w = this.canvasWidth;
             h = this.canvasHeight;
-
             if (keepaspectratio) {
                 this.unitX = w / (bbox[2] - bbox[0]);
                 this.unitY = h / (bbox[1] - bbox[3]);
                 if (Math.abs(this.unitX) < Math.abs(this.unitY)) {
                     this.unitY = Math.abs(this.unitX) * this.unitY / Math.abs(this.unitY);
+                    // Add the additional units in equal portions above and below
+                    offY = (h / this.unitY - (bbox[1] - bbox[3])) * 0.5;
                 } else {
                     this.unitX = Math.abs(this.unitY) * this.unitX / Math.abs(this.unitX);
+                    // Add the additional units in equal portions left and right
+                    offX = (w / this.unitX - (bbox[2] - bbox[0])) * 0.5;
                 }
                 this.keepaspectratio = true;
             } else {
@@ -4957,8 +4968,8 @@ define([
                 this.unitY = h / (bbox[1] - bbox[3]);
                 this.keepaspectratio = false;
             }
-            
-            this.moveOrigin(-this.unitX * bbox[0], this.unitY * bbox[1]);
+
+            this.moveOrigin(-this.unitX * (bbox[0] - offX), this.unitY * (bbox[1] + offY));
 
             if (setZoom === 'update') {
                 this.zoomX *= this.unitX / ux;
@@ -5849,6 +5860,8 @@ define([
          * <p>
          * The wrapping div has the CSS class 'jxgbox_wrap_private' which is
          * defined in the file 'jsxgraph.css'
+         * <p>
+         * This feature is not available on iPhones (as of December 2021).
          *
          * @param {String} id (Optional) id of the div element which is brought to fullscreen.
          * If not provided, this defaults to the JSXGraph div. However, it may be necessary for the aspect ratio trick
@@ -5912,28 +5925,38 @@ define([
          *
          *
          */
-        toFullscreen: function(id) {
+        toFullscreen: function (id) {
             var wrap_id, wrap_node, inner_node;
 
             id = id || this.container;
-
             this._fullscreen_inner_id = id;
-            // inner_node = this.containerObj;
             inner_node = document.getElementById(id);
-
             wrap_id = 'fullscreenwrap_' + id;
-            wrap_node = document.createElement('div');
 
-            // If necessary, wrap a div around the JSXGraph div.
-            if (!this.document.getElementById(wrap_id)) {
+            // Wrap a div around the JSXGraph div.
+            if (this.document.getElementById(wrap_id)) {
+                wrap_node = this.document.getElementById(wrap_id);
+            } else {
+                wrap_node = document.createElement('div');
                 wrap_node.classList.add('JXG_wrap_private');
                 wrap_node.setAttribute('id', wrap_id);
                 inner_node.parentNode.insertBefore(wrap_node, inner_node);
                 wrap_node.appendChild(inner_node);
             }
 
-            // Start fullscreen mode
-            Env.toFullscreen(wrap_id, id);
+            // Get the real width and height of the JSXGraph div
+            // and determine the scaling and vertical shift amount
+            this._fullscreen_res = Env._getScaleFactors(inner_node);
+
+            // Trigger fullscreen mode
+            wrap_node.requestFullscreen = wrap_node.requestFullscreen ||
+                wrap_node.webkitRequestFullscreen ||
+                wrap_node.mozRequestFullScreen ||
+                wrap_node.msRequestFullscreen;
+
+            if (wrap_node.requestFullscreen) {
+                wrap_node.requestFullscreen();
+            }
 
             return this;
         },
@@ -5945,7 +5968,7 @@ define([
          *
          * @param  {Object} evt fullscreen event object (unused)
          */
-        fullscreenListener: function(evt) {
+        fullscreenListener: function (evt) {
             var res, inner_id, inner_node;
 
             inner_id = this._fullscreen_inner_id;
@@ -5953,20 +5976,20 @@ define([
                 return;
             }
 
+            document.fullscreenElement = document.fullscreenElement ||
+                    document.webkitFullscreenElement ||
+                    document.mozFullscreenElement ||
+                    document.msFullscreenElement;
+
             inner_node = document.getElementById(inner_id);
             // If full screen mode is started we have to remove CSS margin around the JSXGraph div.
             // Otherwise, the positioning of the fullscreen div will be false.
             // When leaving the fullscreen mode, the margin is put back in.
             if (document.fullscreenElement) {
-                // Entered fullscreen mode
+                // Just entered fullscreen mode
 
-                inner_node.style.margin = '';
-
-                // Do the shifting and scaling via CSS pseudo rules
-                // We do this after fullscreen mode has been established to get the correct size
-                // of the JSXGraph div
-                res = Env._getScaleFactors(inner_node);
-                Env.scaleJSXGraphDiv(document.fullscreenElement.id, inner_id, res.scale, res.vshift);
+                // Get the data computed in board.toFullscreen()
+                res = this._fullscreen_res;
 
                 // Store the scaling data.
                 // It is used in AbstractRenderer.updateText to restore the scaling matrix
@@ -5977,11 +6000,25 @@ define([
                     id: document.fullscreenElement.id,
                     isFullscreen: true,
                     margin: inner_node.style.margin,
-                    scale:  res.scale,
+                    width: inner_node.style.width,
+                    scale: res.scale,
                     vshift: res.vshift
                 };
+
+                inner_node.style.margin = '';
+                inner_node.style.width = res.width + 'px';
+
+                // Do the shifting and scaling via CSS pseudo rules
+                // We do this after fullscreen mode has been established to get the correct size
+                // of the JSXGraph div.
+                Env.scaleJSXGraphDiv(document.fullscreenElement.id, inner_id, res.scale, res.vshift);
+
+                // Clear document.fullscreenElement, because Safari doesn't to it and
+                // when leaving full screen mode it is still set.
+                document.fullscreenElement = null;
+
             } else if (Type.exists(inner_node._cssFullscreenStore)) {
-                // Left fullscreen mode
+                // Just left the fullscreen mode
 
                 // Remove the CSS rules added in Env.scaleJSXGraphDiv
                 try {
@@ -5989,8 +6026,11 @@ define([
                 } catch (err) {
                     console.log('JSXGraph: Could not remove CSS rules for full screen mode');
                 }
+
                 inner_node._cssFullscreenStore.isFullscreen = false;
                 inner_node.style.margin = inner_node._cssFullscreenStore.margin;
+                inner_node.style.width = inner_node._cssFullscreenStore.width;
+
             }
 
             this.updateCSSTransforms();

package/src/base/chart.js

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

package/src/base/circle.js

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

package/src/base/composition.js

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

package/src/base/constants.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -42,7 +42,7 @@ define(['jxg'], function (JXG) {
 
     var major = 1,
         minor = 4,
-        patch = 0,
+        patch = 1,
         add = '', //'dev'
         version = major + '.' + minor + '.' + patch + (add ? '-' + add : ''),
         constants;
@@ -132,16 +132,16 @@ define(['jxg'], function (JXG) {
         GENTYPE_AXIS: 2,
         GENTYPE_MID: 3,
 
-        /** 
+        /**
          * @ignore
-         * @deprecated, now use {@link JXG.GENTYPE_REFLECTION_ON_LINE} 
-         * 
-         */  
+         * @deprecated, now use {@link JXG.GENTYPE_REFLECTION_ON_LINE}
+         *
+         */
         GENTYPE_REFLECTION: 4,
-        /** 
-         * @ignore 
-         * @deprecated, now use {@link JXG.GENTYPE_REFLECTION_ON_POINT} 
-         */ 
+        /**
+         * @ignore
+         * @deprecated, now use {@link JXG.GENTYPE_REFLECTION_ON_POINT}
+         */
         GENTYPE_MIRRORELEMENT: 5,
 
         GENTYPE_REFLECTION_ON_LINE: 4,
@@ -156,9 +156,9 @@ define(['jxg'], function (JXG) {
         GENTYPE_GLIDER: 13,
         GENTYPE_INTERSECTION: 14,
         GENTYPE_CIRCLE: 15,
-        /** 
-         * @ignore @deprecated NOT USED ANY MORE SINCE SKETCHOMETRY 2.0 (only for old constructions needed) 
-         */ 
+        /**
+         * @ignore @deprecated NOT USED ANY MORE SINCE SKETCHOMETRY 2.0 (only for old constructions needed)
+         */
         GENTYPE_CIRCLE2POINTS: 16,
 
         GENTYPE_LINE: 17,
@@ -197,7 +197,7 @@ define(['jxg'], function (JXG) {
         * @name Constants
         * @namespace
         */
-   
+
         //        GENTYPE_TRANSFORM: 48, // unused
         // 49 ... 50 // unused ...
 

package/src/base/coords.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -234,11 +234,11 @@ define([
         },
 
         /**
-        * Copy array, either srcCoords or usrCoords
+        * Copy array, either scrCoords or usrCoords
         * Uses slice() in case of standard arrays and set() in case of
         * typed arrays.
         * @private
-        * @param {String} obj Either 'srcCoords' or 'usrCoords'
+        * @param {String} obj Either 'scrCoords' or 'usrCoords'
         * @param {Number} offset Offset, defaults to 0 if not given
         * @returns {Array} Returns copy of the coords array either as standard array or as
         *   typed array.

package/src/base/coordselement.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -260,7 +260,7 @@ define([
                 ev_sw,
                 slide = this.slideObject,
                 res, cu,
-                slides = [], 
+                slides = [],
                 isTransformed;
 
             this.needsUpdateFromParent = false;
@@ -1098,8 +1098,8 @@ define([
                         slide = slideobj.borders[i];
                     }
                 }
-            	slideobj = this.board.select(slide);
-            	onPolygon = true;
+                slideobj = this.board.select(slide);
+                onPolygon = true;
             }
 
             /* Gliders on Ticks are forbidden */

package/src/base/curve.js

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

package/src/base/element.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -1927,10 +1927,9 @@ define([
          */
         removeAllTicks: function () {
             var t;
-
             if (Type.exists(this.ticks)) {
-                for (t = this.ticks.length; t > 0; t--) {
-                    this.removeTicks(this.ticks[t - 1]);
+                for (t = this.ticks.length - 1; t >= 0; t--) {
+                    this.removeTicks(this.ticks[t]);
                 }
                 this.ticks = [];
                 this.board.update();
@@ -1949,19 +1948,19 @@ define([
             }
 
             if (Type.exists(this.ticks)) {
-                for (t = this.ticks.length; t > 0; t--) {
-                    if (this.ticks[t - 1] === tick) {
-                        this.board.removeObject(this.ticks[t - 1]);
-
-                        if (this.ticks[t - 1].ticks) {
-                            for (j = 0; j < this.ticks[t - 1].ticks.length; j++) {
-                                if (Type.exists(this.ticks[t - 1].labels[j])) {
-                                    this.board.removeObject(this.ticks[t - 1].labels[j]);
+                for (t = this.ticks.length - 1; t >= 0; t--) {
+                    if (this.ticks[t] === tick) {
+                        this.board.removeObject(this.ticks[t]);
+
+                        if (this.ticks[t].ticks) {
+                            for (j = 0; j < this.ticks[t].ticks.length; j++) {
+                                if (Type.exists(this.ticks[t].labels[j])) {
+                                    this.board.removeObject(this.ticks[t].labels[j]);
                                 }
                             }
                         }
 
-                        delete this.ticks[t - 1];
+                        delete this.ticks[t];
                         break;
                     }
                 }
@@ -2034,7 +2033,7 @@ define([
                     rcoords = new JXG.Coords(Const.COORDS_BY_USER, [rx, ry], this.board);
                     if (!attractToGrid ||
                         rcoords.distance(
-                            ev_au == 'screen' ? Const.COORDS_BY_SCREEN : Const.COORDS_BY_USER, this.coords
+                            ev_au === 'screen' ? Const.COORDS_BY_SCREEN : Const.COORDS_BY_USER, this.coords
                             ) < ev_ad) {
                         x = rx;
                         y = ry;

package/src/base/foreignobject.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -427,6 +427,10 @@
      *
      * </script><pre>
      *
+     * Video "24-hour time-lapse in Cascais, Portugal. Produced by Nuno Miguel Duarte" adapted from
+     * <a href="https://www.pbslearningmedia.org/resource/buac18-k2-sci-ess-sunposition/changing-position-of-the-sun-in-the-sky/">https://www.pbslearningmedia.org/resource/buac18-k2-sci-ess-sunposition/changing-position-of-the-sun-in-the-sky/</a>,
+     * ©2016 Nuno Miguel Duarte.
+     *
      */
     JXG.createForeignObject = function (board, parents, attributes) {
         var attr, fo,

package/src/base/group.js

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

package/src/base/image.js

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

package/src/base/line.js

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