diff --git a/startpage.html b/startpage.html
index 9c01756..3f55bef 100644
--- a/startpage.html
+++ b/startpage.html
@@ -426,8 +426,9 @@
// cookie holder for coordinates + size of settings menu
let settingsMenuData = {};
- // cookie holder for coordinates + size of containers
+ // cookie holders for container data
let containerDataMap = new Map();
+ let zIndexMap = new Map();
// default values for easy resetting
let defaultTextContainerSettings = {
@@ -489,7 +490,6 @@
let numberOfTextContainers = 0;
let numberOfImageContainers = 0;
- let occupiedIndices = new Map();
let cursors = {};
@@ -500,7 +500,6 @@
y;
height;
width;
- zindex;
imageUrl;
containerSettings;
sections;
@@ -513,151 +512,80 @@
y,
height,
width,
- zindex,
imageUrl,
containerSettings,
- sections,
+ sections
) {
- // check if id is already used
- if (Object.keys(containerDataMap)
- .indexOf(name.replace(" ", "-").toLowerCase())
- != -1
- ) {
+ /* check if id is already used
+ if (containerDataMap.has(name.replace(" ", "-").toLowerCase())) {
alert("that name is already used, please use another");
return;
- }
+ }*/
// ensure there are no brackets in the name
- else if (name.indexOf("<") != -1 || name.indexOf(">") != -1) {
+ if (name.indexOf("<") != -1 || name.indexOf(">") != -1) {
alert("no brackets in the name please");
return;
}
- // if initializing saved bookmark container
- if (x != undefined && y != undefined && imageUrl == undefined) {
- numberOfTextContainers++;
+ let loadingFromSave = (x != undefined) && (y != undefined);
+ let isImage = (imageUrl != undefined);
- this.name = name;
- this.id = id;
- this.x = x;
- this.y = y;
- this.height = height;
- this.width = width;
- this.zindex = zindex;
- this.imageUrl = imageUrl;
- this.containerSettings = containerSettings;
- this.sections = sections;
-
- this.initializeTextContainer();
- this.createTextContainerMenuListing();
-
- this.loadBookmarks();
- this.loadBookmarkListings();
- }
-
- // if initializing saved image container
- else if (x != undefined && y != undefined && imageUrl != undefined) {
+ // if constructing image container
+ if (isImage) {
numberOfImageContainers++;
- this.name = name;
- this.id = id;
- this.x = x;
- this.y = y;
- this.height = height;
- this.width = width;
- this.zindex = zindex;
- this.imageUrl = imageUrl;
- this.containerSettings = containerSettings;
+ if (loadingFromSave) {
+ this.name = name;
+ this.id = id;
+ this.x = x;
+ this.y = y;
+ this.height = height;
+ this.width = width;
+ this.containerSettings = containerSettings;
+ this.imageUrl = imageUrl;
+ }
+ else {
+ if (name == "") this.name = "image " + numberOfImageContainers;
+ else this.name = name;
+
+ this.id = findLowestAvailableId();
+ this.imageUrl = imageUrl;
+ // deep copy default settings
+ this.containerSettings = JSON.parse(JSON.stringify(defaultImageContainerSettings));
+ }
this.initializeImageContainer();
this.createImageContainerMenuListing();
}
-
- // if intializing brand new bookmark container
- else if (imageUrl == undefined) {
- numberOfTextContainers++;
-
- /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- todo:
- remove the zindex stuff.
- get rid of the separation between text/image in terms of ID
- -> the function doesn't need params and should just get the index
-
- use the id index as the key in the data map for easier zindex manipulation
- make all default ids just "container-Z" regardless of type, no need to use the name in there at all
-
-
- then you can get rid of the index map too, you can just check the normal data map to see if the ID is used
-
- do you need to save the numberOfTexContainers/ImageContainers? or honestly probably not..
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- */
- if (name == "") {
- this.name = "bookmark layer " + numberOfTextContainers;
- this.id = findLowestAvailableId("text");
- }
- else {
- this.name = name;
- this.id = name.replace(" ", "-").toLowerCase();
- }
-
- // deep copy default settings
- this.containerSettings = JSON.parse(JSON.stringify(defaultTextContainerSettings));
- this.sections = {};
- this.zindex = numberOfTextContainers + numberOfImageContainers;
-
- this.initializeTextContainer();
- this.createTextContainerMenuListing();
-
- this.loadBookmarks();
- this.loadBookmarkListings();
- }
-
- // if initializing brand new image
+ // if constructing text container
else {
- numberOfImageContainers++;
- if (name == "") {
- this.name = "image " + numberOfImageContainers;
- this.id = findLowestAvailableId("image");
+ numberOfTextContainers++;
+
+ if (loadingFromSave) {
+ this.name = name;
+ this.id = id;
+ this.x = x;
+ this.y = y;
+ this.height = height;
+ this.width = width;
+ this.containerSettings = containerSettings;
+ this.sections = sections;
}
else {
- this.name = name;
- this.id = name.replace(" ", "-").toLowerCase();
+ if (name == "") this.name = "bookmark layer " + numberOfTextContainers;
+ else this.name = name;
+
+ this.id = findLowestAvailableId();
+ this.sections = {};
+ // deep copy default settings
+ this.containerSettings = JSON.parse(JSON.stringify(defaultTextContainerSettings));
}
- this.imageUrl = imageUrl;
- this.zindex = numberOfTextContainers + numberOfImageContainers;
+ this.initializeTextContainer();
+ this.createTextContainerMenuListing();
- this.initializeImageContainer();
- this.createImageContainerMenuListing();
+ this.loadBookmarks();
+ this.loadBookmarkListings();
}
this.applySettings();
@@ -667,28 +595,26 @@
// and save
containerDataMap.set(this.id, this);
+ zIndexMap.set(this.id, numberOfImageContainers + numberOfTextContainers);
}
+
/**
* creates image element and lets
* loadBookmarks() and applySettings() do the rest
*/
initializeImageContainer() {
- // deep copy default settings
- this.containerSettings = JSON.parse(JSON.stringify(defaultImageContainerSettings));
-
+
document.body.insertAdjacentHTML(
"beforeend",
`
-
-
-