Просмотр исходного кода

Fixes #2982: Correct CSS class assignment on color picker

Jeremy Stretch 7 лет назад
Родитель
Сommit
e05871b467
2 измененных файлов с 5 добавлено и 0 удалено
  1. 1 0
      CHANGELOG.md
  2. 4 0
      netbox/project-static/js/forms.js

+ 1 - 0
CHANGELOG.md

@@ -22,6 +22,7 @@ v2.5.8 (FUTURE)
 * [#2972](https://github.com/digitalocean/netbox/issues/2972) - Improve ContentTypeField serializer to elegantly handle invalid data
 * [#2972](https://github.com/digitalocean/netbox/issues/2972) - Improve ContentTypeField serializer to elegantly handle invalid data
 * [#2976](https://github.com/digitalocean/netbox/issues/2976) - Add delete button to tag view
 * [#2976](https://github.com/digitalocean/netbox/issues/2976) - Add delete button to tag view
 * [#2980](https://github.com/digitalocean/netbox/issues/2980) - Improve rendering time for API docs
 * [#2980](https://github.com/digitalocean/netbox/issues/2980) - Improve rendering time for API docs
+* [#2982](https://github.com/digitalocean/netbox/issues/2982) - Correct CSS class assignment on color picker
 * [#2984](https://github.com/digitalocean/netbox/issues/2984) - Fix logging of unlabeled cable ID on cable deletion
 * [#2984](https://github.com/digitalocean/netbox/issues/2984) - Fix logging of unlabeled cable ID on cable deletion
 * [#2985](https://github.com/digitalocean/netbox/issues/2985) - Fix pagination page length for rack elevations
 * [#2985](https://github.com/digitalocean/netbox/issues/2985) - Fix pagination page length for rack elevations
 
 

+ 4 - 0
netbox/project-static/js/forms.js

@@ -90,6 +90,10 @@ $(document).ready(function() {
     // Assign color picker selection classes
     // Assign color picker selection classes
     function colorPickerClassCopy(data, container) {
     function colorPickerClassCopy(data, container) {
         if (data.element) {
         if (data.element) {
+            // Remove any existing color-selection classes
+            $(container).attr('class', function(i, c) {
+                return c.replace(/(^|\s)color-selection-\S+/g, '');
+            });
             $(container).addClass($(data.element).attr("class"));
             $(container).addClass($(data.element).attr("class"));
         }
         }
         return data.text;
         return data.text;