Skip to content

Commit 67a8429

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent da189ac commit 67a8429

27 files changed

+1194
-11
lines changed

src/kendo.core.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4526,7 +4526,9 @@ function pad(number, digits, end) {
45264526
if (nextFocusable.length) {
45274527
target = nextFocusable;
45284528
} else if (widgetInstance) {
4529-
target = widgetInstance.wrapper.find(":kendoFocusable").first();
4529+
target = widgetInstance instanceof kendo.ui.Editor ?
4530+
$(widgetInstance.body) :
4531+
widgetInstance.wrapper.find(":kendoFocusable").first();
45304532
} else {
45314533
target = element;
45324534
}
@@ -4622,6 +4624,10 @@ function pad(number, digits, end) {
46224624
return Math.round(size / Math.pow(1024, i), 2) + ' ' + sizes[i];
46234625
};
46244626

4627+
kendo.selectorFromClasses = function(classes) {
4628+
return "."+classes.split(" ").join(".");
4629+
};
4630+
46254631
// kendo.saveAs -----------------------------------------------
46264632
(function() {
46274633
function postToProxy(dataURI, fileName, proxyURL, proxyTarget) {

src/kendo.timepicker.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@ var __meta__ = { // jshint ignore:line
205205
} else if (key == keys.DOWN) {
206206
container.scrollTop(container.scrollTop() + itemHeight);
207207
e.preventDefault();
208+
} else if (key === keys.ENTER) {
209+
that._setClickHandler();
210+
} else if (key === keys.ESC) {
211+
that._cancelClickHandler();
208212
}
209213
},
210214

@@ -216,7 +220,7 @@ var __meta__ = { // jshint ignore:line
216220
this.list.find(".k-time-list-wrapper").removeClass(FOCUSED);
217221
list.addClass(FOCUSED);
218222
this.list.focus();
219-
this._scrollTop = list.scrollTop();
223+
this._scrollTop = list.find('.k-scrollable').scrollTop();
220224
},
221225
_createClassicRenderingList: function () {
222226
var that = this;
@@ -1112,6 +1116,7 @@ var __meta__ = { // jshint ignore:line
11121116
that.addTranslate();
11131117
that.applyValue(that._value);
11141118
that._updateRanges();
1119+
that._focusList(that.list.find(".k-time-list-wrapper:eq(0)"));
11151120
}
11161121
}
11171122
}));

src/messages/kendo.messages.fr-CA.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ $.extend(true, kendo.ui.Grid.prototype.options.messages,{
177177
"pdf": "Exporter vers PDF",
178178
"select": "Sélectionner",
179179
"cancel": "Annuler les modifications",
180-
"save": "Enregistrer les modifications"
180+
"save": "Enregistrer les modifications",
181+
"search": "Recherche"
181182
},
182183
"editable": {
183184
"confirmation": "Êtes-vous sûr de vouloir supprimer cet enregistrement?",

styles/web/Default/calendar/_layout.less

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,33 @@
195195

196196
}
197197

198+
// Calendar Modern
199+
200+
.k-calendar-header {
201+
padding: @calendar-modern-header-padding-y @calendar-modern-header-padding-x;
202+
display: flex;
203+
align-items: center;
204+
justify-content: space-between;
205+
flex: 0 0 auto;
206+
207+
.k-button {
208+
white-space: nowrap;
209+
.k-button.k-flat();
210+
}
211+
}
212+
213+
.k-calendar-monthview,
214+
.k-calendar-yearview,
215+
.k-calendar-decadeview,
216+
.k-calendar-decadeview {
217+
padding: 0 @calendar-modern-header-padding-x;
218+
219+
th {
220+
border-bottom-width: 0;
221+
background-color: transparent;
222+
}
223+
}
224+
198225
}
199226

200227

styles/web/Default/calendar/_theme.less

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,12 @@
101101
}
102102
}
103103

104+
.k-footer .k-nav-today,
105+
.k-calendar-header .k-today {
106+
color: @link-text;
104107

105-
// Footer
106-
.k-footer {
107-
.k-nav-today {
108-
color: @link-text;
109-
}
110-
.k-nav-today:hover {
108+
&:hover,
109+
&:focus {
111110
color: @link-hovered-text;
112111
}
113112
}

styles/web/Default/card/_layout.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,10 @@
164164
// Card title
165165
.k-card-title {
166166
// @include typography-styles( card-title );
167+
font-family: inherit;
167168
font-size: @card-title-font-size;
169+
line-height: normal;
170+
font-weight: 400;
168171
margin: 0 0 @card-title-margin-bottom;
169172
}
170173

styles/web/Default/forms/_layout.less

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,21 @@
8787

8888
// Horizontal forms
8989
.k-form-horizontal {
90+
.k-label:not(.k-checkbox-label),
91+
.k-label:not(.k-radio-label) {
92+
margin-right: @horizontal-form-label-margin-x;
93+
padding-top: @horizontal-form-label-padding-top;
94+
width: @horizontal-form-label-width;
95+
justify-content: @horizontal-form-label-justify-content;
96+
}
97+
9098
.k-form-field {
9199
flex-flow: row nowrap;
92100
}
101+
102+
.k-form-field-wrap {
103+
flex: 1;
104+
}
93105
}
94106

95107

@@ -109,11 +121,16 @@
109121
> :first-child {
110122
margin-inline-start: 0;
111123
}
124+
125+
&.k-buttons-end {
126+
justify-content: flex-end;
127+
}
112128
}
113129

114130

115131

116132

133+
117134
// Legacy styles
118135
.k-edit-form
119136
{

styles/web/Default/listview/_layout.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
padding: 0;
4545
border-color: inherit;
4646
list-style: none;
47-
flex: 1 1 0%;
47+
flex: 1 1 auto;
4848
align-content: flex-start;
4949
position: relative;
5050

styles/web/Default/multiviewcalendar/_layout.less

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,13 @@
171171
display: block;
172172
}
173173
}
174+
175+
.k-calendar-monthview,
176+
.k-calendar-yearview,
177+
.k-calendar-decadeview,
178+
.k-calendar-decadeview {
179+
padding: 0;
180+
}
174181
}
175182

176183

styles/web/common/button.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ input[type="reset"].k-button-expand {
265265

266266
// stretched button group
267267
&.k-button-group-stretched {
268+
display: flex;
268269

269270
.k-button {
270271
flex: 1 0 auto;

0 commit comments

Comments
 (0)