Skip to content

Commit bd85254

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 294cbb0 commit bd85254

File tree

73 files changed

+1413
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1413
-63
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,7 @@ Specifies the [value binding](/framework/mvvm/bindings/value) behavior for the w
12141214

12151215
Enables the virtualization feature of the widget. The configuration can be set on an object, which contains two properties - `itemHeight` and `valueMapper`.
12161216

1217-
For detailed information, refer to the [article on virtualization]({% slug virtualization_kendoui_multicolumncombobox_widget %}).
1217+
For detailed information, refer to the [article on virtualization]({% slug virtualization_kendoui_combobox_widget %}).
12181218

12191219
### virtual.itemHeight `Number`*(default: null)*
12201220

@@ -1225,7 +1225,7 @@ If the developer does not specify one, the framework will automatically set `ite
12251225

12261226
The changes introduced with the Kendo UI R3 2016 release enable you to determine if the `valueMapper` must resolve a *value to an `index`* or a *value to a `dataItem`*. This is configured through the `mapValueTo` option that accepts two possible values - `"index"` or `"dataItem"`. By default, the `mapValueTo` is set to `"index"`, which does not affect the current behavior of the virtualization process.
12271227

1228-
For more information, refer to the [article on virtualization]({% slug virtualization_kendoui_multicolumncombobox_widget %}#value-mapping).
1228+
For more information, refer to the [article on virtualization]({% slug virtualization_kendoui_combobox_widget %}#value-mapping).
12291229

12301230
### virtual.valueMapper `Function`*(default: null)*
12311231

‎src/kendo.pager.js‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,8 @@ var __meta__ = { // jshint ignore:line
264264
html = "",
265265
options = that.options,
266266
pageSize = that.pageSize(),
267-
total = that.dataSource.total(),
267+
collapsedTotal = that._collapsedTotal(),
268+
total = that.dataSource.total(),
268269
totalPages = that.totalPages(),
269270
linkTemplate = that.linkTemplate,
270271
buttonCount = options.buttonCount;
@@ -308,8 +309,8 @@ var __meta__ = { // jshint ignore:line
308309
if (options.info) {
309310
if (total > 0) {
310311
html = kendo.format(options.messages.display,
311-
that.dataSource.options.endless ? 1 : Math.min((page - 1) * pageSize + 1, total), // first item in the page
312-
Math.min(page * pageSize, total), // last item in the page
312+
that.dataSource.options.endless ? 1 : Math.min((page - 1) * pageSize + 1, collapsedTotal), // first item in the page
313+
Math.min(page * pageSize, collapsedTotal), // last item in the page
313314
total);
314315
} else {
315316
html = options.messages.empty;
@@ -358,6 +359,10 @@ var __meta__ = { // jshint ignore:line
358359
.kendoDropDownList("text", text); // handles custom values
359360
}
360361
},
362+
363+
_collapsedTotal: function() {
364+
return this.dataSource.total();
365+
},
361366

362367
_keydown: function(e) {
363368
if (e.keyCode === kendo.keys.ENTER) {

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,26 @@ $.extend(true, kendo.ui.Pager.prototype.options.messages,{
697697
});
698698
}
699699

700+
/* TreeListPager messages */
701+
702+
if (kendo.ui.TreeListPager) {
703+
kendo.ui.TreeListPager.prototype.options.messages =
704+
$.extend(true, kendo.ui.TreeListPager.prototype.options.messages,{
705+
"allPages": "Всички",
706+
"page": "Страница",
707+
"display": "{0} - {1} от {2} записи",
708+
"of": "от {0}",
709+
"empty": "Няма записи за показване!",
710+
"refresh": "Опресни",
711+
"first": "Към първата страница",
712+
"itemsPerPage": "записи на страница",
713+
"last": "Към последната страница",
714+
"next": "Към следващата страница",
715+
"previous": "Към предишната страница",
716+
"morePages": "Още страници"
717+
});
718+
}
719+
700720
/* FilterMenu messages */
701721

702722
if (kendo.ui.FilterMenu) {

‎src/messages/kendo.messages.cs-CZ.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,26 @@ $.extend(true, kendo.ui.Pager.prototype.options.messages,{
448448
});
449449
}
450450

451+
/* TreeListPager messages */
452+
453+
if (kendo.ui.TreeListPager) {
454+
kendo.ui.TreeListPager.prototype.options.messages =
455+
$.extend(true, kendo.ui.TreeListPager.prototype.options.messages,{
456+
"allPages": "All",
457+
"display": "{0} - {1} z {2} celkem",
458+
"empty": "Žádný záznam nenalezen",
459+
"page": "Strana",
460+
"of": "z {0}",
461+
"itemsPerPage": "záznamů na stránku",
462+
"first": "Na první stránku",
463+
"previous": "Na předchozí stránku",
464+
"next": "Na další stránku",
465+
"last": "Na poslední stránku",
466+
"refresh": "Obnovit",
467+
"morePages": "Další stránky"
468+
});
469+
}
470+
451471
/* PivotGrid messages */
452472

453473
if (kendo.ui.PivotGrid) {

‎src/messages/kendo.messages.da-DK.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,26 @@ $.extend(true, kendo.ui.Pager.prototype.options.messages,{
196196
});
197197
}
198198

199+
/* TreeListPager messages */
200+
201+
if (kendo.ui.TreeListPager) {
202+
kendo.ui.TreeListPager.prototype.options.messages =
203+
$.extend(true, kendo.ui.TreeListPager.prototype.options.messages,{
204+
"allPages": "All",
205+
"page": "Side",
206+
"display": "Viser rækker {0} - {1} af {2}",
207+
"of": "af {0}",
208+
"empty": "Ingen rækker at vise.",
209+
"refresh": "Opdatér",
210+
"first": "Gå til første side",
211+
"itemsPerPage": "emner pr side",
212+
"last": "Gå til sidste side",
213+
"next": "Gå til næste side",
214+
"previous": "Gå til forrige side",
215+
"morePages": "Flere sider"
216+
});
217+
}
218+
199219
/* FilterCell messages */
200220

201221
if (kendo.ui.FilterCell) {

‎src/messages/kendo.messages.de-AT.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,27 @@
466466
});
467467
}
468468

469+
470+
/* TreeListPager messages */
471+
472+
if (kendo.ui.TreeListPager) {
473+
kendo.ui.TreeListPager.prototype.options.messages =
474+
$.extend(true, kendo.ui.TreeListPager.prototype.options.messages, {
475+
"allPages": "Alle",
476+
"display": "Einträge {0} - {1} von {2}",
477+
"empty": "keine Daten",
478+
"first": "Zur ersten Seite",
479+
"itemsPerPage": "Elemente pro Seite",
480+
"last": "Zur letzten Seite",
481+
"next": "Zur nächsten Seite",
482+
"of": "von {0}",
483+
"page": "Seite",
484+
"previous": "Zur vorherigen Seite",
485+
"refresh": "Aktualisieren",
486+
"morePages": "Weitere Seiten"
487+
});
488+
}
489+
469490
/* Upload messages */
470491

471492
if (kendo.ui.Upload) {

‎src/messages/kendo.messages.de-CH.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,26 @@
466466
});
467467
}
468468

469+
/* TreeListPager messages */
470+
471+
if (kendo.ui.TreeListPager) {
472+
kendo.ui.TreeListPager.prototype.options.messages =
473+
$.extend(true, kendo.ui.TreeListPager.prototype.options.messages, {
474+
"allPages": "Alle",
475+
"display": "Einträge {0} - {1} von {2}",
476+
"empty": "keine Daten",
477+
"first": "Zur ersten Seite",
478+
"itemsPerPage": "Elemente pro Seite",
479+
"last": "Zur letzten Seite",
480+
"next": "Zur nächsten Seite",
481+
"of": "von {0}",
482+
"page": "Seite",
483+
"previous": "Zur vorherigen Seite",
484+
"refresh": "Aktualisieren",
485+
"morePages": "Weitere Seiten"
486+
});
487+
}
488+
469489
/* Upload messages */
470490

471491
if (kendo.ui.Upload) {

‎src/messages/kendo.messages.de-DE.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,26 @@ $.extend(true, kendo.ui.ListBox.prototype.options.messages,{
483483
});
484484
}
485485

486+
/* TreeListPager messages */
487+
488+
if (kendo.ui.TreeListPager) {
489+
kendo.ui.TreeListPager.prototype.options.messages =
490+
$.extend(true, kendo.ui.TreeListPager.prototype.options.messages, {
491+
"allPages": "Alle",
492+
"display": "Einträge {0} - {1} von {2}",
493+
"empty": "keine Daten",
494+
"first": "Zur ersten Seite",
495+
"itemsPerPage": "Elemente pro Seite",
496+
"last": "Zur letzten Seite",
497+
"next": "Zur nächsten Seite",
498+
"of": "von {0}",
499+
"page": "Seite",
500+
"previous": "Zur vorherigen Seite",
501+
"refresh": "Aktualisieren",
502+
"morePages": "Weitere Seiten"
503+
});
504+
}
505+
486506
/* Upload messages */
487507

488508
if (kendo.ui.Upload) {

‎src/messages/kendo.messages.de-LI.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,26 @@ $.extend(true, kendo.ui.Pager.prototype.options.messages,{
379379
});
380380
}
381381

382+
/* TreeListPager messages */
383+
384+
if (kendo.ui.TreeListPager) {
385+
kendo.ui.TreeListPager.prototype.options.messages =
386+
$.extend(true, kendo.ui.TreeListPager.prototype.options.messages,{
387+
"allPages": "All",
388+
"display": "Einträge {0} - {1} von {2}",
389+
"empty": "keine Daten",
390+
"first": "Zur ersten Seite",
391+
"itemsPerPage": "Elemente pro Seite",
392+
"last": "Zur letzten Seite",
393+
"next": "Zur nächsten Seite",
394+
"of": "von {0}",
395+
"page": "Seite",
396+
"previous": "Zur vorherigen Seite",
397+
"refresh": "Aktualisieren",
398+
"morePages": "Weitere Seiten"
399+
});
400+
}
401+
382402
/* TreeList messages */
383403

384404
if (kendo.ui.TreeList) {

‎src/messages/kendo.messages.el-GR.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,26 @@
441441
});
442442
}
443443

444+
/* TreeListPager messages */
445+
446+
if (kendo.ui.TreeListPager) {
447+
kendo.ui.TreeListPager.prototype.options.messages =
448+
$.extend(true, kendo.ui.TreeListPager.prototype.options.messages, {
449+
"allPages": "Όλα",
450+
"display": "{0} - {1} από {2} αντικείμενα",
451+
"empty": "Δεν υπάρχουν αντικείμενα",
452+
"page": "Σελίδα",
453+
"of": "από {0}",
454+
"itemsPerPage": "αντικείμενα ανα σελίδα",
455+
"first": "Πηγαίντε στην πρώτη σελίδα",
456+
"previous": "Πηγαίντε στην προηγούμενη σελίδα",
457+
"next": "Πηγαίντε στην επόμενη σελίδα",
458+
"last": "Πηγαίντε στην τελευταία σελίδα",
459+
"refresh": "Ανανέωση",
460+
"morePages": "Περισσότερες Σελίδες"
461+
});
462+
}
463+
444464
/* PivotGrid messages */
445465

446466
if (kendo.ui.PivotGrid) {

0 commit comments

Comments
 (0)