diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..08cc8e2 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "cSpell.words": [ + "onlinepngtools" + ] +} \ No newline at end of file diff --git a/index.html b/index.html new file mode 100644 index 0000000..3c985a6 --- /dev/null +++ b/index.html @@ -0,0 +1,18 @@ + + + + + + + + www + + + +
+

Slideshow

+
+ + + \ No newline at end of file diff --git a/slideshow/index.html b/slideshow/index.html index 38e785f..eddb201 100644 --- a/slideshow/index.html +++ b/slideshow/index.html @@ -1,14 +1,17 @@  + - + Slideshow +
@@ -18,6 +21,7 @@ - + - + + \ No newline at end of file diff --git a/slideshow/index.json b/slideshow/index.json new file mode 100644 index 0000000..2abdf2b --- /dev/null +++ b/slideshow/index.json @@ -0,0 +1,5 @@ +{ + "ImageZero": "images/1x1_00000000.png", + "DataDirectory": "../Images - Results/F) Random/2021-11-03/[]", + "Root": "../Images - Results/C) Resize/2021-11-03/1920 x 1080/()" +} \ No newline at end of file diff --git a/slideshow/scripts/index.js b/slideshow/scripts/index.js index b6ca4af..adbe964 100644 --- a/slideshow/scripts/index.js +++ b/slideshow/scripts/index.js @@ -7,8 +7,10 @@ var _Root; var _RootAlt; + var _ImageZero; var _JsonTimer; var _ImageTimer; + var _DataDirectory; var _Pause = 0; var _Images = []; @@ -28,12 +30,33 @@ document.addEventListener('keyup', getInput, false); - loadDevice(); - loadData(); - - _JsonTimer = setInterval(onTickJSON, _JsonInterval); - _ImageTimer = setInterval(onTickImage, _ImageInterval); + var url = '../slideshow/index.json'; + console.log(url); + var _ = $.getJSON(url, function (data) { + console.log(url + " downloaded successfully"); + _RootAlt = null; + _Root = data.Root; + _ImageZero = data.ImageZero; + _DataDirectory = data.DataDirectory; + console.log(url + " used successfully"); + }) + .done(function () { + loadData(); + _JsonTimer = setInterval(onTickJSON, _JsonInterval); + _ImageTimer = setInterval(onTickImage, _ImageInterval); + }) + .fail(function (er) { + console.log("error", er); + _Root = "../pictures"; + _DataDirectory = "../random"; + // _ImageZero = "images/img_tree.gif"; + // _ImageZero = "images/output-onlinepngtools.png"; + _ImageZero = "images/1x1_00000000.png"; // https://shoonia.github.io/1x1/#00000000 + }) + .always(function () { + console.log("complete"); + }); }); function onPause() { @@ -141,14 +164,9 @@ } } - function loadDevice() { - _Root = '../pictures'; - _RootAlt = null; - } - function loadData() { var isoString = new Date().toISOString(); - var url = '../random/' + isoString.substring(5, isoString.indexOf("T")) + '.json'; + var url = _DataDirectory + '/' + isoString.substring(5, isoString.indexOf("T")) + '.json'; console.log(url); var _ = $.getJSON(url, function (data) { console.log("success", data.length); @@ -162,9 +180,7 @@ }) .fail(function (er) { console.log("error", er); - //_Images = ['images/img_tree.gif']; - //_Images = ['images/output-onlinepngtools.png']; - _Images = ['images/1x1_00000000.png']; // https://shoonia.github.io/1x1/#00000000 + _Images = [_ImageZero]; }) .always(function () { console.log("complete"); @@ -187,9 +203,7 @@ if (_RootAlt !== null) { result = result + _RootAlt + _Images[_ImageIndex] + "'), url('"; } - //result = result + "images/img_tree.gif');"; - //result = result + "images/output-onlinepngtools.png');"; - result = result + "images/1x1_00000000.png');"; // https://shoonia.github.io/1x1/#00000000 + result = result + _ImageZero + "');"; return result; }