diff --git a/package.json b/package.json
index 56b12387..705043db 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "rendertune",
"productName": "RenderTune",
- "version": "1.0.2",
+ "version": "1.0.3",
"description": "combine audio and image files to create video files",
"main": "main.js",
"scripts": {
diff --git a/src/js/newindex.js b/src/js/newindex.js
index ab7aadb2..b7b7f65a 100644
--- a/src/js/newindex.js
+++ b/src/js/newindex.js
@@ -98,31 +98,20 @@ $('#render-jobs-modal').on('hide.bs.modal', function () {
}
})
-//when you click the Uploads list button
+// ----------------------------------------------------------------------------------
+// jQuery event handler for when the menu-toggle icon is clicked
+// Either expand or collapse the sidebar menu based on its current state
+// ----------------------------------------------------------------------------------
$("#menu-toggle").click(function (e) {
- console.log('menu-toggle clicked')
e.preventDefault();
+ //toggle sidebar wrapper
$("#wrapper").toggleClass("toggled");
-
- //if uploads-list is already open
- if ($("#menu-toggle").hasClass("svg-selected")) {
-
- //else if uploads-list is not currently open when we click it
- } else {
-
- //if 'selected' is on for newUploadButton, toggle it off
- if ($("#newUploadButton").hasClass('page-selected')) {
- $("#newUploadButton").toggleClass("page-selected");
- }
- }
-
+ //toggle icon selected
$("#menu-toggle").toggleClass("svg-selected");
- console.log('menu-toggle selected')
});
//if newUpload modal is closed:
$('#new-upload-modal').on('hide.bs.modal', function () {
- console.log("'#new-upload-modal').on('hidden.bs.modal',")
if ($("#newUploadButton").hasClass("page-selected")) {
console.log('toggle new upload button on')
$("#newUploadButton").toggleClass("page-selected");
@@ -174,7 +163,7 @@ async function deleteAllUploads() {
}
/*
- NEW UPLOAD MODAL EVENT HANDLING:
+ NEW UPLOAD EVENT HANDLING:
*/
//if new upload files selection button is clicked
@@ -311,14 +300,6 @@ async function newUploadFileDropEvent(event, preventDefault) {
if (key == 'images') {
//for each image file
for (var i = 0; i < value.length; i++) {
- console.log("display this image:", value)
- //update text files display
- //imageFilesHtml = imageFilesHtml + `${value[i]['name']} `;
-
- //check if img display parent
if it contains an
element with matching imgFilePath
- //let doesLiExist = true;
- //if(!doesLiExist){
-
//create new ul element for image that we can display to the user (add attribute imgFilePath)
var ul = document.createElement('ul');
ul.setAttribute('imgFilePath',`${value[i]['path']}`);
@@ -327,12 +308,8 @@ async function newUploadFileDropEvent(event, preventDefault) {
var imgElem = document.createElement('img');
imgElem.setAttribute('src',`${value[i]['path']}`);
imgElem.style.width = "40%";
- //imgElem.setAttribute('style',`max-width:50%;`);
-
ul.appendChild(imgElem);
imageFilesElem.appendChild(ul);
- console.log("added this elem:", ul)
- //}
}
} else if (key == 'audio') {
@@ -343,8 +320,6 @@ async function newUploadFileDropEvent(event, preventDefault) {
}
}
}
- console.log('audioFilesHtml=', audioFilesHtml)
- console.log("newUploadAudioFilesDisplay2=", newUploadAudioFilesDisplay2)
document.getElementById('newUploadAudioFilesDisplay2').innerHTML=audioFilesHtml;
document.getElementById('newUploadImageFilesDisplay2').innerHTML='';
document.getElementById('newUploadImageFilesDisplay2').appendChild(imageFilesElem);
@@ -464,30 +439,29 @@ async function addToUploadList(uploadKey, uploadValue) {
})
}
-//upload where we display all the uploads
+// ----------------------------------------------------------------------------------
+// Update the left-hand sidebar view UploadList to display a the user's uploads
+// ----------------------------------------------------------------------------------
async function updateUploadListDisplay() {
return new Promise(async function (resolve, reject) {
- console.log('updateUploadListDisplay()')
- //reset
+ //clear sidebar html
document.getElementById('sidebar-uploads').innerHTML = "";
//get uploadList from localstorage
var uploadList = await JSON.parse(localStorage.getItem('uploadList'))
- console.log('updateUploadListDisplay() uploadList = ', uploadList)
-
//if uploadList exists
if (uploadList != null) {
//update numberOfUploads display
document.getElementById('numberOfUploads').innerText = Object.keys(uploadList).length;
- //for each object in uploadList
+ //for each item in uploadList
for (const [key, value] of Object.entries(uploadList)) {
+ //get vars from upload
let uploadId = key
let uploadTitle = value.title
let uploadFiles = value.files
- //get image from files
+ //use first image for display
let imgPath = uploadFiles.images[0].path;
uploadNumber = key.split('-')[1];
-
- //update sidebar display
+ //prepend upload to sidebar display
$("#sidebar-uploads").prepend(`
- `);
-
+ `);
}
}
resolve()
})
}
-//display an upload to the user
+// ----------------------------------------------------------------------------------
+// Call this function if the user clicks an upload in the sidebar UploadsList menu
+// Retrieve info for the upload, create html element, and display it to the user
+// ----------------------------------------------------------------------------------
async function displayUpload(uploadId) {
//if home icon is selected, unselect it
if ($("#homeButton").hasClass("page-selected")) {
@@ -517,7 +493,6 @@ async function displayUpload(uploadId) {
var uploadList = await JSON.parse(localStorage.getItem('uploadList'))
//get upload we want to display
var upload = uploadList[uploadId]
- console.log('display this upload: ', upload)
//clear upload display
document.getElementById("upload-pages-container").innerHTML = "";
//create upload page
@@ -537,6 +512,7 @@ async function unselectAllUploads() {
}
}
+//create html for Upload view
async function createUploadPage(upload, uploadId) {
//create image gallery container
let images = [];
@@ -545,11 +521,10 @@ async function createUploadPage(upload, uploadId) {
images.push(``)
}
- //create