fix label and popup calls

ome · Aug 21, 2024 · b2f981f · b2f981f
1 parent e59a2f9
commit b2f981f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/index.html b/src/index.html
@@ -630,8 +630,8 @@ <h5 class="modal-title">Color Picker</h5>
           </div>
           <form class="colorpickerForm" role="form">
             <div class="modal-body" style="height: 300px">
-              <div>Picker</div>
               <input class="color-input" type="color" />
+              <div>Click to Open color-picker</div>
               <div
                 id="demo_cont"
                 class="demo demo-auto inl-bl"

diff --git a/src/js/views/colorpicker.js b/src/js/views/colorpicker.js
@@ -50,10 +50,11 @@ var ColorPickerView = Backbone.View.extend({
     // 'Recent colors' buttons have color as their title
     pickRecentColor: function(event) {
         var color = $(event.target).prop('title');
-        if(navigator.userAgent.includes("Firefox")){
-            $('.color-input').val(color);
-        }else{
-            $(".color-input").val(color).trigger("click");
+        $('.color-input').val(color);
+
+        // Only show color picker if not Firefox
+        if(!navigator.userAgent.includes("Firefox")){
+            $(".color-input").trigger("click");
         }
         $('.oldNewColors li:first-child').css('background-color', color);
         // enable submit
@@ -89,9 +90,8 @@ var ColorPickerView = Backbone.View.extend({
     show: function(options) {
         showModal("colorpickerModal");
 
-        if(this.pickedColors.length > 0 && navigator.userAgent.includes("Firefox")){
-            $(".color-input", this.$el);
-        }else{
+        // Only show color picker if not Firefox
+        if(!navigator.userAgent.includes("Firefox") || this.pickedColors.length == 0){
             $(".color-input", this.$el).trigger("click");
         }