v1.5.5

flyingcatdeveloper · Mar 24, 2023 · bb65349 · bb65349
1 parent 07498f9
commit bb65349
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 102 deletions.
diff --git a/devlog.txt b/devlog.txt
@@ -1,6 +1,10 @@
  NEKO Code Editor Devlog
 |-----------------------|
 
+Update/Bug Fix v1.5.5 03/24/2023:
+    - Fixed "Import Project" Feature
+    - Updated indexedDB to use the latest version of IDB Keyval
+
 Update v1.5.4 03/08/2023:
     - Tidied up editor source code
 

diff --git a/src/monaco/e.html b/src/monaco/e.html
@@ -36,6 +36,8 @@ <h1 align="center" id="loader"></h1>
 var data = {};
 
 function loadEditor(sf, s, afs) {
+	window.data = {};
+
 	document.getElementById('editor').innerHTML = '';
 
 	document.getElementById('editor').style.opacity = 1;

diff --git a/src/scripts/db.js b/src/scripts/db.js
diff --git a/src/views/dashboard.html b/src/views/dashboard.html
@@ -32,7 +32,7 @@
       <button class="btn" data-title="Account Settings" id="account">
         Account Settings
       </button>
-      <p id="ver">v1.5.4</p>
+      <p id="ver">v1.5.5</p>
     </div>
 
     <div class="projects-container">

diff --git a/src/views/editor.html b/src/views/editor.html
@@ -104,7 +104,7 @@
 					  </label>
 				</div>
 				<div id="settingsMenu"></div>
-				<i id="ver" style="font-size: 2rem;">v1.5.4</i>
+				<i id="ver" style="font-size: 2rem;">v1.5.5</i>
 				<iframe frameborder="0" id="iframe"></iframe>
 					<div style="display: none;" class="tocl tocl-4">
 						<p class="toclp">Console</p>
@@ -219,6 +219,7 @@
 			document.querySelector(".btn-import").onclick = function() {
 				var uinput = confirm("Do you want to import this project? It will clear any existing data.");
 				if (uinput) {
+					var eframe = document.getElementById("eframe");
 					var newLoad = document.createElement("input");
 
 					newLoad.type = "file";
@@ -244,12 +245,13 @@
 							document.querySelector(".folder-picker").innerHTML = "<option>main</option>";
 							document.querySelector(".language-picker").innerHTML = "";
 
+							var lastFile;
 							for (var nameOfFileContainedInZipFile in zipFileLoaded.files)
 							{
 								var fileContainedInZipFile = zipFileLoaded.files[nameOfFileContainedInZipFile];
 
 								var splitFolder = nameOfFileContainedInZipFile.split("/");
-								if (splitFolder.length > 1) {
+								if (splitFolder.length > 1 && splitFolder[1] !== "") {
 									var folder = splitFolder[0];
 									var splitFile = splitFolder[1].split(".");
 									var file = window.Base64.encode(splitFile[0]) + "-" + splitFile[1];
@@ -271,9 +273,13 @@
 									if (document.querySelector(".folder-picker").options[document.querySelector(".folder-picker").selectedIndex].innerHTML === folder) {
 										document.querySelector('.language-picker').appendChild(newOption);
 										eframe.contentWindow.loadEditor(folder, file, window.afs);
+										lastFile = [folder, file];
+									} else if (lastFile !== undefined) {
+										document.querySelector('.language-picker').appendChild(newOption);
+										eframe.contentWindow.loadEditor(lastFile[0], lastFile[1], window.afs);
 									}
 									document.querySelector(".language-picker").style.display = "";
-								} else {
+								} else if (splitFolder[1] !== "") {
 									var splitFile = nameOfFileContainedInZipFile.split(".");
 									var file = window.Base64.encode(splitFile[0]) + "-" + splitFile[1];
 									window.afs["main"][file] = fileContainedInZipFile.asText();
@@ -285,6 +291,10 @@
 									if (document.querySelector(".folder-picker").options[document.querySelector(".folder-picker").selectedIndex].innerHTML === "main") {
 										document.querySelector('.language-picker').appendChild(newOption);
 										eframe.contentWindow.loadEditor("main", file, window.afs);
+										lastFile = ["main", file];
+									} else if (lastFile !== undefined) {
+										document.querySelector('.language-picker').appendChild(newOption);
+										eframe.contentWindow.loadEditor(lastFile[0], lastFile[1], window.afs);
 									}
 									document.querySelector(".language-picker").style.display = "";
 								}