From 62fc655fd233e34d5944cbb3fae6261b8d8a134a Mon Sep 17 00:00:00 2001
From: Sam Keddy <sam@samkeddy.com>
Date: Fri, 11 Sep 2020 19:48:55 +0000
Subject: [PATCH] bug fixes

---
 js/_history.js | 14 +++++++-------
 js/_layer.js   | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/js/_history.js b/js/_history.js
index 75ab81b..f1dad5c 100644
--- a/js/_history.js
+++ b/js/_history.js
@@ -175,7 +175,7 @@ function HistoryStateMoveTwoLayers(layer, oldIndex, newIndex) {
     saveHistoryState(this);
 }
 
-function HistoryStateMoveLayer(afterToDrop, toDrop, static, nMoved) {
+function HistoryStateMoveLayer(afterToDrop, toDrop, staticc, nMoved) {
     this.beforeToDrop = afterToDrop;
     this.toDrop = toDrop;
 
@@ -197,7 +197,7 @@ function HistoryStateMoveLayer(afterToDrop, toDrop, static, nMoved) {
     };
 
     this.redo = function() {
-        moveLayers(toDrop.menuEntry.id, static.menuEntry.id, true);
+        moveLayers(toDrop.menuEntry.id, staticc.menuEntry.id, true);
         undoStates.push(this);
     };
 
@@ -378,7 +378,7 @@ function undo () {
     if (undoStates.length > 0) {
         document.getElementById('redo-button').classList.remove('disabled');
 
-        //get state 
+        //get state
         var undoState = undoStates[undoStates.length-1];
         //console.log(undoState);
 
@@ -387,9 +387,9 @@ function undo () {
 
         //restore the state
         undoState.undo();
-        
+
         //if theres none left to undo, disable the option
-        if (undoStates.length == 0) 
+        if (undoStates.length == 0)
             document.getElementById('undo-button').classList.add('disabled');
     }
 }
@@ -402,7 +402,7 @@ function redo () {
         //enable undo button
         document.getElementById('undo-button').classList.remove('disabled');
 
-        //get state 
+        //get state
         var redoState = redoStates[redoStates.length-1];
 
         //remove from redo array (do this before restoring the state, else the flatten state will break)
@@ -412,7 +412,7 @@ function redo () {
         redoState.redo();
 
         //if theres none left to redo, disable the option
-        if (redoStates.length == 0) 
+        if (redoStates.length == 0)
             document.getElementById('redo-button').classList.add('disabled');
     }
     //console.log(undoStates);
diff --git a/js/_layer.js b/js/_layer.js
index 66f47d1..9ae86c3 100644
--- a/js/_layer.js
+++ b/js/_layer.js
@@ -452,7 +452,7 @@ function renameLayer(event) {
 // Swaps two layer entries in the layer menu
 function moveLayers(toDropLayer, staticLayer, saveHistory = true) {
     let toDrop = getLayerByID(toDropLayer);
-    let static = getLayerByID(staticLayer);
+    let staticc = getLayerByID(staticLayer);
     let layerCopy = layers.slice();
 
     let beforeToDrop = toDrop.menuEntry.nextElementSibling;
@@ -461,9 +461,9 @@ function moveLayers(toDropLayer, staticLayer, saveHistory = true) {
     layerCopy.sort((a, b) => (a.canvas.style.zIndex > b.canvas.style.zIndex) ? 1 : -1);
 
     let toDropIndex = layerCopy.indexOf(toDrop);
-    let staticIndex = layerCopy.indexOf(static);
+    let staticIndex = layerCopy.indexOf(staticc);
 
-    layerList.insertBefore(toDrop.menuEntry, static.menuEntry);
+    layerList.insertBefore(toDrop.menuEntry, staticc.menuEntry);
 
     if (toDropIndex < staticIndex) {
         let tmp = toDrop.canvas.style.zIndex;
@@ -488,7 +488,7 @@ function moveLayers(toDropLayer, staticLayer, saveHistory = true) {
         toDrop.canvas.style.zIndex = tmp;
 
         if (saveHistory) {
-            new HistoryStateMoveLayer(beforeToDrop, toDrop, static, nMoved);
+            new HistoryStateMoveLayer(beforeToDrop, toDrop, staticc, nMoved);
         }
     }
     else {
@@ -515,7 +515,7 @@ function moveLayers(toDropLayer, staticLayer, saveHistory = true) {
         toDrop.canvas.style.zIndex = tmp;
 
         if (saveHistory) {
-            new HistoryStateMoveLayer(beforeToDrop, toDrop, static, nMoved);
+            new HistoryStateMoveLayer(beforeToDrop, toDrop, staticc, nMoved);
         }
 
     }