jsxgraph 1.11.0 → 1.11.1

package/distrib/jsxgraphsrc.js

@@ -59,7 +59,7 @@ return /******/ (function() { // webpackBootstrap
 
 var major = 1,
     minor = 11,
-    patch = 0,
+    patch = 1,
     add = '', // 'dev' 'beta'
     version = major + '.' + minor + '.' + patch + (add ? '-' + add : ''),
     constants;
@@ -4133,7 +4133,6 @@ _jxg_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.extend(
                                 attributes[_options_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A.shortcuts[key][i]] = attributes[key];
                             }
                         }
-                        delete attributes[key]; // Remove shortcut
                     }
                     for (j = 0; j < subattr.length; j++) {
                         if (_utils_type_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.isObject(attributes[subattr[j]])) {
@@ -4255,7 +4254,7 @@ _jxg_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.extend(
                     // Otherwise, the value of label would be {visible:false} only.
                     if (_utils_type_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.isObject(value) && _utils_type_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.exists(this.visProp[key])) {
                         // this.visProp[key] = Type.merge(this.visProp[key], value);
-                        if (!_utils_type_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.isObject(this.visProp[key]) && _utils_type_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.isObject(value)) {
+                        if (!_utils_type_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.isObject(this.visProp[key]) && value !== null && _utils_type_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.isObject(value)) {
                             // Handle cases like key=firstarrow and
                             // firstarrow==false and value = { type:1 }.
                             // That is a primitive type is replaced by an object.
@@ -4484,7 +4483,9 @@ _jxg_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.extend(
                                             : value;
                                 this._set(key, value);
                             } else {
-                                _jxg_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.warn("attribute '" + key + "' does not accept type '" + (typeof value) + "' of value " + value + ".");
+                                if (!(key in _options_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A.shortcuts)) {
+                                    _jxg_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.warn("attribute '" + key + "' does not accept type '" + (typeof value) + "' of value " + value + ".");
+                                }
                             }
                             break;
                     }
@@ -21586,12 +21587,12 @@ _jxg_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.Options = {
 
         /**
          * Enable browser scrolling on touch interfaces if the user double taps into an empty region
-         * of the board.
+         * of the board. In turn, browser scrolling is deactivated as soon as a JSXGraph element is dragged.
          *
          * <ul>
          * <li> Implemented for pointer touch devices - not with mouse, pen or old iOS touch.
          * <li> It only works if browserPan:true
-         * <li> One finger action by the settings "pan.enabled:true" and "pan.needTwoFingers:false" has priority
+         * <li> One finger action by the settings "pan.enabled:true" and "pan.needTwoFingers:false" has priority.
          * </ul>
          *
          * @name JXG.Board#browserPan
@@ -57340,8 +57341,9 @@ jxg/* default */.A.extend(
 
             ta = 'none';   // JSXGraph catches all user touch events
             if (this.mode === this.BOARD_MODE_NONE &&
-                utils_type/* default */.A.evaluate(this.attr.browserpan) &&
-                !(utils_type/* default */.A.evaluate(this.attr.pan.enabled) && !utils_type/* default */.A.evaluate(this.attr.pan.needtwofingers))
+                (utils_type/* default */.A.evaluate(this.attr.browserpan) === true || utils_type/* default */.A.evaluate(this.attr.browserpan.enabled) === true) &&
+                // One-finger pan has priority over browserPan
+                (utils_type/* default */.A.evaluate(this.attr.pan.enabled) === false || utils_type/* default */.A.evaluate(this.attr.pan.needtwofingers) === true)
             ) {
                 // ta = 'pan-x pan-y';  // JSXGraph allows browser scrolling
                 ta = 'auto';  // JSXGraph allows browser scrolling
@@ -104374,7 +104376,7 @@ jxg/* default */.A.extend(
     },
 
     removeObject: function (object, saveMethod) {
-        var i;
+        var i, el;
 
         // this.board.removeObject(object, saveMethod);
         if (utils_type/* default */.A.isArray(object)) {
@@ -104393,12 +104395,12 @@ jxg/* default */.A.extend(
         }
 
         try {
-            //     // remove all children.
-            //     for (el in object.childElements) {
-            //         if (object.childElements.hasOwnProperty(el)) {
-            //             object.childElements[el].board.removeObject(object.childElements[el]);
-            //         }
-            //     }
+            // Remove all children.
+            for (el in object.childElements) {
+                if (object.childElements.hasOwnProperty(el)) {
+                    this.removeObject(object.childElements[el]);
+                }
+            }
 
             delete this.objects[object.id];
         } catch (e) {
@@ -104409,6 +104411,14 @@ jxg/* default */.A.extend(
 
         this.board.removeObject(object, saveMethod);
 
+        // delete this.depthOrdered[12][0];
+        // delete this.depthOrdered[12][1];
+        // delete this.depthOrdered[12][2];
+        // delete this.depthOrdered[12][3];
+        // delete this.depthOrdered[12][4];
+        // delete this.depthOrdered[12][5];
+        // console.log(this.depthOrdered[12])
+
         return this;
     },
 
@@ -106137,6 +106147,7 @@ jxg/* default */.A.createView3D = function (board, parents, attributes) {
     // Set special infobox attributes of view3d.infobox
     // Using setAttribute() is not possible here, since we have to
     // avoid a call of board.update().
+    // The drawback is that we can not use shortcuts
     view.board.infobox.visProp = utils_type/* default */.A.merge(view.board.infobox.visProp, attr.infobox);
 
     // 3d infobox: drag direction and coordinates

package/distrib/jsxgraphsrc.mjs

@@ -46,7 +46,7 @@
 
 var major = 1,
     minor = 11,
-    patch = 0,
+    patch = 1,
     add = '', // 'dev' 'beta'
     version = major + '.' + minor + '.' + patch + (add ? '-' + add : ''),
     constants;
@@ -4129,7 +4129,6 @@ _jxg_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.extend(
                                 attributes[_options_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A.shortcuts[key][i]] = attributes[key];
                             }
                         }
-                        delete attributes[key]; // Remove shortcut
                     }
                     for (j = 0; j < subattr.length; j++) {
                         if (_utils_type_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.isObject(attributes[subattr[j]])) {
@@ -4251,7 +4250,7 @@ _jxg_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.extend(
                     // Otherwise, the value of label would be {visible:false} only.
                     if (_utils_type_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.isObject(value) && _utils_type_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.exists(this.visProp[key])) {
                         // this.visProp[key] = Type.merge(this.visProp[key], value);
-                        if (!_utils_type_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.isObject(this.visProp[key]) && _utils_type_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.isObject(value)) {
+                        if (!_utils_type_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.isObject(this.visProp[key]) && value !== null && _utils_type_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A.isObject(value)) {
                             // Handle cases like key=firstarrow and
                             // firstarrow==false and value = { type:1 }.
                             // That is a primitive type is replaced by an object.
@@ -4480,7 +4479,9 @@ _jxg_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.extend(
                                             : value;
                                 this._set(key, value);
                             } else {
-                                _jxg_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.warn("attribute '" + key + "' does not accept type '" + (typeof value) + "' of value " + value + ".");
+                                if (!(key in _options_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A.shortcuts)) {
+                                    _jxg_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.warn("attribute '" + key + "' does not accept type '" + (typeof value) + "' of value " + value + ".");
+                                }
                             }
                             break;
                     }
@@ -21606,12 +21607,12 @@ _jxg_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.Options = {
 
         /**
          * Enable browser scrolling on touch interfaces if the user double taps into an empty region
-         * of the board.
+         * of the board. In turn, browser scrolling is deactivated as soon as a JSXGraph element is dragged.
          *
          * <ul>
          * <li> Implemented for pointer touch devices - not with mouse, pen or old iOS touch.
          * <li> It only works if browserPan:true
-         * <li> One finger action by the settings "pan.enabled:true" and "pan.needTwoFingers:false" has priority
+         * <li> One finger action by the settings "pan.enabled:true" and "pan.needTwoFingers:false" has priority.
          * </ul>
          *
          * @name JXG.Board#browserPan
@@ -57511,8 +57512,9 @@ jxg/* default */.A.extend(
 
             ta = 'none';   // JSXGraph catches all user touch events
             if (this.mode === this.BOARD_MODE_NONE &&
-                utils_type/* default */.A.evaluate(this.attr.browserpan) &&
-                !(utils_type/* default */.A.evaluate(this.attr.pan.enabled) && !utils_type/* default */.A.evaluate(this.attr.pan.needtwofingers))
+                (utils_type/* default */.A.evaluate(this.attr.browserpan) === true || utils_type/* default */.A.evaluate(this.attr.browserpan.enabled) === true) &&
+                // One-finger pan has priority over browserPan
+                (utils_type/* default */.A.evaluate(this.attr.pan.enabled) === false || utils_type/* default */.A.evaluate(this.attr.pan.needtwofingers) === true)
             ) {
                 // ta = 'pan-x pan-y';  // JSXGraph allows browser scrolling
                 ta = 'auto';  // JSXGraph allows browser scrolling
@@ -104545,7 +104547,7 @@ jxg/* default */.A.extend(
     },
 
     removeObject: function (object, saveMethod) {
-        var i;
+        var i, el;
 
         // this.board.removeObject(object, saveMethod);
         if (utils_type/* default */.A.isArray(object)) {
@@ -104564,12 +104566,12 @@ jxg/* default */.A.extend(
         }
 
         try {
-            //     // remove all children.
-            //     for (el in object.childElements) {
-            //         if (object.childElements.hasOwnProperty(el)) {
-            //             object.childElements[el].board.removeObject(object.childElements[el]);
-            //         }
-            //     }
+            // Remove all children.
+            for (el in object.childElements) {
+                if (object.childElements.hasOwnProperty(el)) {
+                    this.removeObject(object.childElements[el]);
+                }
+            }
 
             delete this.objects[object.id];
         } catch (e) {
@@ -104580,6 +104582,14 @@ jxg/* default */.A.extend(
 
         this.board.removeObject(object, saveMethod);
 
+        // delete this.depthOrdered[12][0];
+        // delete this.depthOrdered[12][1];
+        // delete this.depthOrdered[12][2];
+        // delete this.depthOrdered[12][3];
+        // delete this.depthOrdered[12][4];
+        // delete this.depthOrdered[12][5];
+        // console.log(this.depthOrdered[12])
+
         return this;
     },
 
@@ -106308,6 +106318,7 @@ jxg/* default */.A.createView3D = function (board, parents, attributes) {
     // Set special infobox attributes of view3d.infobox
     // Using setAttribute() is not possible here, since we have to
     // avoid a call of board.update().
+    // The drawback is that we can not use shortcuts
     view.board.infobox.visProp = utils_type/* default */.A.merge(view.board.infobox.visProp, attr.infobox);
 
     // 3d infobox: drag direction and coordinates