jsxgraph 1.3.0 → 1.4.1

package/src/jsxgraph.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -192,6 +192,7 @@ define([
             attr.navbar = Type.copyAttributes(attr.navbar, Options, 'navbar');
             attr.screenshot = Type.copyAttributes(attr, Options, 'board', 'screenshot');
             attr.resize = Type.copyAttributes(attr, Options, 'board', 'resize');
+            attr.fullscreen = Type.copyAttributes(attr, Options, 'board', 'fullscreen');
 
             // Treat moveTarget separately, because deepCopy will not work here.
             // Reason: moveTarget will be an HTML node and it is prevented that Type.deepCopy will copy it.
@@ -303,6 +304,8 @@ define([
         initBoard: function (box, attributes) {
             var originX, originY, unitX, unitY,
                 renderer,
+                offX = 0,
+                offY = 0,
                 w, h, dimensions,
                 bbox, attr, axattr, axattr_x, axattr_y,
                 board;
@@ -338,15 +341,19 @@ define([
 
                     if (Math.abs(unitX) < Math.abs(unitY)) {
                         unitY = Math.abs(unitX) * unitY / Math.abs(unitY);
+                        // Add the additional units in equal portions above and below
+                        offY = (h / unitY - (bbox[1] - bbox[3])) * 0.5;
                     } else {
                         unitX = Math.abs(unitY) * unitX / Math.abs(unitX);
+                        // Add the additional units in equal portions left and right
+                        offX = (w / unitX - (bbox[2] - bbox[0])) * 0.5;
                     }
                 } else {
                     unitX = w / (bbox[2] - bbox[0]);
                     unitY = h / (bbox[1] - bbox[3]);
                 }
-                originX = -unitX * bbox[0];
-                originY = unitY * bbox[1];
+                originX = -unitX * (bbox[0] - offX);
+                originY = unitY * (bbox[1] + offY);
             }
 
             renderer = this.initRenderer(box, dimensions, attr.document, attr.renderer);
@@ -541,8 +548,9 @@ define([
     if (Env.isBrowser && typeof window === 'object' && typeof document === 'object') {
         Env.addEvent(window, 'load', function () {
             var type, i, j, div,
-                id, board, width, height, bbox, axis, grid,
-                code,
+                id, board, txt,
+                width, height, maxWidth, aspectRatio, cssClasses,
+                bbox, axis, grid, code,
                 src, request, postpone = false,
                 scripts = document.getElementsByTagName('script'),
                 init = function (code, type, bbox) {
@@ -576,8 +584,11 @@ define([
                 if (Type.exists(type) &&
                     (type.toLowerCase() === 'text/jessiescript' || type.toLowerCase() === 'jessiescript' ||
                      type.toLowerCase() === 'text/jessiecode' || type.toLowerCase() === 'jessiecode')) {
-                    width = scripts[i].getAttribute('width', false) || '500px';
-                    height = scripts[i].getAttribute('height', false) || '500px';
+                    cssClasses = scripts[i].getAttribute('class', false) || '';
+                    width = scripts[i].getAttribute('width', false) || '';
+                    height = scripts[i].getAttribute('height', false) || '';
+                    maxWidth = scripts[i].getAttribute('maxwidth', false) || '100%';
+                    aspectRatio = scripts[i].getAttribute('aspectratio', false) || '1/1';
                     bbox = scripts[i].getAttribute('boundingbox', false) || '-5, 5, 5, -5';
                     id = scripts[i].getAttribute('container', false);
                     src = scripts[i].getAttribute('src', false);
@@ -597,8 +608,14 @@ define([
                         id = 'jessiescript_autgen_jxg_' + i;
                         div = document.createElement('div');
                         div.setAttribute('id', id);
-                        div.setAttribute('style', 'width:' + width + '; height:' + height + '; float:left');
-                        div.setAttribute('class', 'jxgbox');
+
+                        txt = (width !== '') ? ('width:' + width + ';') : '';
+                        txt += (height !== '') ? ('height:' + height + ';') : '';
+                        txt += (maxWidth !== '') ? ('max-width:' + maxWidth + ';') : '';
+                        txt += (aspectRatio !== '') ? ('aspect-ratio:' + aspectRatio + ';') : '';
+
+                        div.setAttribute('style', txt);
+                        div.setAttribute('class', 'jxgbox ' + cssClasses);
                         try {
                             document.body.insertBefore(div, scripts[i]);
                         } catch (e) {
@@ -618,6 +635,7 @@ define([
                         request = new XMLHttpRequest();
                         request.open("GET", src);
                         request.overrideMimeType("text/plain; charset=x-user-defined");
+                        /* jshint ignore:start */
                         request.addEventListener("load", function() {
                             if (this.status < 400) {
                                 code = this.responseText + '\n' + code;
@@ -630,6 +648,7 @@ define([
                         request.addEventListener("error", function(e) {
                             throw new Error("\nJSXGraph: failed to load file", src, ":", e);
                         });
+                        /* jshint ignore:end */
                         request.send();
                     } else {
                         postpone = false;

package/src/jxg.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -53,6 +53,7 @@ define([], function () {
 
     /**
      * JXG is the top object of JSXGraph and defines the namespace
+     * @exports jxg as JXG
      */
     var jxg = {};
 
@@ -130,9 +131,9 @@ define([], function () {
         onlyOwn = onlyOwn || false;
         toUpper = toUpper || false;
 
-        // the purpose of this for...in loop is indeed to use hasOwnProperty only if the caller explicitly wishes so.
+        // The purpose of this for...in loop is indeed to use hasOwnProperty only if the caller explicitly wishes so.
         for (e in constants) {
-            if (!onlyOwn || (onlyOwn && extension.hasOwnProperty(e))) {
+            if (!onlyOwn || (onlyOwn && constants.hasOwnProperty(e))) {
                 if (toUpper) {
                     e2 = e.toUpperCase();
                 } else {

package/src/loadjsxgraph.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -307,7 +307,7 @@ var JXG = {},
     ////////////////////////////////////////////////////////////////////////////////
 
     // Has to be a String for Makefile!
-    JXG.Load.baseFiles = 'jxg,base/constants,utils/type,utils/xml,utils/env,utils/event,utils/expect,math/probfuncs,math/math,math/ia,math/extrapolate,math/numerics,math/nlp,math/plot,math/metapost,math/statistics,math/symbolic,math/geometry,math/clip,math/poly,math/complex,renderer/abstract,renderer/no,reader/file,parser/geonext,base/board,options,jsxgraph,base/element,base/coordselement,base/coords,base/point,base/line,base/group,base/circle,element/conic,base/polygon,base/curve,element/arc,element/sector,base/composition,element/composition,base/text,base/image,element/slider,element/measure,base/chart,base/transformation,base/turtle,utils/color,base/ticks,utils/zip,utils/base64,utils/uuid,utils/encoding,server/server,element/locus,parser/datasource,parser/ca,parser/jessiecode,utils/dump,renderer/svg,renderer/vml,renderer/canvas,renderer/no,element/comb,element/slopetriangle,math/qdt,element/checkbox,element/input,element/button';
+    JXG.Load.baseFiles = 'jxg,base/constants,utils/type,utils/xml,utils/env,utils/event,utils/expect,utils/color,math/probfuncs,math/math,math/ia,math/extrapolate,math/numerics,math/nlp,math/plot,math/metapost,math/statistics,math/symbolic,math/geometry,math/clip,math/poly,math/complex,renderer/abstract,renderer/no,reader/file,parser/geonext,base/board,options,jsxgraph,base/element,base/coordselement,base/coords,base/point,base/line,base/group,base/circle,element/conic,base/polygon,base/curve,element/arc,element/sector,base/composition,element/composition,base/text,base/image,element/slider,element/measure,base/chart,base/transformation,base/turtle,base/ticks,utils/zip,utils/base64,utils/uuid,utils/encoding,server/server,element/locus,parser/datasource,parser/ca,parser/jessiecode,utils/dump,renderer/svg,renderer/vml,renderer/canvas,renderer/no,element/comb,element/slopetriangle,math/qdt,element/checkbox,element/input,element/button,base/foreignobject';
     JXG.Load.setRequirePathToScriptFile('loadjsxgraph.js');
     JXG.Load.JSfiles(JXG.Load.baseFiles.split(','), preventCachingFiles);
     JXG.Load.baseFiles = null;
@@ -353,6 +353,7 @@ var JXG = {},
         'element/checkbox': checkJXG,
         'element/input': checkJXG,
         'element/button': checkJXG,
+        'element/foreignobject': checkJXG,
 
         'math/bst': makeCheck('Math.BST'),
         'math/qdt': makeCheck('Math.Quadtree'),

package/src/math/bst.js

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