From a6c5fdb044d42cec416cd34ff7e8120ba8506932 Mon Sep 17 00:00:00 2001
From: Neil Brommer <neil@neilbrommer.com>
Date: Fri, 29 Dec 2017 20:51:47 -0800
Subject: [PATCH] Restructure edit toggling code

---
 js/editBookmarks.js | 118 +++++++++++++++++++++++---------------------
 1 file changed, 62 insertions(+), 56 deletions(-)

diff --git a/js/editBookmarks.js b/js/editBookmarks.js
index ec99208..cb7e2d1 100644
--- a/js/editBookmarks.js
+++ b/js/editBookmarks.js
@@ -3,62 +3,10 @@ $(document).ready(function () {
 });
 
 function toggleEditing (e) {
-	var btnEdit = $("#btnEdit");
-	if (btnEdit.hasClass("btn-warning")) {
-		$(".bookmarkGroup").each(function (index) {
-			$(this).sortable("destroy");
-		});
-		$("#cardList").sortable("destroy");
-
-		btnEdit.removeClass("btn-warning");
-		$("#btnImport").prop("disabled", false);
-		$("#btnAdd").prop("disabled", false);
-
-		if ($("#btnAbout").hasClass("btn-light")) {
-			btnEdit.addClass("btn-light");
-		} else {
-			btnEdit.addClass("btn-dark");
-		}
-
-		$(".btnDel").hide(200);
-		$(".btnDelGroup").hide(200);
-		$(".dragHandle").hide(200);
-		$(".dragGroupHandle").hide(200);
-		$(".bookmark").off("click", disableLink);
-		$(".btnDel").off("click", deleteBookmark);
-		$(".btnDelGroup").off("click", deleteGroup);
-	} else {
-		btnEdit.removeClass("btn-light btn-dark").addClass("btn-warning");
-		$("#btnImport").prop("disabled", true);
-		$("#btnAdd").prop("disabled", true);
-
-		$(".bookmarkGroup").each(function (index) {
-			var item = $(this);
-			item.sortable({
-				group: { name: "bookmarkLists", pull: true, put: true },
-				draggable: ".bookmark",
-				handle: ".dragHandle",
-				animation: 100,
-				onEnd: bookmarkMoved
-			});
-		});
-
-		$("#cardList").sortable({
-			group: { name: "bookmarksGroups" },
-			draggable: ".bookmarkGroupContainer",
-			handle: ".dragGroupHandle",
-			animation: 100,
-			onEnd: groupMoved
-		});
-
-		$(".btnDel").show(200);
-		$(".btnDelGroup").show(200);
-		$(".dragHandle").show(200);
-		$(".dragGroupHandle").show(200);
-		$(".bookmark").click(disableLink);
-		$(".btnDel").click(deleteBookmark);
-		$(".btnDelGroup").click(deleteGroup);
-	}
+	if ($("#btnEdit").hasClass("btn-warning"))
+		disableEditing();
+	else
+		enableEditing();
 }
 
 function groupMoved(dropEvt) {
@@ -232,6 +180,64 @@ function deleteGroup(e) {
 	}
 }
 
+function enableEditing() {
+	$("#btnEdit").removeClass("btn-light btn-dark").addClass("btn-warning");
+	$("#btnImport").prop("disabled", true);
+	$("#btnAdd").prop("disabled", true);
+
+	$(".bookmarkGroup").each(function (index) {
+		var item = $(this);
+		item.sortable({
+			group: { name: "bookmarkLists", pull: true, put: true },
+			draggable: ".bookmark",
+			handle: ".dragHandle",
+			animation: 100,
+			onEnd: bookmarkMoved
+		});
+	});
+
+	$("#cardList").sortable({
+		group: { name: "bookmarksGroups" },
+		draggable: ".bookmarkGroupContainer",
+		handle: ".dragGroupHandle",
+		animation: 100,
+		onEnd: groupMoved
+	});
+
+	$(".btnDel").show(200);
+	$(".btnDelGroup").show(200);
+	$(".dragHandle").show(200);
+	$(".dragGroupHandle").show(200);
+	$(".bookmark").click(disableLink);
+	$(".btnDel").click(deleteBookmark);
+	$(".btnDelGroup").click(deleteGroup);
+}
+
+function disableEditing() {
+	$(".bookmarkGroup").each(function (index) {
+		$(this).sortable("destroy");
+	});
+	$("#cardList").sortable("destroy");
+
+	$("#btnEdit").removeClass("btn-warning");
+	$("#btnImport").prop("disabled", false);
+	$("#btnAdd").prop("disabled", false);
+
+	if ($("#btnAbout").hasClass("btn-light")) {
+		$("#btnEdit").addClass("btn-light");
+	} else {
+		$("#btnEdit").addClass("btn-dark");
+	}
+
+	$(".btnDel").hide(200);
+	$(".btnDelGroup").hide(200);
+	$(".dragHandle").hide(200);
+	$(".dragGroupHandle").hide(200);
+	$(".bookmark").off("click", disableLink);
+	$(".btnDel").off("click", deleteBookmark);
+	$(".btnDelGroup").off("click", deleteGroup);
+}
+
 function removeFromArray(arr, index) {
 	var newArr = [];
 	for (var i = 0; i < arr.length; i++) {