Skip to content

Commit ad2864e

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent d8b9ade commit ad2864e

File tree

10 files changed

+290
-30
lines changed

10 files changed

+290
-30
lines changed

‎docs/api/javascript/ui/grid.md‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3111,6 +3111,66 @@ The text message displayed in the column menu for unlocking a column.
31113111
});
31123112
</script>
31133113

3114+
### columnMenu.messages.apply `String` *(default: "Apply")*
3115+
3116+
The text of the button which applies the columns filter.
3117+
3118+
> The button is visible when the column menu [componentType](/api/javascript/ui/grid/configuration/columnmenu.componenttype) is set to `modern`.
3119+
3120+
#### Example - column menu apply button text
3121+
3122+
<div id="grid"></div>
3123+
<script>
3124+
$("#grid").kendoGrid({
3125+
columns: [
3126+
{ field: "id", width:200 },
3127+
{ field: "name", width:400 },
3128+
{ field: "age", width:400 }
3129+
],
3130+
columnMenu: {
3131+
componentType: "modern",
3132+
messages: {
3133+
apply: "Apply Columns"
3134+
}
3135+
},
3136+
sortable: true,
3137+
dataSource: [
3138+
{ id: 1, name: "Jane Doe", age: 30 },
3139+
{ id: 2, name: "John Doe", age: 33 }
3140+
]
3141+
});
3142+
</script>
3143+
3144+
### columnMenu.messages.reset `String` *(default: "Reset")*
3145+
3146+
The text of the button which resets the columns filter.
3147+
3148+
> The button is visible when the column menu [componentType](/api/javascript/ui/grid/configuration/columnmenu.componenttype) is set to `modern`.
3149+
3150+
#### Example - column menu reset button text
3151+
3152+
<div id="grid"></div>
3153+
<script>
3154+
$("#grid").kendoGrid({
3155+
columns: [
3156+
{ field: "id", width:200 },
3157+
{ field: "name", width:400 },
3158+
{ field: "age", width:400 }
3159+
],
3160+
columnMenu: {
3161+
componentType: "modern",
3162+
messages: {
3163+
reset: "Reset Columns"
3164+
}
3165+
},
3166+
sortable: true,
3167+
dataSource: [
3168+
{ id: 1, name: "Jane Doe", age: 30 },
3169+
{ id: 2, name: "John Doe", age: 33 }
3170+
]
3171+
});
3172+
</script>
3173+
31143174
### dataSource `Object|Array|kendo.data.DataSource`
31153175

31163176
The data source of the widget which is used render table rows. Can be a JavaScript object which represents a valid data source configuration, a JavaScript array or an existing [kendo.data.DataSource](/api/javascript/data/datasource)
@@ -9033,7 +9093,7 @@ A string, DOM element or jQuery object which represents the table cell. A string
90339093

90349094
### clearSelection
90359095

9036-
Clears the currently selected table rows or cells (depending on the current selection [mode](/api/javascript/ui/grid/configuration/selectable)).
9096+
Clears the currently selected table rows or cells (depending on the current selection [mode](/api/javascript/ui/grid/configuration/selectable)).
90379097

