Merge pull request #7877 from processing/video-callback-20

add instance of video in callback (2.0)

Author: davepagurek

src/dom/p5.MediaElement.js

@@ -1335,15 +1335,6 @@ function media(p5, fn){
       elt.appendChild(sourceEl);
     }
 
-    // If callback is provided, attach to element
-    if (typeof callback === 'function') {
-      const callbackHandler = () => {
-        callback();
-        elt.removeEventListener('canplaythrough', callbackHandler);
-      };
-      elt.addEventListener('canplaythrough', callbackHandler);
-    }
-
     const mediaEl = addElement(elt, pInst, true);
     mediaEl.loadedmetadata = false;
 
@@ -1362,6 +1353,15 @@ function media(p5, fn){
       mediaEl.loadedmetadata = true;
     });
 
+    // If callback is provided, attach to element
+    if (typeof callback === 'function') {
+      const callbackHandler = () => {
+        callback(mediaEl);
+        elt.removeEventListener('canplaythrough', callbackHandler);
+      };
+      elt.addEventListener('canplaythrough', callbackHandler);
+    }
+
     return mediaEl;
   }