Merge pull request #138 from lowercasename/rk/style-overhaul

Style overhaul

3 files changed, 18 insertions, 44 deletions

diff --git a/public/js/modules/event-edit.js b/public/js/modules/event-edit.js
index 736547f..6d2c216 100644
--- a/public/js/modules/event-edit.js
+++ b/public/js/modules/event-edit.js
@@ -7,7 +7,6 @@ $(document).ready(function () {
         label_selected: "Change file",
         no_label: false,
     });
-    autosize($("textarea"));
     if (window.eventData.image) {
         $("#event-image-preview").css(
             "background-image",
@@ -18,6 +17,16 @@ $(document).ready(function () {
     }
 });
 
+$('#editModal').on('shown.bs.modal', function (e) {
+  console.log('hii');
+  const ta = document.querySelector("#editModal textarea");
+  ta.style.display = 'none';
+  autosize(ta);
+  ta.style.display = '';
+  // Call the update method to recalculate the size:
+  autosize.update(ta);
+});
+
 function editEventForm() {
     return {
         data: {
diff --git a/public/js/modules/group-edit.js b/public/js/modules/group-edit.js
index 2d55346..db2d411 100644
--- a/public/js/modules/group-edit.js
+++ b/public/js/modules/group-edit.js
@@ -7,7 +7,6 @@ $(document).ready(function () {
         label_selected: "Change file",
         no_label: false,
     });
-    autosize($("textarea"));
     if (window.groupData.image) {
         $("#group-image-preview").css(
             "background-image",
@@ -19,6 +18,14 @@ $(document).ready(function () {
     $("#timezone").val(window.groupData.timezone).trigger("change");
 });
 
+$('#editModal').on('shown.bs.modal', function (e) {
+  const ta = document.querySelector("#editModal textarea");
+  ta.style.display = 'none';
+  autosize(ta);
+  ta.style.display = '';
+  autosize.update(ta);
+});
+
 function editEventGroupForm() {
     return {
         data: {
diff --git a/public/js/modules/new.js b/public/js/modules/new.js
index f7c3e34..7915b59 100644
--- a/public/js/modules/new.js
+++ b/public/js/modules/new.js
@@ -5,48 +5,6 @@ $(document).ready(function () {
             .next("label")
             .html('<i class="far fa-file-alt"></i> ' + file);
     }
-    $("#showNewEventFormButton").click(function () {
-        $("button").removeClass("active");
-        $(
-            "#showImportEventFormButton #showNewEventGroupFormButton",
-        ).removeClass("active");
-        if ($("#newEventFormContainer").is(":visible")) {
-            $("#newEventFormContainer").slideUp("fast");
-        } else {
-            $("#newEventFormContainer").slideDown("fast");
-            $("#importEventFormContainer").slideUp("fast");
-            $("#newEventGroupFormContainer").slideUp("fast");
-            $(this).addClass("active");
-        }
-    });
-    $("#showImportEventFormButton").click(function () {
-        $("button").removeClass("active");
-        $("#showNewEventFormButton #showNewEventGroupFormButton").removeClass(
-            "active",
-        );
-        if ($("#importEventFormContainer").is(":visible")) {
-            $("#importEventFormContainer").slideUp("fast");
-        } else {
-            $("#importEventFormContainer").slideDown("fast");
-            $("#newEventFormContainer").slideUp("fast");
-            $("#newEventGroupFormContainer").slideUp("fast");
-            $(this).addClass("active");
-        }
-    });
-    $("#showNewEventGroupFormButton").click(function () {
-        $("button").removeClass("active");
-        $("#showNewEventFormButton #showImportEventFormButton").removeClass(
-            "active",
-        );
-        if ($("#newEventGroupFormContainer").is(":visible")) {
-            $("#newEventGroupFormContainer").slideUp("fast");
-        } else {
-            $("#newEventGroupFormContainer").slideDown("fast");
-            $("#newEventFormContainer").slideUp("fast");
-            $("#importEventFormContainer").slideUp("fast");
-            $(this).addClass("active");
-        }
-    });
     $("#icsImportControl").change(function () {
         var file = $("#icsImportControl")[0].files[0].name;
         $(this)