Sync with Kendo UI Professional

telerik · May 3, 2024 · 108b499 · 108b499
1 parent 7280c27
commit 108b499
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/src/kendo.colorpicker.js b/src/kendo.colorpicker.js
@@ -69,12 +69,7 @@ var __meta__ = {
             options = that.options = kendo.deepExtend({}, that.options, options);
             element = that.element;
 
-            var value = element.attr("value") || element.val();
-            if (value) {
-                value = parseColor(value, true);
-            } else {
-                value = parseColor(options.value, true);
-            }
+            let value = parseColor(options.value || element.attr("value") || element.val(), true);
             that._value = options.value = value;
 
             var _buttonHtml = kendo.html.renderButton('<button class="k-input-button" unselectable="on" aria-label="select" tabindex="-1"></button>', $.extend({}, that.options, {

diff --git a/tests/colorpicker/initialization.js b/tests/colorpicker/initialization.js
@@ -108,5 +108,24 @@
 
             assert.isOk(!cp.wrapper.hasClass("k-disabled"));
         });
+
+        it("sets value when option is set", function() {
+            const COLOR = "#008000";
+
+            var dom = $("<input tabindex='5' />").appendTo(Mocha.fixture).kendoColorPicker({
+                value: COLOR
+            });
+            assert.equal(dom.val(), COLOR);
+        });
+
+        it("sets value option with higher specificity when value attribute is declared", function() {
+            const COLOR = "#008000";
+
+            var dom = $("<input tabindex='5' color='red' />").appendTo(Mocha.fixture).kendoColorPicker({
+                value: COLOR
+            });
+
+            assert.equal(dom.val(), COLOR);
+        });
     });
 }());