From 36e3225e2b6052d9ee564cbba8463387906fb4a2 Mon Sep 17 00:00:00 2001 From: William Toohey Date: Sat, 3 Oct 2015 12:11:39 +1000 Subject: [PATCH] Add preloader customisation --- js/HuesCore.js | 7 +++++-- js/HuesSettings.js | 9 ++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/js/HuesCore.js b/js/HuesCore.js index 7d54872..ef1c979 100644 --- a/js/HuesCore.js +++ b/js/HuesCore.js @@ -61,6 +61,8 @@ HuesCore = function(defaults) { this.uiArray.push(new RetroUI(), new WeedUI(), new ModernUI(), new XmasUI()); this.settings.connectCore(this); + // Update with merged + defaults = this.settings.defaults; this.setColour(this.colourIndex); if(defaults.load) { @@ -79,8 +81,9 @@ HuesCore = function(defaults) { } }, function(progress) { var prog = document.getElementById("preMain"); - var scale = Math.floor(progress * 0x40); - prog.textContent = '0x' + ("00"+scale.toString(16)).slice(-2); + var scale = Math.floor(progress * defaults.preloadMax); + var padding = defaults.preloadMax.toString(defaults.preloadBase).length; + prog.textContent = defaults.preloadPrefix + (Array(padding).join("0")+scale.toString(defaults.preloadBase)).slice(-padding); }); } else { document.getElementById("preloadHelper").style.display = "none"; diff --git a/js/HuesSettings.js b/js/HuesSettings.js index b6771d0..8355351 100644 --- a/js/HuesSettings.js +++ b/js/HuesSettings.js @@ -31,6 +31,10 @@ HuesSettings.prototype.defaultSettings = { firstSong: null, // If set, will disable the remote resources menu. For custom pages. disableRemoteResources: false, + // Preloader customisation + preloadPrefix: "0x", + preloadBase: 16, + preloadMax: 0x40, // UI accessible config // Autosong stuff is a todo, becuase why even implement that @@ -52,7 +56,10 @@ HuesSettings.prototype.ephemeralSettings = [ "overwriteLocal", "respacks", "firstSong", - "disableRemoteResources" + "disableRemoteResources", + "preloadPrefix", + "preloadBase", + "preloadMax" ]; // To dynamically build the UI like the cool guy I am