90389098
> By default clearSelection will clear the selected rows on the current page only when [persistSelection](/api/javascript/ui/grid/configuration/persistselection) is enabled. In order to clear all selected rows follow the approach in [this Knowledge Base article](https://docs.telerik.com/kendo-ui/knowledge-base/clear-selection-all-pages-grid).
90399099

‎src/kendo.numerictextbox.js‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,10 @@ var __meta__ = { // jshint ignore:line
9595
that._text.on(TOUCHEND + ns + " " + FOCUS + ns, function() {
9696
if (kendo.support.browser.edge) {
9797
that._text.one(FOCUS + ns, function() {
98-
that._toggleText(false);
99-
element.focus();
98+
that._focusin();
10099
});
101100
} else {
102-
that._toggleText(false);
103-
element.focus();
101+
that._focusin();
104102
}
105103
that.selectValue();
106104
});
@@ -451,17 +449,24 @@ var __meta__ = { // jshint ignore:line
451449
}
452450
},
453451

454-
_change: function(value) {
452+
_getFactorValue: function (value) {
455453
var that = this,
456454
factor = that.options.factor;
457455

458-
if(factor && factor !== 1){
456+
if (factor && factor !== 1) {
459457
value = kendo.parseFloat(value);
460-
if(value !== null) {
458+
if (value !== null) {
461459
value = value/factor;
462460
}
463461
}
464462

463+
return value;
464+
},
465+
466+
_change: function(value) {
467+
var that = this;
468+
469+
value = that._getFactorValue(value);
465470
that._update(value);
466471
value = that._value;
467472

@@ -597,6 +602,12 @@ var __meta__ = { // jshint ignore:line
597602
this._numPadDot = false;
598603
}
599604

605+
if (this._isPasted) {
606+
value = this._parse(value)
607+
.toString()
608+
.replace(POINT, numberFormat[POINT]);
609+
}
610+
600611
if (this._numericRegex(numberFormat).test(value) && !minInvalid) {
601612
this._oldText = value;
602613
} else {
@@ -607,6 +618,8 @@ var __meta__ = { // jshint ignore:line
607618
this._cachedCaret = null;
608619
}
609620
}
621+
622+
this._isPasted = false;
610623
},
611624

612625
_blinkInvalidState: function () {
@@ -666,14 +679,17 @@ var __meta__ = { // jshint ignore:line
666679
var value = element.value;
667680
var numberFormat = that._format(that.options.format);
668681

669-
setTimeout(function() {
682+
that._isPasted = true;
683+
684+
setTimeout(function() {
670685
var result = that._parse(element.value);
671686

672687
if (result === NULL) {
673688
that._update(value);
674689
} else {
675690
element.value = result.toString().replace(POINT, numberFormat[POINT]);
676691
if (that._adjust(result) !== result || !that._numericRegex(numberFormat).test(element.value)) {
692+
value = that._getFactorValue(element.value);
677693
that._update(value);
678694
}
679695
}

‎src/messages/kendo.messages.bg-BG.js‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,9 @@ $.extend(true, kendo.ui.ColumnMenu.prototype.options.messages,{
580580
"unlock": "Отключи колоната",
581581
"stick" : "Залепи колоната",
582582
"unstick": "Отлепи колоната",
583-
"setColumnPosition": "Задай позиция на колоната"
583+
"setColumnPosition": "Задай позиция на колоната",
584+
"apply": "Приложи",
585+
"reset": "Нулирай"
584586
});
585587
}
586588

@@ -590,6 +592,7 @@ if (kendo.ui.RecurrenceEditor) {
590592
kendo.ui.RecurrenceEditor.prototype.options.messages =
591593
$.extend(true, kendo.ui.RecurrenceEditor.prototype.options.messages,{
592594
"repeat": "Повторение",
595+
"recurrenceEditorTitle": "Конфигуратор на повторенията",
593596
"daily": {
594597
"interval": " ден(дни)",
595598
"repeatEvery": "Повтаряй всеки: "
@@ -650,6 +653,8 @@ $.extend(true, kendo.ui.RecurrenceEditor.prototype.options.messages,{
650653
if (kendo.ui.MobileRecurrenceEditor) {
651654
kendo.ui.MobileRecurrenceEditor.prototype.options.messages =
652655
$.extend(true, kendo.ui.MobileRecurrenceEditor.prototype.options.messages, kendo.ui.RecurrenceEditor.prototype.options.messages, {
656+
"cancel": "Откажи",
657+
"update": "Запази",
653658
"endTitle": "Повтарянето завършва",
654659
"repeatTitle": "Вид повторение",
655660
"headerTitle": "Повтори събитието",
@@ -658,18 +663,35 @@ if (kendo.ui.MobileRecurrenceEditor) {
658663
"never": "Никога",
659664
"after": "След...",
660665
"on": "На..."
661-
}
666+
},
667+
"never": "Никога",
668+
"after": "Приключи повторенията след",
669+
"on": "Приключи повторенията на"
670+
},
671+
"daily": {
672+
"interval": ""
673+
},
674+
"hourly": {
675+
"interval": ""
676+
},
677+
"weekly": {
678+
"interval": ""
662679
},
663680
"monthly": {
681+
"interval": "",
664682
"repeatBy": "Повтори според: ",
665683
"dayOfMonth": "Дата от месеца",
666684
"dayOfWeek": "Ден от седмицата",
667-
"every": "Всеки"
685+
"repeatEvery": "Повтори всеки",
686+
"every": "Всеки",
687+
"day": "Ден "
668688
},
669689
"yearly": {
690+
"interval": "",
670691
"repeatBy": "Повтори според: ",
671692
"dayOfMonth": "Дата от месеца",
672693
"dayOfWeek": "Ден от седмицата",
694+
"repeatEvery": "Повтори всеки: ",
673695
"every": "Всеки",
674696
"month": "Месец",
675697
"day": "Ден"

‎src/messages/kendo.messages.en-AU.js‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,7 @@ if (kendo.ui.RecurrenceEditor) {
507507
kendo.ui.RecurrenceEditor.prototype.options.messages =
508508
$.extend(true, kendo.ui.RecurrenceEditor.prototype.options.messages,{
509509
"repeat": "Repeat",
510+
"recurrenceEditorTitle": "Recurrence editor",
510511
"frequencies": {
511512
"never": "Never",
512513
"hourly": "Hourly",
@@ -571,6 +572,8 @@ $.extend(true, kendo.ui.RecurrenceEditor.prototype.options.messages,{
571572
if (kendo.ui.MobileRecurrenceEditor) {
572573
kendo.ui.MobileRecurrenceEditor.prototype.options.messages =
573574
$.extend(true, kendo.ui.MobileRecurrenceEditor.prototype.options.messages, kendo.ui.RecurrenceEditor.prototype.options.messages, {
575+
"cancel": "Cancel",
576+
"update": "Save",
574577
"endTitle": "Repeat ends",
575578
"repeatTitle": "Repeat pattern",
576579
"headerTitle": "Repeat event",
@@ -579,18 +582,35 @@ if (kendo.ui.MobileRecurrenceEditor) {
579582
"never": "Never",
580583
"after": "After...",
581584
"on": "On..."
582-
}
585+
},
586+
"never": "Never",
587+
"after": "End repeat after",
588+
"on": "End repeat on"
589+
},
590+
"daily": {
591+
"interval": ""
592+
},
593+
"hourly": {
594+
"interval": ""
595+
},
596+
"weekly": {
597+
"interval": ""
583598
},
584599
"monthly": {
600+
"interval": "",
585601
"repeatBy": "Repeat by: ",
586602
"dayOfMonth": "Day of the month",
587603
"dayOfWeek": "Day of the week",
588-
"every": "Every"
604+
"repeatEvery": "Repeat every",
605+
"every": "Every",
606+
"day": "Day "
589607
},
590608
"yearly": {
609+
"interval": "",
591610
"repeatBy": "Repeat by: ",
592611
"dayOfMonth": "Day of the month",
593612
"dayOfWeek": "Day of the week",
613+
"repeatEvery": "Repeat every: ",
594614
"every": "Every",
595615
"month": "Month",
596616
"day": "Day"

‎src/messages/kendo.messages.en-CA.js‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,7 @@ if (kendo.ui.RecurrenceEditor) {
518518
kendo.ui.RecurrenceEditor.prototype.options.messages =
519519
$.extend(true, kendo.ui.RecurrenceEditor.prototype.options.messages,{
520520
"repeat": "Repeat",
521+
"recurrenceEditorTitle": "Recurrence editor",
521522
"frequencies": {
522523
"never": "Never",
523524
"hourly": "Hourly",
@@ -583,6 +584,8 @@ $.extend(true, kendo.ui.RecurrenceEditor.prototype.options.messages,{
583584
if (kendo.ui.MobileRecurrenceEditor) {
584585
kendo.ui.MobileRecurrenceEditor.prototype.options.messages =
585586
$.extend(true, kendo.ui.MobileRecurrenceEditor.prototype.options.messages, kendo.ui.RecurrenceEditor.prototype.options.messages, {
587+
"cancel": "Cancel",
588+
"update": "Save",
586589
"endTitle": "Repeat ends",
587590
"repeatTitle": "Repeat pattern",
588591
"headerTitle": "Repeat event",
@@ -591,18 +594,35 @@ if (kendo.ui.MobileRecurrenceEditor) {
591594
"never": "Never",
592595
"after": "After...",
593596
"on": "On..."
594-
}
597+
},
598+
"never": "Never",
599+
"after": "End repeat after",
600+
"on": "End repeat on"
601+
},
602+
"daily": {
603+
"interval": ""
604+
},
605+
"hourly": {
606+
"interval": ""
607+
},
608+
"weekly": {
609+
"interval": ""
595610
},
596611
"monthly": {
612+
"interval": "",
597613
"repeatBy": "Repeat by: ",
598614
"dayOfMonth": "Day of the month",
599615
"dayOfWeek": "Day of the week",
600-
"every": "Every"
616+
"repeatEvery": "Repeat every",
617+
"every": "Every",
618+
"day": "Day "
601619
},
602620
"yearly": {
621+
"interval": "",
603622
"repeatBy": "Repeat by: ",
604623
"dayOfMonth": "Day of the month",
605624
"dayOfWeek": "Day of the week",
625+
"repeatEvery": "Repeat every: ",
606626
"every": "Every",
607627
"month": "Month",
608628
"day": "Day"

0 commit comments

Comments
 (0)