Fixed conflict.

dist/iwmlib.js

@@ -3815,38 +3815,6 @@
                 onMove = null
             } = {}
         ) {
-<<<<<<< HEAD
-            this.onCapture = null;
-            this.element = element;
-            if (stopEvents === 'auto') {
-                /*
-                The events have to be stopped in Safari, otherwise the whole page will be zoomed with
-                a pinch gesture (preventDefault in method preventPinch). In order to enable the
-                movement of scatter objects, the touchmove event has to be bound again.
-                */
-                if (Capabilities.isSafari) {
-                    document.addEventListener(
-                        'touchmove',
-                        event => this.preventPinch(event),
-                        false
-                    );
-                    stopEvents = false;
-                } else {
-                    stopEvents = true;
-                }
-            }
-            this.stopEvents = stopEvents;
-            this.claimEvents = claimEvents;
-            if (touchAction !== null) {
-                Elements$1.setStyle(element, { touchAction });
-            }
-            this.scatter = new Map();
-            this.delegate = new InteractionMapper$1(element, this, {
-                useCapture,
-                mouseWheelElement: window
-            });
-=======
->>>>>>> a3f7eb0b3cc9f48cfee3ce6c45887bf25617d1bc
 
 
             let notchPosition = (switchPos && point.y < 50) ? "topCenter" : "bottomCenter";
@@ -4753,52 +4721,6 @@
             }
         }
 
-<<<<<<< HEAD
-    class DOMFlippable {
-        constructor(element, scatter, flip) {
-            // Set log to console.log or a custom log function
-            // define data structures to store our touchpoints in
-
-            this.element = element;
-            this.flip = flip;
-            this.card = element.querySelector('.flipCard');
-            this.front = element.querySelector('.front');
-            this.back = element.querySelector('.back');
-            this.flipped = false;
-            this.scatter = scatter;
-            this.onFrontFlipped = flip.onFrontFlipped;
-            this.onBackFlipped = flip.onBackFlipped;
-            this.onClose = flip.onClose;
-            this.onRemoved = flip.onRemoved;
-            this.onUpdate = flip.onUpdate;
-
-            this.flipDuration = flip.flipDuration;
-            this.fadeDuration = flip.fadeDuration;
-            scatter.addTransformEventCallback(this.scatterTransformed.bind(this));
-            console.log('lib.DOMFlippable', 5000);
-            TweenLite.set(this.element, { perspective: 5000 });
-            TweenLite.set(this.card, { transformStyle: 'preserve-3d' });
-            TweenLite.set(this.back, { rotationY: -180 });
-            TweenLite.set([this.back, this.front], {
-                backfaceVisibility: 'hidden',
-                perspective: 5000
-            });
-            TweenLite.set(this.front, { visibility: 'visible' });
-            this.infoBtn = element.querySelector('.infoBtn');
-            this.backBtn = element.querySelector('.backBtn');
-            this.closeBtn = element.querySelector('.closeBtn');
-            /* Buttons are not guaranteed to exist. */
-            if (this.infoBtn) {
-                InteractionMapper$1.on('tap', this.infoBtn, event => this.flip.start());
-                this.enable(this.infoBtn);
-            }
-            if (this.backBtn) {
-                InteractionMapper$1.on('tap', this.backBtn, event => this.start());
-            }
-            if (this.closeBtn) {
-                InteractionMapper$1.on('tap', this.closeBtn, event => this.close());
-                this.enable(this.closeBtn);
-=======
         /**
          * For a given zoom, a new scale is calculated, taking
          * min and max scale into account.
@@ -4814,7 +4736,6 @@
             if (scale < minScale) {
                 scale = minScale;
                 zoom = scale / this.scale;
->>>>>>> a3f7eb0b3cc9f48cfee3ce6c45887bf25617d1bc
             }
             if (scale > maxScale) {
                 scale = maxScale;
@@ -5065,6 +4986,11 @@
             this.onCapture = null;
             this.element = element;
             if (stopEvents === 'auto') {
+                /*
+                The events have to be stopped in Safari, otherwise the whole page will be zoomed with
+                a pinch gesture (preventDefault in method preventPinch). In order to enable the
+                movement of scatter objects, the touchmove event has to be bound again.
+                */
                 if (Capabilities.isSafari) {
                     document.addEventListener(
                         'touchmove',
@@ -6020,7 +5946,6 @@
             /* Buttons are not guaranteed to exist. */
             if (this.infoBtn) {
                 InteractionMapper$1.on('tap', this.infoBtn, event => this.flip.start());
-
                 this.enable(this.infoBtn);
             }
             if (this.backBtn) {

dist/iwmlib.pixi.js

@@ -6046,10 +6046,6 @@
     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.
@@ -14748,7 +14744,7 @@
      * @extends Popup
      * @see {@link https://www.iwm-tuebingen.de/iwmbrowser/lib/pixi/popupmenu.html|DocTest}
      */
-    class PopupMenu$1 extends Popup {
+    class PopupMenu extends Popup {
         
         /**
          * Creates an instance of a PopupMenu.
@@ -15397,7 +15393,7 @@
     window.Stylus = Stylus;
     window.Switch = Switch;
     window.Popup = Popup;
-    window.PopupMenu = PopupMenu$1;
+    window.PopupMenu = PopupMenu;
     window.Modal = Modal;
     window.Volatile = Volatile;
     window.Message = Message;