From 6539209a81ecc5a3615f460f9cb608d842af9b3d Mon Sep 17 00:00:00 2001
From: Alexander Goryushkin <aleotu@gmail.com>
Date: Wed, 31 Jan 2024 22:25:54 -0300
Subject: [PATCH] call json-utils.js from index.js

move functions used elsewhere from json-utils to a global STREET object
---
 index.html        |  5 +----
 src/index.js      |  1 +
 src/json-utils.js | 12 +++++++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index da6d15622..469d843a2 100644
--- a/index.html
+++ b/index.html
@@ -10,9 +10,6 @@
     <!-- mapbox -->
     <script src="./src/lib/aframe-mapbox-component.min.js"></script>
 
-    <!-- save / load -->
-    <script src="./src/json-utils.js"></script>
-
     <!-- vr teleport controls -->
     <script src="https://cdn.jsdelivr.net/npm/aframe-blink-controls@0.4.3/dist/aframe-blink-controls.min.js"></script>
 
@@ -123,7 +120,7 @@
   <script>
 
     document.getElementById('inputfile')
-            .addEventListener('change', fileJSON);
+            .addEventListener('change', STREET.utils.fileJSON);
 
     function buttonScreenshotTock() {
       const screenshotEl = document.getElementById('screenshot');
diff --git a/src/index.js b/src/index.js
index bddee277e..0945dcee9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,6 +3,7 @@ require('babel-polyfill');
 if (typeof VERSION !== 'undefined') { console.log(`3DStreet Version: ${VERSION} (Date: ${new Date(COMMIT_DATE).toISOString().split('T')[0]}, Commit Hash: #${COMMIT_HASH})`); }
 var streetmixParsers = require('./aframe-streetmix-parsers');
 var streetmixUtils = require('./tested/streetmix-utils');
+require('./json-utils.js');
 require('./components/gltf-part');
 require('./components/ocean');
 require('./lib/aframe-cursor-teleport-component.min.js');
diff --git a/src/json-utils.js b/src/json-utils.js
index 05d471845..ef0a861c3 100644
--- a/src/json-utils.js
+++ b/src/json-utils.js
@@ -1,9 +1,10 @@
 /* global AFRAME, Node */
 /* version: 1.0 */
 
-var STREET = {};
+window.STREET = {};
 STREET.utils = {};
 
+
 function getSceneUuidFromURLHash () {
   const currentHash = window.location.hash;
   const match = currentHash.match(/#\/scenes\/([a-zA-Z0-9-]+)\.json/);
@@ -56,6 +57,8 @@ function convertDOMElToObject (entity) {
   };
 }
 
+STREET.utils.convertDOMElToObject = convertDOMElToObject;
+
 function getElementData (entity) {
   if (!entity.isEntity) {
     return;
@@ -220,6 +223,8 @@ function filterJSONstreet (removeProps, renameProps, streetJSON) {
   return stringJSON;
 }
 
+STREET.utils.filterJSONstreet = filterJSONstreet;
+
 /**
  * function from 3dstreet-editor/src/lib/entity.js
  * Gets the value for a component or component's property coming from mixins of
@@ -642,6 +647,8 @@ function createElementsFromJSON (streetJSON) {
   STREET.notify.successMessage('Scene loaded from JSON');
 }
 
+STREET.utils.createElementsFromJSON = createElementsFromJSON;
+
 // viewer widget click to paste json string of 3dstreet scene
 function inputJSON () {
   const stringJSON = prompt('Please paste 3DStreet JSON string');
@@ -660,3 +667,6 @@ function fileJSON () {
   };
   reader.readAsText(this.files[0]);
 }
+
+// temporarily place the UI function in utils, which is used in index.html.
+STREET.utils.fileJSON = fileJSON;