Merge branch 'save-load-fixing' into update-environment-options

src/json-utils.js

@@ -6,12 +6,14 @@ and returns a Javascript object
 */
 function convertDOMElToObject (entity) {
   const data = [];
-  if (entity.length) {
-    for (const entry of entity) {
-      data.push(getElementData(entry));
+  const environmentElement = document.querySelector('#environment');
+  const sceneEntities = [entity, environmentElement];
+
+  for (const entry of sceneEntities) {
+    const entityData = getElementData(entry);
+    if (entityData) {
+      data.push(entityData);
     }
-  } else {
-    data.push(getElementData(entity));
   }
   return {
     title: 'scene',
@@ -21,6 +23,9 @@ function convertDOMElToObject (entity) {
 }
 
 function getElementData (entity) {
+  if (!entity.isEntity) {
+    return;
+  }
   const elementTree = getAttributes(entity);
   const children = entity.childNodes;
   if (children.length) {
@@ -36,7 +41,8 @@ function getElementData (entity) {
 
 function getAttributes (entity) {
   const elemObj = {};
-  elemObj['element'] = entity.tagName.toLowerCase();
+
+  elemObj['element'] = entity.tagName.toLowerCase();  
 
   if (entity.id) {
     elemObj['id'] = entity.id;
@@ -112,7 +118,8 @@ const removeProps = {
   normalMap: {},
   'set-loader-from-hash': '*',
   'create-from-json': '*',
-  street: { JSON: '*' }
+  street: { JSON: '*' },
+  'street-environment': '*'
 };
 // a list of component_name:new_component_name pairs to rename in JSON string
 const renameProps = {
@@ -122,7 +129,6 @@ const renameProps = {
 
 function filterJSONstreet (removeProps, renameProps, streetJSON) {
   function removeValueCheck (removeVal, value) {
-    // console.error(removeVal, value, AFRAME.utils.deepEqual(removeVal, value))
     if (AFRAME.utils.deepEqual(removeVal, value) || removeVal === '*') {
       return true;
     }
@@ -256,7 +262,6 @@ function getModifiedProperty (entity, componentName) {
       return data;
     }
   }
-
   const diff = {};
   for (const key in data) {
     const defaultValue = defaultData[key].default;
@@ -270,19 +275,19 @@ function getModifiedProperty (entity, componentName) {
       diff[key] = data[key];
     }
   }
-
   return diff;
 }
 
-function createEntities (entitiesData, parentEl) {
+function createEntities (entitiesData, parentEl) { 
+  const sceneElement = document.querySelector('a-scene');
   for (const entityData of entitiesData) {
     if (entityData.id === 'street-container' &&
     entityData.children &&
     entityData.children[0].id === 'default-street' &&
     entityData.children[0].components.hasOwnProperty('set-loader-from-hash')) {
       delete entityData.children[0].components['set-loader-from-hash'];
     }
-    createEntityFromObj(entityData, parentEl);
+    createEntityFromObj(entityData, sceneElement);
   }
 }
 
@@ -330,12 +335,14 @@ function createEntityFromObj (entityData, parentEl) {
       entity.setAttribute('mixin', entityData.mixin);
     }
     // Ensure the components are loaded before update the UI
+
     entity.emit('entitycreated', {}, false);
   });
 
-  if (entityData.children) {
-    for (const childEntityData of entityData.children) {
-      createEntityFromObj(childEntityData, entity);
-    }
-  }
+    if (entityData.children) {
+      for (const childEntityData of entityData.children) {
+        createEntityFromObj(childEntityData, entity);
+      }
+    }    
+  }); 
 }