From d326191359a91351a41c03f22b40fea87473ee55 Mon Sep 17 00:00:00 2001 From: Matthew Grove Date: Wed, 5 Dec 2018 12:00:06 +0000 Subject: [PATCH] Fix JS error --- computer-science-blog/scripts/home.js | 6 ----- computer-science-blog/scripts/scripts.js | 10 +++++--- computer-science-blog/scripts/scripts.js~ | 31 +++++++++++++++++++++++ 3 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 computer-science-blog/scripts/scripts.js~ diff --git a/computer-science-blog/scripts/home.js b/computer-science-blog/scripts/home.js index c28adb3..e69de29 100644 --- a/computer-science-blog/scripts/home.js +++ b/computer-science-blog/scripts/home.js @@ -1,6 +0,0 @@ -$(document).ready(function(){ - // include navbar - $(".blog-insert").load("pages/blog.html", function(){ - - }); -}); diff --git a/computer-science-blog/scripts/scripts.js b/computer-science-blog/scripts/scripts.js index 85494be..7d4547f 100644 --- a/computer-science-blog/scripts/scripts.js +++ b/computer-science-blog/scripts/scripts.js @@ -1,6 +1,5 @@ // set page title window.page_title = "Computer Science Blog | Matthew Grove"; - window.onload = function() { // set the current date var date = new Date(); @@ -12,7 +11,12 @@ window.onload = function() { var current_date = day + "-" + (date.getMonth() + 1) + "-" + date.getFullYear(); // display date - document.getElementById("current_date").innerHTML = current_date; + $("#current_date").html(current_date); + + // include navbar + $(".blog-insert").load("pages/blog.html", function(){ + + }); } function nextPage() { @@ -28,4 +32,4 @@ function displayPage(page) { } var pages = ["page_01", "page_02", "page_03"]; -var pageIndex = 0; \ No newline at end of file +var pageIndex = 0; diff --git a/computer-science-blog/scripts/scripts.js~ b/computer-science-blog/scripts/scripts.js~ new file mode 100644 index 0000000..85494be --- /dev/null +++ b/computer-science-blog/scripts/scripts.js~ @@ -0,0 +1,31 @@ +// set page title +window.page_title = "Computer Science Blog | Matthew Grove"; + +window.onload = function() { + // set the current date + var date = new Date(); + + // ternary operator: if the date < 10 then add 0 to the start of it, else display the date + var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate(); + + // set current date + var current_date = day + "-" + (date.getMonth() + 1) + "-" + date.getFullYear(); + + // display date + document.getElementById("current_date").innerHTML = current_date; +} + +function nextPage() { + displayPage(pages[0]); +} + +function previousPage() { + +} + +function displayPage(page) { + document.getElementById("iframe").src = "pages/" + page + ".html"; +} + +var pages = ["page_01", "page_02", "page_03"]; +var pageIndex = 0; \ No newline at end of file