okay i finally turned my brain on and am almost done with reorder sections
This commit is contained in:
+25
-35
@@ -460,6 +460,7 @@
|
|||||||
shadowY: "0",
|
shadowY: "0",
|
||||||
shadowBlur: "0",
|
shadowBlur: "0",
|
||||||
shadowRgba: "rgba(255,255,255,.90)",
|
shadowRgba: "rgba(255,255,255,.90)",
|
||||||
|
zIndex: ""
|
||||||
};
|
};
|
||||||
|
|
||||||
let defaultImageContainerSettings = {
|
let defaultImageContainerSettings = {
|
||||||
@@ -470,6 +471,7 @@
|
|||||||
shadowY: "0",
|
shadowY: "0",
|
||||||
shadowBlur: "0",
|
shadowBlur: "0",
|
||||||
shadowRgba: "rgba(255,255,255,.90)",
|
shadowRgba: "rgba(255,255,255,.90)",
|
||||||
|
zIndex: ""
|
||||||
};
|
};
|
||||||
|
|
||||||
let wallpaper = "";
|
let wallpaper = "";
|
||||||
@@ -551,11 +553,13 @@
|
|||||||
else this.name = name;
|
else this.name = name;
|
||||||
|
|
||||||
this.id = findLowestAvailableId();
|
this.id = findLowestAvailableId();
|
||||||
zIndexMap.set(this.id, numberOfImageContainers + numberOfTextContainers);
|
|
||||||
|
|
||||||
this.imageUrl = imageUrl;
|
this.imageUrl = imageUrl;
|
||||||
|
|
||||||
// deep copy default settings
|
// deep copy default settings
|
||||||
this.containerSettings = JSON.parse(JSON.stringify(defaultImageContainerSettings));
|
this.containerSettings = JSON.parse(JSON.stringify(defaultImageContainerSettings));
|
||||||
|
|
||||||
|
zIndexMap.set(numberOfImageContainers + numberOfTextContainers, this.id);
|
||||||
|
this.containerSettings.zIndex = numberOfImageContainers + numberOfTextContainers;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.initializeImageContainer();
|
this.initializeImageContainer();
|
||||||
@@ -580,11 +584,13 @@
|
|||||||
else this.name = name;
|
else this.name = name;
|
||||||
|
|
||||||
this.id = findLowestAvailableId();
|
this.id = findLowestAvailableId();
|
||||||
zIndexMap.set(this.id, numberOfTextContainers + numberOfImageContainers);
|
this.sections = {};
|
||||||
|
|
||||||
// deep copy default settings
|
// deep copy default settings
|
||||||
this.containerSettings = JSON.parse(JSON.stringify(defaultTextContainerSettings));
|
this.containerSettings = JSON.parse(JSON.stringify(defaultTextContainerSettings));
|
||||||
this.sections = {};
|
|
||||||
|
zIndexMap.set(numberOfTextContainers + numberOfImageContainers, this.id);
|
||||||
|
this.containerSettings.zIndex = numberOfImageContainers + numberOfTextContainers;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.initializeTextContainer();
|
this.initializeTextContainer();
|
||||||
@@ -787,13 +793,12 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
createTextContainerMenuListing() {
|
createTextContainerMenuListing() {
|
||||||
let layerIndex = zIndexMap.get(this.id);
|
|
||||||
document.getElementById("containers").insertAdjacentHTML(
|
document.getElementById("containers").insertAdjacentHTML(
|
||||||
"beforeend",
|
"beforeend",
|
||||||
`
|
`
|
||||||
<div class="containerListing" id=${this.id + "-container-listing"}>
|
<div class="containerListing" id=${this.id + "-container-listing"}>
|
||||||
|
|
||||||
<p class="expandableMenuToggle active" onclick="toggleExpandableMenu(this)">[${layerIndex}]: ${this.name}</p>
|
<p class="expandableMenuToggle active" onclick="toggleExpandableMenu(this)">[${this.containerSettings.zIndex}]: ${this.name}</p>
|
||||||
<div class="expandableMenu" id=${this.id + "-settings-menu"} style="display: block;">
|
<div class="expandableMenu" id=${this.id + "-settings-menu"} style="display: block;">
|
||||||
|
|
||||||
<p class="expandableMenuToggle" onclick="toggleExpandableMenu(this)">+ ${this.name}: bookmarks</p>
|
<p class="expandableMenuToggle" onclick="toggleExpandableMenu(this)">+ ${this.name}: bookmarks</p>
|
||||||
@@ -954,7 +959,7 @@
|
|||||||
`
|
`
|
||||||
<div class="containerListing" id=${this.id + "-container-listing"}>
|
<div class="containerListing" id=${this.id + "-container-listing"}>
|
||||||
|
|
||||||
<p class="expandableMenuToggle active" onclick="toggleExpandableMenu(this)">[${zIndexMap.get(this.id)}]: ${this.name}</p>
|
<p class="expandableMenuToggle active" onclick="toggleExpandableMenu(this)">[${this.containerSettings.zIndex}]: ${this.name}</p>
|
||||||
<div class="expandableMenu" id=${this.id + "-settings-menu"} style="display: block;">
|
<div class="expandableMenu" id=${this.id + "-settings-menu"} style="display: block;">
|
||||||
|
|
||||||
<p class="expandableMenuToggle" onclick="toggleExpandableMenu(this)">+ ${this.name}: color + shape options</p>
|
<p class="expandableMenuToggle" onclick="toggleExpandableMenu(this)">+ ${this.name}: color + shape options</p>
|
||||||
@@ -1008,7 +1013,7 @@
|
|||||||
/** POSITION */
|
/** POSITION */
|
||||||
document.getElementById(this.id).style.top = this.y;
|
document.getElementById(this.id).style.top = this.y;
|
||||||
document.getElementById(this.id).style.left = this.x;
|
document.getElementById(this.id).style.left = this.x;
|
||||||
document.getElementById(this.id).style.zIndex = zIndexMap.get(this.id);
|
document.getElementById(this.id).style.zIndex = this.containerSettings.zIndex;
|
||||||
|
|
||||||
/** SIZE */
|
/** SIZE */
|
||||||
let containerSettings = this.containerSettings;
|
let containerSettings = this.containerSettings;
|
||||||
@@ -1826,44 +1831,29 @@
|
|||||||
function reorderContainer(buttonPressed, direction) {
|
function reorderContainer(buttonPressed, direction) {
|
||||||
let containerId = buttonPressed.id.split("--")[0];
|
let containerId = buttonPressed.id.split("--")[0];
|
||||||
let container = document.getElementById(containerId);
|
let container = document.getElementById(containerId);
|
||||||
let currentIndex = zindexmap.get(containerId);
|
let currentIndex = container.containerSettings.zIndex;
|
||||||
let tempContainer;
|
let copy = container;
|
||||||
let start;
|
|
||||||
|
|
||||||
// TODO if only using mapKeys for length, just sum the numberOf..Containers
|
|
||||||
let mapKeys = [];
|
|
||||||
zIndexMap.keys().forEach(key => {
|
|
||||||
mapKeys.push(key);
|
|
||||||
});
|
|
||||||
|
|
||||||
// move indicated container
|
// move indicated container
|
||||||
if (direction == "up") {
|
if (direction == "up") {
|
||||||
start = currentIndex + 1;
|
zIndexMap.set(currentIndex, zIndexMap.get(currentIndex + 1));
|
||||||
|
zIndexMap.set(currentIndex + 1, copy);
|
||||||
|
|
||||||
// TODO can't access with index dummy. gotta be id. figure out how to get the id of the necessary indices...
|
|
||||||
|
|
||||||
|
|
||||||
tempContainer = zIndexMap.get(// currentIndex + 1);
|
|
||||||
}
|
}
|
||||||
else if (direction == "down") {
|
else if (direction == "down") {
|
||||||
start = currentIndex - 1;
|
zIndexMap.set(currentIndex, zIndexMap.get(currentIndex - 1));
|
||||||
tempContainer = zIndexMap.get(// currentIndex - 1);
|
zIndexMap.set(currentIndex - 1, copy);
|
||||||
}
|
}
|
||||||
else if (direction == "top") {
|
else if (direction == "top") {
|
||||||
start = mapKeys.length;
|
zIndexMap.set(
|
||||||
tempContainer = zIndexMap.get(// mapKeys.length);
|
currentIndex, zIndexMap.get(numberOfImageContainers + numberOfTextContainers)
|
||||||
|
);
|
||||||
|
zIndexMap.set(numberOfImageContainers + numberOfTextContainers, copy);
|
||||||
}
|
}
|
||||||
else if (direction == "bottom") {
|
else if (direction == "bottom") {
|
||||||
start = 1;
|
zIndexMap.set(currentIndex, zIndexMap.get(1));
|
||||||
tempContainer = zIndexMap.get(// 1);
|
zIndexMap.set(1, copy);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (let i = start; i < mapKeys.length; i++) {
|
|
||||||
zIndexMap.set(containerDataMap(i).id, i);
|
|
||||||
document.getElementById(containerDataMap(i)).style.zIndex = i;
|
|
||||||
}
|
|
||||||
zindexMap.set(tempContainer, currentIndex);
|
|
||||||
// consider a redraw function for menu listings
|
// consider a redraw function for menu listings
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user