From ce7e86cbef48d167332cc2bec5e8984a69418bd4 Mon Sep 17 00:00:00 2001 From: Maxim Stewart Date: Sun, 22 Apr 2018 03:56:25 -0500 Subject: [PATCH] Cleanup of logic and look. --- resources/js/xmlParser.js | 66 +++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/resources/js/xmlParser.js b/resources/js/xmlParser.js index c23ad29..574dc85 100644 --- a/resources/js/xmlParser.js +++ b/resources/js/xmlParser.js @@ -1,21 +1,20 @@ function updateHTMLDirList(returnData) { - var dirPath = returnData.getElementsByTagName('PATH_HEAD')[0]; + var dirPath = returnData.getElementsByTagName('PATH_HEAD')[0].innerHTML; var dirs = returnData.getElementsByTagName('DIR'); var videos = returnData.getElementsByTagName('VID_FILE'); var images = returnData.getElementsByTagName('IMG_FILE'); var files = returnData.getElementsByTagName('FILE'); var insertArea = document.getElementById('dynDiv'); - var workingDir = dirPath.innerHTML; var i = 0; var size = 0; // Insert dirs - document.getElementById("path").innerHTML = workingDir; + document.getElementById("path").innerHTML = dirPath; insertArea.innerHTML = ""; // Remove . and ../ if in "root" - if (workingDir === "./") { + if (dirPath === "./") { var i = 2 } @@ -24,12 +23,13 @@ function updateHTMLDirList(returnData) { var dir = dirs[i].innerHTML; if (dir != "resources/") { - insertArea.innerHTML += "
" - + "" - +""; + insertArea.innerHTML += + "
" + + "" + +""; } } @@ -42,19 +42,20 @@ function updateHTMLDirList(returnData) { thumbnail = videos[i].children[0].innerHTML; vidNme = videos[i].children[1].innerHTML; - insertArea.innerHTML += "" - + "\""" - + "" - + ""; + insertArea.innerHTML += + "" + + "\""" + + "" + + ""; } // Insert images - var path = document.getElementById("path").innerHTML; - var thumbnail = "" - size = images.length; + var path = document.getElementById("path").innerHTML; + var thumbnail = "" + size = images.length; for (i = 0; i < size; i++) { thumbnail = images[i].children[0].innerHTML; @@ -67,14 +68,10 @@ function updateHTMLDirList(returnData) { } } - if (images[0] != undefined) { - var imgText = images[0].children[0].innerHTML; - - if (imgText.match(/000\.(jpg|png|gif)\b/) != null) { - updateBG(path + images[0].children[0].innerHTML); - } else { - updateBG("resources/images/backgrounds/000.jpg"); - } + // Setup background if there is a 000.* in selection + var bgImgPth = images[0].children[0].innerHTML; + if (bgImgPth.match(/000\.(jpg|png|gif)\b/) != null) { + updateBG(path + bgImgPth); } else { updateBG("resources/images/backgrounds/000.jpg"); } @@ -86,12 +83,13 @@ function updateHTMLDirList(returnData) { var iconImg = "" - + iconImg - + "" - + ""; + insertArea.innerHTML += + "
" + + iconImg + + "" + + ""; } }