Skip to content

Commit 8e77ce3

Browse files
committed
Sync with Kendo UI Professional
1 parent 58753dd commit 8e77ce3

File tree

6 files changed

+6
-10
lines changed

6 files changed

+6
-10
lines changed

src/colorpicker/colorgradient.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -534,17 +534,17 @@ import "../kendo.icons.js";
534534
contrastRatioTemplate = kendo.template(({ messages, ratio }) =>
535535
'<div class="k-contrast-ratio">' +
536536
`<span class="k-contrast-ratio-text">${encode(messages.contrastRatio)} ${encode(kendo.toString(ratio, "n2"))}</span>` +
537-
'<span class="k-contrast-validation k-text-success">' +
537+
'<span class="k-contrast-validation !k-text-success">' +
538538
(ratio > 4.5 ? kendo.ui.icon("check") : '') +
539539
(ratio > 7 ? kendo.ui.icon("check") : '') +
540540
'</span></div>'),
541541
labelTemplate = kendo.template(({ messages, ratio, limit, level }) =>
542542
'<div>' +
543543
`<span>${encode(level)}: ${encode(limit)} </span>` +
544544
(ratio > limit ?
545-
`<span class="k-contrast-validation k-text-success">${encode(messages.pass)} ${kendo.ui.icon("check")}</span>`
545+
`<span class="k-contrast-validation !k-text-success">${encode(messages.pass)} ${kendo.ui.icon("check")}</span>`
546546
:
547-
`<span class="k-contrast-validation k-text-error">${encode(messages.fail)} ${kendo.ui.icon("x")}</span>`) +
547+
`<span class="k-contrast-validation !k-text-error">${encode(messages.fail)} ${kendo.ui.icon("x")}</span>`) +
548548
'</div>'),
549549
output = "";
550550

src/colorpicker/flatcolorpicker.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ import "../kendo.html.button.js";
133133

134134
that.wrapper
135135
.on(KEYDOWN_NS, bind(that._keydown, that))
136-
.on(CLICK_NS, ".k-coloreditor-reset", function () {
136+
.on(CLICK_NS, ".k-button[data-command]", function () {
137137
that._clearColor = true;
138138
that._updateUI(null);
139139
that._view.value(null);
@@ -309,7 +309,7 @@ import "../kendo.html.button.js";
309309
'<div class="k-spacer"></div>' +
310310
'<div class="k-coloreditor-header-actions k-hstack">' +
311311
(options.clearButton ?
312-
html.renderButton(`<button class="k-coloreditor-reset" title="${encode(options.messages.clearColor)}"></button>`, extend({ icon: "droplet-slash" }, buttonOptions))
312+
html.renderButton(`<button data-command="reset" title="${encode(options.messages.clearColor)}"></button>`, extend({ icon: "droplet-slash" }, buttonOptions))
313313
: '') +
314314
(options.preview ?
315315
'<div class="k-coloreditor-preview k-vstack">' +

src/kendo.numerictextbox.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ var __meta__ = {
272272
var that = this;
273273
Widget.fn.setOptions.call(that, options);
274274

275-
that.wrapper.toggleClass("k-expand-padding", !that.options.spinners);
276275
that._text.prop("placeholder", that.options.placeholder);
277276
that._placeholder(that.options.placeholder);
278277
that.element.attr({
@@ -429,7 +428,6 @@ var __meta__ = {
429428

430429
if (!spinners) {
431430
arrows.parent().toggle(spinners);
432-
that.wrapper.addClass("k-expand-padding");
433431
}
434432

435433
that._upArrow = arrows.eq(0);

tests/colorpicker/clear-color.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717

1818
function clearColor(colorpicker) {
19-
colorpicker._selector.element.find(".k-coloreditor-reset").trigger("click");
19+
colorpicker._selector.element.find(".k-button[data-command]").trigger("click");
2020
}
2121

2222
it("clear button removes selected color", function() {

tests/numerictextbox/api.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,6 @@
628628
});
629629

630630
assert.equal(textbox._arrowsWrap.is(":visible"), false);
631-
assert.equal(textbox.wrapper.hasClass("k-expand-padding"), true);
632631
});
633632

634633
it("floating numbers should be calculated correctly when using spinners", function() {

tests/numerictextbox/initialization.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@
145145
});
146146

147147
assert.isOk(!textbox._upArrow.parent().is(":visible"));
148-
assert.isOk(textbox.wrapper.hasClass("k-expand-padding"));
149148
});
150149

151150
it("NumericTextBox gets the placeholder value from the element", function() {

0 commit comments

Comments
 (0)