jsxgraph 1.9.1 → 1.9.2

package/src/base/board.js

@@ -553,6 +553,13 @@ JXG.Board = function (container, renderer, id,
      */
     this.hasPointerUp = false;
 
+    /**
+     * Array containing the events related to resizing that have event listeners.
+     * @type Array
+     * @default []
+     */
+    this.resizeHandlers = [];
+
     /**
      * Offset for large coords elements like images
      * @type Array
@@ -749,6 +756,7 @@ JXG.extend(
 
             if (
                 !Type.isPoint(object) &&
+                !Type.isPoint3D(object) &&
                 object.elementClass !== Const.OBJECT_CLASS_LINE &&
                 object.type !== Const.OBJECT_TYPE_ANGLE
             ) {
@@ -1883,9 +1891,23 @@ JXG.extend(
          *
          **********************************************************/
 
+        /**
+         * Suppresses the default event handling.
+         * Used for context menu.
+         *
+         * @param {Event} e
+         * @returns {Boolean} false
+         */
+        suppressDefault: function (e) {
+            if (Type.exists(e)) {
+                e.preventDefault();
+            }
+            return false;
+        },
+
         /**
          * Add all possible event handlers to the board object
-         * which move objects, i.e. mouse, pointer and touch events.
+         * that move objects, i.e. mouse, pointer and touch events.
          */
         addEventHandlers: function () {
             if (Env.supportsPointerEvents()) {
@@ -1895,31 +1917,60 @@ JXG.extend(
                 this.addTouchEventHandlers();
             }
 
+            if (this.containerObj !== null) {
+                // this.containerObj.oncontextmenu = this.suppressDefault;
+                Env.addEvent(this.containerObj, 'contextmenu', this.suppressDefault, this);
+            }
+
             // This one produces errors on IE
             // // Env.addEvent(this.containerObj, 'contextmenu', function (e) { e.preventDefault(); return false;}, this);
-
             // This one works on IE, Firefox and Chromium with default configurations. On some Safari
             // or Opera versions the user must explicitly allow the deactivation of the context menu.
-            if (this.containerObj !== null) {
-                this.containerObj.oncontextmenu = function (e) {
-                    if (Type.exists(e)) {
-                        e.preventDefault();
-                    }
-                    return false;
-                };
+        },
+
+        /**
+         * Remove all event handlers from the board object
+         */
+        removeEventHandlers: function () {
+            if ((this.hasPointerHandlers || this.hasMouseHandlers || this.hasTouchHandlers) &&
+                this.containerObj !== null
+            ) {
+                Env.removeEvent(this.containerObj, 'contextmenu', this.suppressDefault, this);
             }
+
+            this.removeMouseEventHandlers();
+            this.removeTouchEventHandlers();
+            this.removePointerEventHandlers();
+
+            this.removeFullscreenEventHandlers();
+            this.removeKeyboardEventHandlers();
+            this.removeResizeEventHandlers();
+
+            // if (Env.isBrowser) {
+            //     if (Type.exists(this.resizeObserver)) {
+            //         this.stopResizeObserver();
+            //     } else {
+            //         Env.removeEvent(window, 'resize', this.resizeListener, this);
+            //         this.stopIntersectionObserver();
+            //     }
+            //     Env.removeEvent(window, 'scroll', this.scrollListener, this);
+            // }
         },
 
         /**
-         * Add resize event handlers
+         * Add resize related event handlers
          *
          */
         addResizeEventHandlers: function () {
+            // var that = this;
+
+            this.resizeHandlers = [];
             if (Env.isBrowser) {
                 try {
                     // Supported by all new browsers
                     // resizeObserver: triggered if size of the JSXGraph div changes.
                     this.startResizeObserver();
+                    this.resizeHandlers.push('resizeobserver');
                 } catch (err) {
                     // Certain Safari and edge version do not support
                     // resizeObserver, but intersectionObserver.
@@ -1927,39 +1978,82 @@ JXG.extend(
                     Env.addEvent(window, 'resize', this.resizeListener, this);
                     // intersectionObserver: triggered if JSXGraph becomes visible.
                     this.startIntersectionObserver();
+                    this.resizeHandlers.push('resize');
                 }
                 // Scroll event: needs to be captured since on mobile devices
                 // sometimes a header bar is displayed / hidden, which triggers a
                 // resize event.
                 Env.addEvent(window, 'scroll', this.scrollListener, this);
+                this.resizeHandlers.push('scroll');
+
+                // On browser print:
+                // we need to call the listener when having @media: print.
+                try {
+                    // window.matchMedia("print").addEventListener('change', this.printListenerMatch.apply(this, arguments));
+                    window.matchMedia("print").addEventListener('change', this.printListenerMatch.bind(this));
+                    window.matchMedia("screen").addEventListener('change', this.printListenerMatch.bind(this));
+                    this.resizeHandlers.push('print');
+                } catch (err) {
+                    JXG.debug("Error adding printListener", err);
+                }
+                // if (Type.isFunction(MediaQueryList.prototype.addEventListener)) {
+                //     window.matchMedia("print").addEventListener('change', function (mql) {
+                //         if (mql.matches) {
+                //             that.printListener();
+                //         }
+                //     });
+                // } else if (Type.isFunction(MediaQueryList.prototype.addListener)) { // addListener might be deprecated
+                //     window.matchMedia("print").addListener(function (mql, ev) {
+                //         if (mql.matches) {
+                //             that.printListener(ev);
+                //         }
+                //     });
+                // }
 
-                // Env.addEvent(window, 'beforeprint', this.beforeprintListener, this);
-                // window.matchMedia("print").addEventListener(this.beforeprintListener, this);
+                // When closing the print dialog we again have to resize.
+                // Env.addEvent(window, 'afterprint', this.printListener, this);
+                // this.resizeHandlers.push('afterprint');
             }
         },
 
         /**
-         * Remove all event handlers from the board object
+         * Remove resize related event handlers
+         *
          */
-        removeEventHandlers: function () {
-            this.removeMouseEventHandlers();
-            this.removeTouchEventHandlers();
-            this.removePointerEventHandlers();
-
-            this.removeFullscreenEventHandlers();
-            this.removeKeyboardEventHandlers();
-
-            if (Env.isBrowser) {
-                if (Type.exists(this.resizeObserver)) {
-                    this.stopResizeObserver();
-                } else {
-                    Env.removeEvent(window, 'resize', this.resizeListener, this);
-                    this.stopIntersectionObserver();
+        removeResizeEventHandlers: function () {
+            var i, e;
+            if (this.resizeHandlers.length > 0 && Env.isBrowser) {
+                for (i = 0; i < this.resizeHandlers.length; i++) {
+                    e = this.resizeHandlers[i];
+                    switch (e) {
+                        case 'resizeobserver':
+                            if (Type.exists(this.resizeObserver)) {
+                                this.stopResizeObserver();
+                            }
+                            break;
+                        case 'resize':
+                            Env.removeEvent(window, 'resize', this.resizeListener, this);
+                            if (Type.exists(this.intersectionObserver)) {
+                                this.stopIntersectionObserver();
+                            }
+                            break;
+                        case 'scroll':
+                            Env.removeEvent(window, 'scroll', this.scrollListener, this);
+                            break;
+                        case 'print':
+                            window.matchMedia("print").removeEventListener('change', this.printListenerMatch.bind(this), false);
+                            window.matchMedia("screen").removeEventListener('change', this.printListenerMatch.bind(this), false);
+                            break;
+                        // case 'afterprint':
+                        //     Env.removeEvent(window, 'afterprint', this.printListener, this);
+                        //     break;
+                    }
                 }
-                Env.removeEvent(window, 'scroll', this.scrollListener, this);
+                this.resizeHandlers = [];
             }
         },
 
+
         /**
          * Registers pointer event handlers.
          */
@@ -4155,10 +4249,13 @@ JXG.extend(
 
         /**
          * Update the width and height of the JSXGraph container div element.
-         * Read actual values with getBoundingClientRect(),
+         * If width and height are not supplied, read actual values with offsetWidth/Height,
          * and call board.resizeContainer() with this values.
          * <p>
          * If necessary, also call setBoundingBox().
+         * @param {Number} [width=this.containerObj.offsetWidth] Width of the container element
+         * @param {Number} [height=this.containerObj.offsetHeight] Height of the container element
+         * @returns
          *
          * @see JXG.Board#startResizeObserver
          * @see JXG.Board#resizeListener
@@ -4166,18 +4263,28 @@ JXG.extend(
          * @see JXG.Board#setBoundingBox
          *
          */
-        updateContainerDims: function () {
-            var w, h,
-                bb, css,
+        updateContainerDims: function (width, height) {
+            var w = width,
+                h = height,
+                // bb,
+                css,
                 width_adjustment, height_adjustment;
 
-            // Get size of the board's container div
-            bb = this.containerObj.getBoundingClientRect();
-            w = bb.width;
-            h = bb.height;
+            if (width === undefined) {
+                // Get size of the board's container div
+                //
+                // offsetWidth/Height ignores CSS transforms,
+                // getBoundingClientRect includes CSS transforms
+                //
+                // bb = this.containerObj.getBoundingClientRect();
+                // w = bb.width;
+                // h = bb.height;
+                w = this.containerObj.offsetWidth;
+                h = this.containerObj.offsetHeight;
+            }
 
-            // Subtract the border size
-            if (window && window.getComputedStyle) {
+            if (width === undefined && window && window.getComputedStyle) {
+                // Subtract the border size
                 css = window.getComputedStyle(this.containerObj, null);
                 width_adjustment = parseFloat(css.getPropertyValue('border-left-width')) + parseFloat(css.getPropertyValue('border-right-width'));
                 if (!isNaN(width_adjustment)) {
@@ -4205,7 +4312,6 @@ JXG.extend(
             if (Type.exists(this._prevDim) && this._prevDim.w === w && this._prevDim.h === h) {
                 return;
             }
-
             // Set the size of the SVG or canvas element
             this.resizeContainer(w, h, true);
             this._prevDim = {
@@ -4237,11 +4343,13 @@ JXG.extend(
             }
 
             this.resizeObserver = new ResizeObserver(function (entries) {
+                var bb;
                 if (!that._isResizing) {
                     that._isResizing = true;
+                    bb = entries[0].contentRect;
                     window.setTimeout(function () {
                         try {
-                            that.updateContainerDims();
+                            that.updateContainerDims(bb.width, bb.height);
                         } catch (err) {
                             that.stopResizeObserver();
                         } finally {
@@ -4356,10 +4464,22 @@ JXG.extend(
             }
         },
 
-        beforeprintListener: function(evt) {
-            // console.log("beforeprint")
+        /**
+         * Update the container before and after printing.
+         * @param {Event} [evt]
+         */
+        printListener: function(evt) {
             this.updateContainerDims();
-            // this.resizeListener();
+        },
+
+        /**
+         * Wrapper for printListener to be used in mediaQuery matches.
+         * @param {MediaQueryList} mql
+         */
+        printListenerMatch: function (mql) {
+            if (mql.matches) {
+                this.printListener();
+            }
         },
 
         /**********************************************************
@@ -5180,14 +5300,11 @@ JXG.extend(
          * @returns {JXG.Board} Reference to the board.
          */
         zoomElements: function (elements) {
-            var i,
-                e,
+            var i, e,
                 box,
                 newBBox = [Infinity, -Infinity, -Infinity, Infinity],
-                cx,
-                cy,
-                dx,
-                dy,
+                cx, cy,
+                dx, dy,
                 d;
 
             if (!Type.isArray(elements) || elements.length === 0) {
@@ -5487,8 +5604,10 @@ JXG.extend(
                 box = this.getBoundingBox();    // This is the actual bounding box.
             }
 
-            this.canvasWidth = Math.max(parseFloat(canvasWidth), Mat.eps);
-            this.canvasHeight = Math.max(parseFloat(canvasHeight), Mat.eps);
+            // this.canvasWidth = Math.max(parseFloat(canvasWidth), Mat.eps);
+            // this.canvasHeight = Math.max(parseFloat(canvasHeight), Mat.eps);
+            this.canvasWidth = parseFloat(canvasWidth);
+            this.canvasHeight = parseFloat(canvasHeight);
 
             if (!dontset) {
                 this.containerObj.style.width = this.canvasWidth + 'px';
@@ -5499,8 +5618,8 @@ JXG.extend(
             if (!dontSetBoundingBox) {
                 this.setBoundingBox(box, this.keepaspectratio, 'keep');
             } else {
-                oX = (this.canvasWidth - oldWidth) / 2;
-                oY = (this.canvasHeight - oldHeight) / 2;
+                oX = (this.canvasWidth - oldWidth) * 0.5;
+                oY = (this.canvasHeight - oldHeight) * 0.5;
 
                 this.moveOrigin(
                     this.origin.scrCoords[1] + oX,
@@ -6055,7 +6174,10 @@ JXG.extend(
             h = this.canvasHeight;
             if (keepaspectratio) {
                 if (this.keepaspectratio) {
-                    ratio = ux / uy; // Keep this ratio if keepaspectratio was true
+                    ratio = ux / uy;        // Keep this ratio if keepaspectratio was true
+                    if (isNaN(ratio)) {
+                        ratio = 1.0;
+                    }
                 } else {
                     ratio = 1.0;
                 }
@@ -6120,7 +6242,6 @@ JXG.extend(
                     [this.canvasWidth, this.canvasHeight],
                     this
                 ).usrCoords;
-
             return [ul[1], ul[2], lr[1], lr[2]];
         },
 

package/src/base/circle.js

@@ -551,7 +551,9 @@ JXG.extend(
             }
 
             if (this.method === "pointRadius") {
-                return Math.abs(this.updateRadius());
+                return (Type.evaluate(this.visProp.nonnegativeonly)) ?
+                    Math.max(0.0, this.updateRadius()) :
+                    Math.abs(this.updateRadius());
             }
 
             return NaN;

package/src/base/constants.js

@@ -37,7 +37,7 @@ import JXG from "../jxg.js";
 
 var major = 1,
     minor = 9,
-    patch = 1,
+    patch = 2,
     add = '', // 'dev' 'beta'
     version = major + '.' + minor + '.' + patch + (add ? '-' + add : ''),
     constants;

package/src/base/curve.js

@@ -1353,6 +1353,7 @@ JXG.extend(
                     delta = [where[0] - p.usrCoords[1], where[1] - p.usrCoords[2]];
                 }
                 this.setPosition(Const.COORDS_BY_USER, delta);
+                return this.board.update(this);
             }
             return this;
         },

package/src/base/element.js

@@ -329,6 +329,8 @@ JXG.GeometryElement = function (board, attributes, type, oclass) {
      */
     this.lastDragTime = new Date();
 
+    this.view = null;
+
     if (arguments.length > 0) {
         /**
          * Reference to the board associated with the element.
@@ -1011,44 +1013,50 @@ JXG.extend(
             var i, len, s, len_s, obj, val;
 
             if (this.needsUpdate) {
-                // Handle the element
-                if (parent_val !== undefined) {
-                    this.visPropCalc.visible = parent_val;
+                if (Type.exists(this.view) && Type.evaluate(this.view.visProp.visible) === false) {
+                    // Handle hiding of view3d
+                    this.visPropCalc.visible = false;
+
                 } else {
-                    val = Type.evaluate(this.visProp.visible);
+                    // Handle the element
+                    if (parent_val !== undefined) {
+                        this.visPropCalc.visible = parent_val;
+                    } else {
+                        val = Type.evaluate(this.visProp.visible);
 
-                    // infobox uses hiddenByParent
-                    if (Type.exists(this.hiddenByParent) && this.hiddenByParent) {
-                        val = false;
-                    }
-                    if (val !== "inherit") {
-                        this.visPropCalc.visible = val;
+                        // infobox uses hiddenByParent
+                        if (Type.exists(this.hiddenByParent) && this.hiddenByParent) {
+                            val = false;
+                        }
+                        if (val !== "inherit") {
+                            this.visPropCalc.visible = val;
+                        }
                     }
-                }
 
-                // Handle elements which inherit the visibility
-                len = this.inherits.length;
-                for (s = 0; s < len; s++) {
-                    obj = this.inherits[s];
-                    if (Type.isArray(obj)) {
-                        len_s = obj.length;
-                        for (i = 0; i < len_s; i++) {
+                    // Handle elements which inherit the visibility
+                    len = this.inherits.length;
+                    for (s = 0; s < len; s++) {
+                        obj = this.inherits[s];
+                        if (Type.isArray(obj)) {
+                            len_s = obj.length;
+                            for (i = 0; i < len_s; i++) {
+                                if (
+                                    Type.exists(obj[i]) /*&& Type.exists(obj[i].rendNode)*/ &&
+                                    Type.evaluate(obj[i].visProp.visible) === "inherit"
+                                ) {
+                                    obj[i]
+                                        .prepareUpdate()
+                                        .updateVisibility(this.visPropCalc.visible);
+                                }
+                            }
+                        } else {
                             if (
-                                Type.exists(obj[i]) /*&& Type.exists(obj[i].rendNode)*/ &&
-                                Type.evaluate(obj[i].visProp.visible) === "inherit"
+                                Type.exists(obj) /*&& Type.exists(obj.rendNode)*/ &&
+                                Type.evaluate(obj.visProp.visible) === "inherit"
                             ) {
-                                obj[i]
-                                    .prepareUpdate()
-                                    .updateVisibility(this.visPropCalc.visible);
+                                obj.prepareUpdate().updateVisibility(this.visPropCalc.visible);
                             }
                         }
-                    } else {
-                        if (
-                            Type.exists(obj) /*&& Type.exists(obj.rendNode)*/ &&
-                            Type.evaluate(obj.visProp.visible) === "inherit"
-                        ) {
-                            obj.prepareUpdate().updateVisibility(this.visPropCalc.visible);
-                        }
                     }
                 }