From 7609f20dd02f305d2404994b7a5dbd1957851a6e Mon Sep 17 00:00:00 2001
From: Ethan Dalool <git@voussoir.net>
Date: Fri, 7 Aug 2020 21:14:27 -0700
Subject: [PATCH] Let button_with_confirm inherit original CSS when not
 specified.

---
 frontends/etiquette_flask/static/js/common.js      | 14 ++++++++++++--
 frontends/etiquette_flask/templates/album.html     |  4 ----
 frontends/etiquette_flask/templates/bookmarks.html |  1 -
 frontends/etiquette_flask/templates/photo.html     |  2 --
 frontends/etiquette_flask/templates/tags.html      |  1 -
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/frontends/etiquette_flask/static/js/common.js b/frontends/etiquette_flask/static/js/common.js
index 00ce0ab..521e72b 100644
--- a/frontends/etiquette_flask/static/js/common.js
+++ b/frontends/etiquette_flask/static/js/common.js
@@ -195,7 +195,9 @@ function init_button_with_confirm()
 
         data-confirm: Text inside the confirm button. Default is to inherit the
             original button's text.
-        data-confirm-class
+        data-confirm-class: CSS class for the confirm button. Default is to
+            inheret all classes of the original button, except for
+            "button_with_confirm" of course.
 
         data-cancel: Text inside the cancel button. Default is "Cancel".
         data-cancel-class
@@ -244,7 +246,15 @@ function init_button_with_confirm()
 
         var button_confirm = document.createElement("button");
         button_confirm.innerText = (button.dataset.confirm || button.innerText).trim();
-        button_confirm.className = button.dataset.confirmClass || "";
+        if (button.dataset.confirmClass === undefined)
+        {
+            button_confirm.className = button.className;
+            button_confirm.classList.remove("button_with_confirm");
+        }
+        else
+        {
+            button_confirm.className = button.dataset.confirmClass;
+        }
         button_confirm.input_source = input_source;
         holder_stage2.appendChild(button_confirm);
         holder_stage2.appendChild(document.createTextNode(" "));
diff --git a/frontends/etiquette_flask/templates/album.html b/frontends/etiquette_flask/templates/album.html
index a061198..8bdf247 100644
--- a/frontends/etiquette_flask/templates/album.html
+++ b/frontends/etiquette_flask/templates/album.html
@@ -127,7 +127,6 @@ h2, h3
         class="green_button button_with_confirm"
         data-is-input="1"
         data-prompt="Album title"
-        data-confirm-class="green_button"
         data-cancel-class="gray_button"
         data-onclick="create_child(event.target.input_source.value);"
         >
@@ -181,7 +180,6 @@ ALBUM_ID = undefined;
         class="red_button button_with_confirm"
         data-onclick="api.albums.delete(ALBUM_ID, api.albums.callback_go_to_albums)"
         data-prompt="Delete Album?"
-        data-confirm-class="red_button"
         data-cancel-class="gray_button"
         >
             Delete
@@ -191,7 +189,6 @@ ALBUM_ID = undefined;
         class="green_button button_with_confirm"
         data-is-input="1"
         data-prompt="Album title"
-        data-confirm-class="green_button"
         data-cancel-class="gray_button"
         data-onclick="create_child(event.target.input_source.value);"
         >
@@ -202,7 +199,6 @@ ALBUM_ID = undefined;
         class="green_button button_with_confirm"
         data-is-input="1"
         data-prompt="Child ID"
-        data-confirm-class="green_button"
         data-cancel-class="gray_button"
         data-onclick="add_child(event.target.input_source.value);"
         >
diff --git a/frontends/etiquette_flask/templates/bookmarks.html b/frontends/etiquette_flask/templates/bookmarks.html
index 4a242cd..06c739e 100644
--- a/frontends/etiquette_flask/templates/bookmarks.html
+++ b/frontends/etiquette_flask/templates/bookmarks.html
@@ -79,7 +79,6 @@
                 class="red_button button_with_confirm"
                 data-onclick="api.bookmarks.delete('{{bookmark.id}}', common.refresh)"
                 data-prompt="Delete Bookmark?"
-                data-confirm-class="red_button"
                 data-cancel-class="gray_button"
                 >
                     Delete
diff --git a/frontends/etiquette_flask/templates/photo.html b/frontends/etiquette_flask/templates/photo.html
index e525cd4..91cb880 100644
--- a/frontends/etiquette_flask/templates/photo.html
+++ b/frontends/etiquette_flask/templates/photo.html
@@ -250,7 +250,6 @@
         class="red_button button_with_confirm"
         data-onclick="api.photos.delete(PHOTO_ID, false, api.photos.callback_go_to_search)"
         data-prompt="Delete photo, keep file?"
-        data-confirm-class="red_button"
         data-cancel-class="gray_button"
         >
             Remove
@@ -260,7 +259,6 @@
         class="red_button button_with_confirm"
         data-onclick="api.photos.delete(PHOTO_ID, true, api.photos.callback_go_to_search)"
         data-prompt="Delete file on disk?"
-        data-confirm-class="red_button"
         data-cancel-class="gray_button"
         >
             Delete
diff --git a/frontends/etiquette_flask/templates/tags.html b/frontends/etiquette_flask/templates/tags.html
index 4581a0a..dec7d15 100644
--- a/frontends/etiquette_flask/templates/tags.html
+++ b/frontends/etiquette_flask/templates/tags.html
@@ -132,7 +132,6 @@ h2, h3
             data-onclick="api.tags.delete('{{specific_tag.name}}', api.tags.callback_go_to_tags);"
             data-prompt="Delete Tag?"
             data-confirm="Delete"
-            data-confirm-class="red_button"
             data-cancel-class="gray_button"
             >
             Delete