Merge pull request #7594 from limzykenneth/dev-2.0

[p5.js 2.0] Loading functions fixes

Author: limzykenneth

src/io/files.js

@@ -295,7 +295,7 @@ function files(p5, fn){
 
     try{
       const { data } = await request(path, 'json');
-      if (successCallback) successCallback(data);
+      if (successCallback) return successCallback(data);
       return data;
     } catch(err) {
       p5._friendlyFileLoadError(5, path);
@@ -444,12 +444,12 @@ function files(p5, fn){
       let { data } = await request(path, 'text');
       data = data.split(/\r?\n/);
 
-      if (successCallback) successCallback(data);
+      if (successCallback) return successCallback(data);
       return data;
     } catch(err) {
       p5._friendlyFileLoadError(3, path);
       if(errorCallback) {
-        errorCallback(err);
+        return errorCallback(err);
       } else {
         throw err;
       }
@@ -549,7 +549,7 @@ function files(p5, fn){
       });
 
       if (successCallback) {
-        successCallback(ret);
+        return successCallback(ret);
       } else {
         return ret;
       }
@@ -729,12 +729,12 @@ function files(p5, fn){
       const parsedDOM = parser.parseFromString(data, 'application/xml');
       data = new p5.XML(parsedDOM);
 
-      if (successCallback) successCallback(data);
+      if (successCallback) return successCallback(data);
       return data;
     } catch(err) {
       p5._friendlyFileLoadError(1, path);
       if(errorCallback) {
-        errorCallback(err);
+        return errorCallback(err);
       } else {
         throw err;
       }
@@ -750,7 +750,7 @@ function files(p5, fn){
    *                                    completes
    * @param {Function} [errorCallback] function to be executed if there
    *                                    is an error
-   * @returns {Promise<Object>} an object whose 'bytes' property will be the loaded buffer
+   * @returns {Promise<Uint8Array>} a Uint8Array containing the loaded buffer
    *
    * @example
    * <div class='norender'><code>
@@ -770,12 +770,12 @@ function files(p5, fn){
     try{
       let { data } = await request(path, 'arrayBuffer');
       data = new Uint8Array(data);
-      if (successCallback) successCallback(data);
+      if (successCallback) return successCallback(data);
       return data;
     } catch(err) {
       p5._friendlyFileLoadError(6, path);
       if(errorCallback) {
-        errorCallback(err);
+        return errorCallback(err);
       } else {
         throw err;
       }
@@ -785,11 +785,11 @@ function files(p5, fn){
   fn.loadBlob = async function(path, successCallback, errorCallback) {
     try{
       const { data } = await request(path, 'blob');
-      if (successCallback) successCallback(data);
+      if (successCallback) return successCallback(data);
       return data;
     } catch(err) {
       if(errorCallback) {
-        errorCallback(err);
+        return errorCallback(err);
       } else {
         throw err;
       }

src/type/p5.Font.js

@@ -615,11 +615,11 @@ function font(p5, fn) {
         pfont = await create(this, ident, path, descriptors);
       }
       catch (err) {
-        if (error) error(err);
+        if (error) return error(err);
         throw err;
       }
     }
-    if (success) success(pfont);
+    if (success) return success(pfont);
 
     return pfont;
   }

src/webgl/material.js

@@ -130,8 +130,8 @@ function material(p5, fn){
     const loadedShader = new Shader();
 
     try {
-      loadedShader._vertSrc = await request(vertFilename, 'text');
-      loadedShader._fragSrc = await request(fragFilename, 'text');
+      loadedShader._vertSrc = (await request(vertFilename, 'text')).data;
+      loadedShader._fragSrc = (await request(fragFilename, 'text')).data;
 
       if (successCallback) {
         return successCallback(loadedShader);