From 44444595d361ffa130319318610a356d88f9f748 Mon Sep 17 00:00:00 2001 From: Jiiks Date: Thu, 3 Dec 2015 16:29:14 +0200 Subject: [PATCH] HTML Loader and changelog base --- html/changelog.html | 44 ++++++++++++++++++++++++++++++++++++++++++++ js/main.js | 18 ++++++++++++++++-- lib/BetterDiscord.js | 3 +++ 3 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 html/changelog.html diff --git a/html/changelog.html b/html/changelog.html new file mode 100644 index 0000000..8611277 --- /dev/null +++ b/html/changelog.html @@ -0,0 +1,44 @@ + diff --git a/js/main.js b/js/main.js index 984645f..243e4c2 100644 --- a/js/main.js +++ b/js/main.js @@ -273,9 +273,11 @@ Core.prototype.constructChangelog = function() { //Changelog dialog Core.prototype.displayChangelog = function() { + + utils.loadHtml("changelog"); + if(settingsCookie["version"] < jsVersion) { - var cl = self.constructChangelog(); - $("body").append(cl); + settingsCookie["version"] = jsVersion; self.saveSettings(); } @@ -1073,6 +1075,18 @@ Utils.prototype.getHash = function() { }; +Utils.prototype.loadHtml = function(html) { + var container = $("
", { class: "bd-container" }).appendTo("body"); + + if(_local) { + html = _localServer + "/BetterDiscordApp/html/" + html + ".html"; + } else { + html = '//' + _updater.CDN + '/Jiiks/BetterDiscordApp/' + _hash + '/html/' + html + '.html'; + } + + container.load(html); +}; + /* BetterDiscordApp VoiceMode JavaScript * Version: 1.0 * Author: Jiiks | http://jiiks.net diff --git a/lib/BetterDiscord.js b/lib/BetterDiscord.js index 9f65cb3..52a2187 100644 --- a/lib/BetterDiscord.js +++ b/lib/BetterDiscord.js @@ -177,6 +177,9 @@ BetterDiscord.prototype.init = function() { self.getUtils().log("Latest Versions: " + _updater.LatestVersion); self.getUtils().log("Using CDN: " + _updater.CDN); self.getUtils().log("Starting up"); + self.getUtils().execJs("var _updater = " + _updater + ";"); + self.getUtils().execJs("var _local = " + _local + ";"); + self.getUtils().execJs("var _localServer = \"" + _localServer + "\";"); self.start(); });