diff --git a/debugging/book-library/index.html b/debugging/book-library/index.html
index 23acfa71..195daeb1 100644
--- a/debugging/book-library/index.html
+++ b/debugging/book-library/index.html
@@ -1,20 +1,17 @@
-
+
-
-
+ Library
+
+
-
+ >
+
@@ -31,42 +28,42 @@ Library
+ >
-
+ >
+
+ >
+ >
@@ -93,4 +90,4 @@ Library
-
+
\ No newline at end of file
diff --git a/debugging/book-library/script.js b/debugging/book-library/script.js
index 75ce6c1d..24dea707 100644
--- a/debugging/book-library/script.js
+++ b/debugging/book-library/script.js
@@ -2,16 +2,15 @@ let myLibrary = [];
window.addEventListener("load", function (e) {
populateStorage();
- render();
});
function populateStorage() {
if (myLibrary.length == 0) {
- let book1 = new Book("Robison Crusoe", "Daniel Defoe", "252", true);
+ let book1 = new Book("Robison Crusoe", "Daniel Defoe", 252, true);
let book2 = new Book(
"The Old Man and the Sea",
"Ernest Hemingway",
- "127",
+ 127,
true
);
myLibrary.push(book1);
@@ -20,25 +19,42 @@ function populateStorage() {
}
}
-const title = document.getElementById("title");
-const author = document.getElementById("author");
-const pages = document.getElementById("pages");
-const check = document.getElementById("check");
+const bookTitleInput = document.getElementById("title");
+const bookAuthorInput = document.getElementById("author");
+const bookNumberOfPagesInput = document.getElementById("pages");
+const isBookReadCheckBox = document.getElementById("check");
+
+// To check if pages input can be safely converted to integer
+function isValidInteger(input) {
+ return Number.isInteger(input);
+}
+// prevent accidental hexadecimal input
+function isHexadecimal(input) {
+ return /^0x[0-9a-fA-F]+$/.test(input);
+}
//check the right input from forms and if its ok -> add the new book (object in array)
//via Book function and start render function
function submit() {
- if (
- title.value == null ||
- title.value == "" ||
- pages.value == null ||
- pages.value == ""
+ const bookTitle = bookTitleInput.value.trim();
+ const bookAuthor = bookAuthorInput.value.trim();
+ const bookNumberOfPages = bookNumberOfPagesInput.value.trim();
+ const isBookRead = isBookReadCheckBox.checked;
+ if ( bookTitle == "" || bookAuthor == "" || bookNumberOfPages == "" ) {
+ alert("Please fill all fields with correct input!");
+ return false;
+ } else if (
+ !isValidInteger(Number(bookNumberOfPages)) ||
+ // if input hexadecimal (true) it will ask user to type correct number of pages format
+ isHexadecimal(bookNumberOfPages) ||
+ Number(bookNumberOfPages) <= 0
) {
- alert("Please fill all fields!");
+ alert("Invalid number of pages format!");
return false;
- } else {
- let book = new Book(title.value, title.value, pages.value, check.checked);
- library.push(book);
+ } else {
+ const bookNumberOfPagesInt = parseInt(bookNumberOfPagesInput.value.trim(), 10);
+ let book = new Book(bookTitle, bookAuthor, bookNumberOfPagesInt, isBookRead);
+ myLibrary.push(book);
render();
}
}
@@ -52,51 +68,42 @@ function Book(title, author, pages, check) {
function render() {
let table = document.getElementById("display");
- let rowsNumber = table.rows.length;
- //delete old table
- for (let n = rowsNumber - 1; n > 0; n-- {
- table.deleteRow(n);
- }
+ let tableBody = table.querySelector("tbody");
+ tableBody.innerHTML = '';
//insert updated row and cells
let length = myLibrary.length;
for (let i = 0; i < length; i++) {
- let row = table.insertRow(1);
+ let row = tableBody.insertRow();
let titleCell = row.insertCell(0);
let authorCell = row.insertCell(1);
let pagesCell = row.insertCell(2);
let wasReadCell = row.insertCell(3);
let deleteCell = row.insertCell(4);
- titleCell.innerHTML = myLibrary[i].title;
- authorCell.innerHTML = myLibrary[i].author;
- pagesCell.innerHTML = myLibrary[i].pages;
+ titleCell.textContent = myLibrary[i].title;
+ authorCell.textContent = myLibrary[i].author;
+ pagesCell.textContent = myLibrary[i].pages;
//add and wait for action for read/unread button
- let changeBut = document.createElement("button");
- changeBut.id = i;
- changeBut.className = "btn btn-success";
- wasReadCell.appendChild(changeBut);
+ let changeReadStatusButton = document.createElement("button");
+ changeReadStatusButton.className = "btn btn-success";
+ wasReadCell.appendChild(changeReadStatusButton);
let readStatus = "";
- if (myLibrary[i].check == false) {
- readStatus = "Yes";
- } else {
- readStatus = "No";
- }
- changeBut.innerText = readStatus;
+ readStatus = !myLibrary[i].check ? "No" : "Yes";
+ changeReadStatusButton.innerText = readStatus;
- changeBut.addEventListener("click", function () {
+ changeReadStatusButton.addEventListener("click", function () {
myLibrary[i].check = !myLibrary[i].check;
render();
});
//add delete button to every row and render again
- let delButton = document.createElement("button");
- delBut.id = i + 5;
- deleteCell.appendChild(delBut);
- delBut.className = "btn btn-warning";
- delBut.innerHTML = "Delete";
- delBut.addEventListener("clicks", function () {
- alert(`You've deleted title: ${myLibrary[i].title}`);
+ let deleteBookButton = document.createElement("button");
+ deleteCell.appendChild(deleteBookButton);
+ deleteBookButton.className = "btn btn-warning";
+ deleteBookButton.innerHTML = "Delete";
+ deleteBookButton.addEventListener("click", function () {
myLibrary.splice(i, 1);
+ alert(`You've deleted title: ${myLibrary[i].title}`);
render();
});
}