Merge pull request #2954 from processing/revert-2259-feature/dynamic-paths

raclim · web-flow · commit b6b457ccff15 · 2024-01-25T14:04:58.000-05:00
Revert "Fix #212: Support dynamic paths in `loadImage`"
diff --git a/client/modules/Preview/EmbedFrame.jsx b/client/modules/Preview/EmbedFrame.jsx
@@ -254,14 +254,6 @@ function injectLocalFiles(files, htmlFile, options) {
   previewScripts.setAttribute('crossorigin', '');
   sketchDoc.head.appendChild(previewScripts);
 
-  const fileData = sketchDoc.createElement('script');
-  fileData.innerHTML = `
-    window.files = ${JSON.stringify(
-      files.filter((file) => file.url || file.fileType === 'folder')
-    )};
-  `;
-  sketchDoc.head.prepend(fileData);
-
   const sketchDocString = `<!DOCTYPE HTML>\n${sketchDoc.documentElement.outerHTML}`;
   scriptOffs = getAllScriptOffsets(sketchDocString);
   const consoleErrorsScript = sketchDoc.createElement('script');
diff --git a/client/utils/previewEntry.js b/client/utils/previewEntry.js
@@ -1,8 +1,6 @@
 import loopProtect from 'loop-protect';
 import { Hook, Decode, Encode } from 'console-feed';
 import StackTrace from 'stacktrace-js';
-import { resolvePathToFile } from '../../server/utils/filePath';
-import { EXTERNAL_LINK_REGEX } from '../../server/utils/fileUtils';
 import evaluateExpression from './evaluateExpression';
 
 // should postMessage user the dispatcher? does the parent window need to
@@ -180,33 +178,3 @@ if (_report) {
     _report.apply(window.p5, [newMessage, method, color]);
   };
 }
-
-const __patchedMethods = {};
-
-function applyPatching(methodName) {
-  __patchedMethods[methodName] = window.p5.prototype[methodName];
-  if (__patchedMethods[methodName]) {
-    window.p5.prototype[methodName] = function patched(path, ...args) {
-      let resolvedPath = path;
-      if (!EXTERNAL_LINK_REGEX.test(path)) {
-        const file = resolvePathToFile(path, window.files);
-        if (file && file.url) {
-          resolvedPath = file.url;
-        }
-      }
-      return __patchedMethods[methodName].apply(this, [resolvedPath, ...args]);
-    };
-  }
-}
-
-[
-  'loadImage',
-  'loadModel',
-  'loadJSON',
-  'loadStrings',
-  'loadTable',
-  'loadXML',
-  'loadBytes',
-  'loadFont',
-  'loadShader'
-].forEach(applyPatching);
