From 8b4c6c201440d331b633ed9b032e4cc06ab56bc9 Mon Sep 17 00:00:00 2001
From: Uwe Oestermeier <u.oestermeier@iwm-tuebingen.de>
Date: Fri, 5 Jul 2019 14:11:43 +0200
Subject: [PATCH] Fixed doctest problems.

---
 dist/iwmlib.js      |  5 +++--
 dist/iwmlib.pixi.js |  8 ++++++--
 lib/scatter.html    | 22 +++++++++++-----------
 lib/scatter.js      |  5 +++--
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/dist/iwmlib.js b/dist/iwmlib.js
index 286c758..5a17a14 100644
--- a/dist/iwmlib.js
+++ b/dist/iwmlib.js
@@ -4985,10 +4985,11 @@
          * @param {String} [touchAction=none] - CSS to set touch action style, needed to prevent
          *                              pointer cancel events. Use null if the
          *                              the touch action should not be set.
+         * @param {DOM node} debugCanvas - Shows debug infos about touches if not null
          */
         constructor(
             element,
-            { stopEvents = 'auto', claimEvents = true, useCapture = true, touchAction = 'none' } = {}
+            { stopEvents = 'auto', claimEvents = true, useCapture = true, touchAction = 'none', debugCanvas = null } = {}
         ) {
             this.onCapture = null;
             this.element = element;
@@ -5020,7 +5021,7 @@
                 mouseWheelElement: window
             });
 
-            if (typeof debugCanvas !== 'undefined') {
+            if (debugCanvas !== null) {
                 requestAnimationFrame(dt => {
                     this.showTouches(dt, debugCanvas);
                 });
diff --git a/dist/iwmlib.pixi.js b/dist/iwmlib.pixi.js
index eb0f1d2..ef8ed40 100644
--- a/dist/iwmlib.pixi.js
+++ b/dist/iwmlib.pixi.js
@@ -6053,6 +6053,10 @@
     window.Capabilities = Capabilities;
     window.CapabilitiesTests = CapabilitiesTests;
 
+    /** Basic class for poppable elements that need to be closed as soon as one poppable is
+     * shown.
+     */
+
     /* eslint-disable no-unused-vars */
     /**
      * A base class for scatter specific events.
@@ -14829,7 +14833,7 @@
      * @extends Popup
      * @see {@link https://www.iwm-tuebingen.de/iwmbrowser/lib/pixi/popupmenu.html|DocTest}
      */
-    class PopupMenu extends Popup {
+    class PopupMenu$1 extends Popup {
         
         /**
          * Creates an instance of a PopupMenu.
@@ -15478,7 +15482,7 @@
     window.Stylus = Stylus;
     window.Switch = Switch;
     window.Popup = Popup;
-    window.PopupMenu = PopupMenu;
+    window.PopupMenu = PopupMenu$1;
     window.Modal = Modal;
     window.Volatile = Volatile;
     window.Message = Message;
diff --git a/lib/scatter.html b/lib/scatter.html
index 4a3ad99..f3e04d7 100644
--- a/lib/scatter.html
+++ b/lib/scatter.html
@@ -13,9 +13,8 @@
         debugCanvas.width = main.getBoundingClientRect().width
         let context = debugCanvas.getContext('2d')
         context.clearRect(0, 0, debugCanvas.width, debugCanvas.height)
-
         let stage = scatterContainer.polygon
-        stage.draw(context, { stroke: '#0000FF'})
+        stage.draw(context, { stroke: "#0000FF"})
         for(let scatter of scatterContainer.scatter.values()) {
             let polygon = scatter.polygon
             polygon.draw(context, { stroke: '#0000FF'})
@@ -26,6 +25,7 @@
         requestAnimationFrame((dt) => {
             drawPolygons()
             animatePolygons()
+           
         })
     }
     </script>
@@ -81,6 +81,8 @@ app.run()
 animatePolygons()
 </script>
 
+
+
 <h1>
 	Interactive Content
 </h1>
@@ -91,21 +93,19 @@ elements under or nearby the event position and calls the click handler. Thus ge
 can be disambiguated as moves, zooms. or taps.
 </p>
 
-<div id="main2" class="grayBorder interactive" style="position: relative; width: 100%; height: 280px;">
-    <!-- Note that we need to set draggable to false to avoid conflicts. The DOM elements
-    must also be positioned absolutely. -->
+<div id="contentExample" class="grayBorder interactive" style="position: relative; width: 100%; height: 280px;">
+  
     <div id="interactiveContent">
         <img draggable="false" style="position: absolute;" src="examples/women.jpeg" />
-        <a style="position:absolute; top: 10px; right: 10px; color:white;" href="https://www.iwm-tuebingen.de" target="_blank">A Link</a>
-        <div onclick="alert('clicked')" style="position:absolute; top: 30px; right: 10px; color:white;">A Div with click handler</div>
+        <a style="position:absolute; top: 10px; right: 10px; color:white;" href="javascript:alert('test link')">A Link</a>
+        <div onclick="alert('div clicked')" style="position:absolute; top: 30px; right: 10px; color:white;">A Div with click handler</div>
     </div>
 </div>
 
 <script class="doctest">
   
-    let app2 = new App()
-    let scatterContainer2 = new DOMScatterContainer(main2)
-    let scatter2 = new DOMScatter(interactiveContent, scatterContainer2, {
+    let contentContainer = new DOMScatterContainer(contentExample)
+    new DOMScatter(interactiveContent, contentContainer, {
                         x: 44,
                         y: 44,
                         width: 274,
@@ -113,7 +113,7 @@ can be disambiguated as moves, zooms. or taps.
                         throwVisibility: 88,
                         minScale: 0.5,
                         maxScale: 1.5})
-    app2.run()
+   
 </script>
 
 </body>
diff --git a/lib/scatter.js b/lib/scatter.js
index b947225..c0942cd 100644
--- a/lib/scatter.js
+++ b/lib/scatter.js
@@ -865,10 +865,11 @@ export class DOMScatterContainer {
      * @param {String} [touchAction=none] - CSS to set touch action style, needed to prevent
      *                              pointer cancel events. Use null if the
      *                              the touch action should not be set.
+     * @param {DOM node} debugCanvas - Shows debug infos about touches if not null
      */
     constructor(
         element,
-        { stopEvents = 'auto', claimEvents = true, useCapture = true, touchAction = 'none' } = {}
+        { stopEvents = 'auto', claimEvents = true, useCapture = true, touchAction = 'none', debugCanvas = null } = {}
     ) {
         this.onCapture = null
         this.element = element
@@ -900,7 +901,7 @@ export class DOMScatterContainer {
             mouseWheelElement: window
         })
 
-        if (typeof debugCanvas !== 'undefined') {
+        if (debugCanvas !== null) {
             requestAnimationFrame(dt => {
                 this.showTouches(dt, debugCanvas)
             })