Skip to content
Snippets Groups Projects
Commit f8399b5f authored by DCoded's avatar DCoded
Browse files

More cleanup

parent 858bd938
No related branches found
No related tags found
1 merge request!10654Farmyard code cleanup
......@@ -315,7 +315,7 @@ App.Facilities.Farmyard.animals = function() {
const frag = new DocumentFragment();
const dickDiv = document.createElement("div");
const deadlinessDiv = document.createElement("div");
const addDiv = App.UI.DOM.makeElement("div", null, ['animal-add']);
const addDiv = App.UI.DOM.makeElement("div", null, ['margin-top']);
const animal = new App.Entity.Animal(null, null, "canine", "domestic");
......@@ -335,41 +335,41 @@ App.Facilities.Farmyard.animals = function() {
return frag;
function name() {
const nameDiv = document.createElement("div");
const div = document.createElement("div");
nameDiv.append(
div.append(
`Name: `,
App.UI.DOM.makeTextBox(animal.name || '', value => {
animal.setName(value);
App.UI.DOM.replace(nameDiv, name);
App.UI.DOM.replace(div, name());
App.UI.DOM.replace(dickDiv, dick);
App.UI.DOM.replace(deadlinessDiv, deadliness);
App.UI.DOM.replace(addDiv, add);
App.UI.DOM.replace(addDiv, add());
}),
);
return nameDiv;
return div;
}
function species() {
const speciesDiv = document.createElement("div");
const div = document.createElement("div");
speciesDiv.append(
div.append(
`Species: `,
App.UI.DOM.makeTextBox(animal.species || '', value => {
animal.setSpecies(value);
App.UI.DOM.replace(speciesDiv, species);
App.UI.DOM.replace(addDiv, add);
App.UI.DOM.replace(div, species());
App.UI.DOM.replace(addDiv, add());
}),
);
return speciesDiv;
return div;
}
function type() {
const typeDiv = document.createElement("div");
const div = document.createElement("div");
const typeLinks = [];
......@@ -379,12 +379,12 @@ App.Facilities.Farmyard.animals = function() {
App.UI.DOM.link(`Hooved`, () => {
animal.setType('hooved');
App.UI.DOM.replace(typeDiv, type);
App.UI.DOM.replace(div, type());
}),
App.UI.DOM.link(`Feline`, () => {
animal.setType("feline");
App.UI.DOM.replace(typeDiv, type);
App.UI.DOM.replace(div, type());
}),
);
} else if (animal.type === "hooved") {
......@@ -392,13 +392,13 @@ App.Facilities.Farmyard.animals = function() {
App.UI.DOM.link(`Canine`, () => {
animal.setType("canine");
App.UI.DOM.replace(typeDiv, type);
App.UI.DOM.replace(div, type());
}),
App.UI.DOM.disabledLink(`Hooved`, [`Already selected.`]),
App.UI.DOM.link(`Feline`, () => {
animal.setType("feline");
App.UI.DOM.replace(typeDiv, type);
App.UI.DOM.replace(div, type());
}),
);
} else {
......@@ -406,24 +406,24 @@ App.Facilities.Farmyard.animals = function() {
App.UI.DOM.link(`Canine`, () => {
animal.setType("canine");
App.UI.DOM.replace(typeDiv, type);
App.UI.DOM.replace(div, type());
}),
App.UI.DOM.link(`Hooved`, () => {
animal.setType("hooved");
App.UI.DOM.replace(typeDiv, type);
App.UI.DOM.replace(div, type());
}),
App.UI.DOM.disabledLink(`Feline`, [`Already selected.`]),
);
}
typeDiv.append(`Type: `, App.UI.DOM.generateLinksStrip(typeLinks));
div.append(`Type: `, App.UI.DOM.generateLinksStrip(typeLinks));
return typeDiv;
return div;
}
function rarity() {
const rarityDiv = document.createElement("div");
const div = document.createElement("div");
const rarityLinks = [];
......@@ -433,7 +433,7 @@ App.Facilities.Farmyard.animals = function() {
App.UI.DOM.link(`Exotic`, () => {
animal.setRarity('exotic');
App.UI.DOM.replace(rarityDiv, rarity);
App.UI.DOM.replace(div, rarity());
}),
);
} else {
......@@ -441,19 +441,19 @@ App.Facilities.Farmyard.animals = function() {
App.UI.DOM.link(`Domestic`, () => {
animal.setRarity('domestic');
App.UI.DOM.replace(rarityDiv, rarity);
App.UI.DOM.replace(div, rarity());
}),
App.UI.DOM.disabledLink(`Exotic`, [`Already selected.`]),
);
}
rarityDiv.append(`Rarity: `, App.UI.DOM.generateLinksStrip(rarityLinks));
div.append(`Rarity: `, App.UI.DOM.generateLinksStrip(rarityLinks));
return rarityDiv;
return div;
}
function article() {
const articleDiv = document.createElement("div");
const div = document.createElement("div");
const articleLinks = [];
......@@ -462,7 +462,7 @@ App.Facilities.Farmyard.animals = function() {
App.UI.DOM.link("Yes", () => {
animal.articleAn = 'an';
App.UI.DOM.replace(articleDiv, article);
App.UI.DOM.replace(div, article());
App.UI.DOM.replace(dickDiv, dick);
App.UI.DOM.replace(deadlinessDiv, deadliness);
}),
......@@ -474,16 +474,16 @@ App.Facilities.Farmyard.animals = function() {
App.UI.DOM.link("No", () => {
animal.articleAn = 'a';
App.UI.DOM.replace(articleDiv, article);
App.UI.DOM.replace(div, article());
App.UI.DOM.replace(dickDiv, dick);
App.UI.DOM.replace(deadlinessDiv, deadliness);
}),
);
}
articleDiv.append(`Is this animal's name preceded by an 'an'? `, App.UI.DOM.generateLinksStrip(articleLinks));
div.append(`Is this animal's name preceded by an 'an'? `, App.UI.DOM.generateLinksStrip(articleLinks));
return articleDiv;
return div;
}
function dick() {
......@@ -555,7 +555,7 @@ App.Facilities.Farmyard.animals = function() {
link = App.UI.DOM.link(`Add`, () => {
App.Data.animals.push(animal);
App.UI.DOM.replace(frag, addAnimal());
App.UI.DOM.replace(addDiv, addAnimal());
});
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment