add support for resetting color

ghsioux · ghsioux · commit 656bdc474cf3 · 2025-02-19T23:33:08.000+01:00
diff --git a/assets/js/app/app.js b/assets/js/app/app.js
@@ -705,6 +705,8 @@ var open_event_edit_dialog = function open_event_edit_dialog(event) {
 
       // Initialize color picker
       $('input.pick_color').colorPicker();
+      // Show the reset button from the color picker
+      $('#color_selector').find('#reset_color').show();
       
       if (is_new) {
         // Initialize color picker with the calendar color for new events
@@ -732,6 +734,7 @@ var open_event_edit_dialog = function open_event_edit_dialog(event) {
           return calendar.calendar === selectedCalendarId;
         });
         if (selectedCalendar) {
+          $.fn.colorPicker.calendarColor = selectedCalendar.color; // for reset button
           $('input.pick_color').next('.color_picker').css('background-color', $.fn.colorPicker.calendarColor);
         }
       });      
@@ -982,6 +985,8 @@ var calendar_modify_dialog = function calendar_modify_dialog(calendar_obj) {
     width: 500,
     pre_func: function() {
       $('input.pick_color').colorPicker();
+      // Hide the reset button from the color picker
+      $('#color_selector').find('#reset_color').hide();
 
       if (AgenDAVConf.enable_calendar_sharing === true && data.is_shared !== true) {
         shares_manager();
diff --git a/assets/js/other/jquery.colorPicker.js b/assets/js/other/jquery.colorPicker.js
@@ -65,7 +65,19 @@
       if(event.keyCode == 27) {toggleSelector()}
     });
 
-    $("<div id='color_custom'></div>").append(color_field).appendTo(selector);
+    //add reset button
+    reset_button = $("<button type='button' id='reset_color'>Reset color</button>");
+    reset_button.bind("mouseover", function(e){
+      var defaultColor = $.fn.colorPicker.calendarColor || '#FFFFFF';
+      $("input#color_value").val(defaultColor);
+    });
+    reset_button.bind("mouseout", function(e){
+      var currentColor = $(selectorOwner).prev("input").val();
+      $("input#color_value").val(currentColor);
+    });
+    reset_button.bind("click", function(e){ resetColor(); });
+
+    $("<div id='color_custom'></div>").append(color_field).append(reset_button).appendTo(selector);
 
     $("body").append(selector); 
     selector.hide();
@@ -120,6 +132,18 @@
     hideSelector();    
   };
 
+  resetColor = function(){
+    var defaultColor = $.fn.colorPicker.calendarColor || '#FFFFFF'; // Use the calendar color or fallback to white
+    $(selectorOwner).prev("input").val(null).change();
+    $(selectorOwner).css("background-color", defaultColor);
+
+    // Update the color value input field
+    $("input#color_value").val(defaultColor);
+
+    //close the selector
+    hideSelector();
+  };
+
   //public methods
   $.fn.colorPicker.addColors = function(colorArray){
     $.fn.colorPicker.defaultColors = $.fn.colorPicker.defaultColors.concat(colorArray);
