Revert "Bug Fix - Warning affecting functionality of platform #16"

This reverts commit d6342d8.
KnowledgeCaptureAndDiscovery · Sep 18, 2018 · 9d1d7b0 · 9d1d7b0
1 parent d6342d8
commit 9d1d7b0
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 24 deletions.
diff --git a/development/asset.js b/development/asset.js
@@ -110,8 +110,15 @@ function initialize() {
 		}
 	};
 
+	//to load the images
+	eventFire((Polymer.dom((Polymer.dom(assetAppElement.root).querySelector("#elementsSelect")).root).querySelector("[id='Common Tasks']")), 'click');
+	eventFire((Polymer.dom((Polymer.dom(assetAppElement.root).querySelector("#elementsSelect")).root).querySelector("[id='EarthCube Tools']")), 'click');
+	eventFire((Polymer.dom((Polymer.dom(assetAppElement.root).querySelector("#elementsSelect")).root).querySelector("[id='Common Tools']")), 'click');
+
 	Polymer.dom(assetAppElement.root).querySelector("#populateDetailsSection").innerHTML = "";
 
+	eventFire((Polymer.dom((Polymer.dom(assetAppElement.root).querySelector("#elementsSelect")).root).querySelector("[id='Common Tasks']")), 'click');
+
 	//helpers for delete press
 	canvasElement.tabIndex = 1000;
 	canvasElement.style.outline = "none";
@@ -143,28 +150,6 @@ function initialize() {
 
 	zoomInButton.style.cursor = "zoom-in";
 	zoomOutButton.style.cursor = "zoom-out";
-
-	//Fetch the source JSON Asynchronously	
-	var requestObject;
-	requestObject = new XMLHttpRequest();
-	requestObject.onreadystatechange = function() {
-		if (this.readyState == 4 && this.status == 200) {
-			localStorage.setItem("sourceJSON", this.responseText);
-
-			var workflowElementsString = "<workflow-elements draggable='false' id='elementsSelect' src='content.json'></workflow-elements>";
-
-			var populateWorkflowElementsElement = Polymer.dom(assetAppElement.root).querySelector("#WorkFlowElementsSection");
-			populateWorkflowElementsElement.innerHTML = workflowElementsString;
-
-			//to load the images
-			//eventFire((Polymer.dom((Polymer.dom(assetAppElement.root).querySelector("#elementsSelect")).root).querySelector("[id='Common Tasks']")), 'click');
-			//eventFire((Polymer.dom((Polymer.dom(assetAppElement.root).querySelector("#elementsSelect")).root).querySelector("[id='EarthCube Tools']")), 'click');
-			//eventFire((Polymer.dom((Polymer.dom(assetAppElement.root).querySelector("#elementsSelect")).root).querySelector("[id='Common Tools']")), 'click');
-		}
-	};
-	requestObject.open("GET", "content.json", true);
-	requestObject.send();
-
 }
 
 function dropdown() {

diff --git a/development/src/asset-app/asset-app.html b/development/src/asset-app/asset-app.html
@@ -302,7 +302,7 @@
       <div id="ContentSection" onclick="importUnfocused()">
         <div class="unselectable" draggable="false" id="leftSsection">
           <img src = "../../images/asset.png" draggable="false" id = "logo"></img>
-          <div id="WorkFlowElementsSection"></div>
+          <workflow-elements draggable="false" id="elementsSelect" src="content.json"></workflow-elements>
           <paper-slider disabled draggable="false" ignore-bar-touch="true" step=".1" min="1" max="3" value="1" id="sizeSlider"></paper-slider>
 
           <hr>

diff --git a/development/src/elements-detail/elements-detail.html b/development/src/elements-detail/elements-detail.html
@@ -71,6 +71,18 @@
 			    try {
 
 				    dataJSON = localStorage.getItem("sourceJSON");
+
+				    if( dataJSON == null || dataJSON == undefined ) {
+
+				    	console.log("Fetching JSON again");
+
+					    requestObject = new XMLHttpRequest();
+					    requestObject.open("GET", this.src, false);
+					    requestObject.send();
+
+				    	dataJSON = requestObject.responseText;
+				    }
+
 				    dataJSON = JSON.parse(dataJSON);
 
 				    for(i = 0; i < dataJSON.workflowElements.length; i++) {

diff --git a/development/src/workflow-elements/workflow-elements.html b/development/src/workflow-elements/workflow-elements.html
@@ -69,7 +69,16 @@
 			    var requestObject;
 
 			    try {
-				    dataJSON = JSON.parse(localStorage.getItem("sourceJSON"));
+
+				    requestObject = new XMLHttpRequest();
+				    requestObject.open("GET", this.src, false);
+				    requestObject.send();
+
+				    localStorage.setItem("sourceJSON", requestObject.responseText);
+
+				    dataJSON = JSON.parse(requestObject.responseText);
+
+
 				    for(var i = 0; i < dataJSON.workflowElements.length; i++) {
 				    	this.push('workflowElements', dataJSON.workflowElements[i].name);
 				    }