From 1e2bbbdef22bef77be3ad25db03c980e9d54ebae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrg=20Lehni?= <juerg@scratchdisk.com>
Date: Sun, 9 Jun 2019 14:34:32 +0200
Subject: [PATCH] Fix handling of native classes in tests again

Reverting breaking change in 10bdafa82685b011a571c0e75a9d763af9cde675
---
 src/load.js     |  6 ++++++
 test/helpers.js | 16 +++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/load.js b/src/load.js
index 2da037a9..d1f4dd7b 100644
--- a/src/load.js
+++ b/src/load.js
@@ -36,6 +36,12 @@ if (typeof window === 'object') {
         // the code the 2nd time around.
         load(root + 'src/load.js');
     } else {
+        // Some native javascript classes have name collisions with Paper.js
+        // classes. Store them to be able to use them later in tests.
+        this.nativeClasses = {
+            Event: window.Event,
+            MouseEvent: window.MouseEvent
+        };
         include('options.js');
         // Load constants.js, required by the on-the-fly preprocessing:
         include('constants.js');
diff --git a/test/helpers.js b/test/helpers.js
index 8e8fba2d..547922aa 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -35,10 +35,10 @@ if (isNode) {
 }
 
 // Some native javascript classes have name collisions with Paper.js classes.
-// Store them before `paper.install()` to be able to use them later in tests.
-var nativeClasses = {
-    Event: Event,
-    MouseEvent: MouseEvent
+// If they have not already been stored in `src/load.js`, do it now:
+var nativeClasses = this.nativeClasses || {
+    Event: this.Event || {},
+    MouseEvent: this.MouseEvent || {}
 };
 
 // The unit-tests expect the paper classes to be global.
@@ -678,10 +678,12 @@ var triggerMouseEvent = function(type, point, target) {
     target = target || (type === 'mousedown' ? view.element : document);
     // If `gulp load` was run, there is a name collision between paper Event /
     // MouseEvent and native javascript classes. In this case, we need to use
-    // native classes stored in global NativeClasses object instead.
+    // native classes stored in the nativeClasses object instead.
     // MouseEvent class does not exist in PhantomJS, so in that case, we need to
-    // use a polyfill method.
-    var MouseEvent = nativeClasses.MouseEvent || MouseEventPolyfill;
+    // use a polyfill method, see: https://stackoverflow.com/questions/42929639
+    var MouseEvent = typeof nativeClasses.MouseEvent === 'function'
+        ? nativeClasses.MouseEvent
+        : MouseEventPolyfill;
     var event = new MouseEvent(type, {
         bubbles: true,
         cancelable: true,