Skip to content

Commit 99e6681

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 5aa177a commit 99e6681

File tree

14 files changed

+153
-43
lines changed

14 files changed

+153
-43
lines changed

docs-aspnet/redirects.conf

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ rewrite ^/{{ site.platform }}/$
55
/{{ site.platform }}/introduction
66
permanent;
77

8-
rewrite ^/{{ site.platform }}/knowledge-base$
9-
/{{ site.platform }}/knowledge-base.html
10-
permanent;
11-
128
rewrite ^/{{ site.platform }}/vs-integration/(.*)$
139
/{{ site.platform }}/getting-started/vs-integration/$1
1410
permanent;
@@ -106,3 +102,10 @@ rewrite ^/{{ site.platform }}/{{ directory.path }}/?$
106102
/{{ site.platform }}/{{ directory.url }}
107103
redirect;
108104
{% endfor %}
105+
106+
##
107+
# Remove HTML extension
108+
##
109+
rewrite ^(/.*)\.html(\?.*)?$
110+
$1$2
111+
permanent;

docs/redirects.conf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,3 +451,10 @@ rewrite ^/kendo-ui/{{ directory.path }}/?$
451451
/kendo-ui/{{ directory.url }}
452452
redirect;
453453
{% endfor %}
454+
455+
##
456+
# Remove HTML extension
457+
##
458+
rewrite ^(/.*)\.html(\?.*)?$
459+
$1$2
460+
permanent;

src/kendo.combobox.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ var __meta__ = { // jshint ignore:line
10821082

10831083
that._toggleCloseVisibility();
10841084
}
1085-
else if (value === "") {
1085+
else if (value === "" && that._prev !== "") {
10861086
that._clearValue();
10871087
that.search("");
10881088
}

src/kendo.listbox.js

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -203,21 +203,25 @@ var __meta__ = { // jshint ignore:line
203203
var that = this;
204204
var items = dataItems && dataItems.length ? dataItems : [dataItems];
205205
var itemsLength = items.length;
206+
var list = that._getList();
206207
var i;
207208

208209
that._unbindDataSource();
210+
that._unbindDataChange();
209211
for (i = 0; i < itemsLength; i++) {
210-
that._addItem(items[i]);
212+
that._addItem(items[i], list);
211213
}
214+
that._bindDataChange();
212215
that._bindDataSource();
213216
that._syncElement();
214217
},
215218

216-
_addItem: function (dataItem) {
219+
_addItem: function (dataItem, list) {
217220
var that = this;
218221
var item = that.templates.itemTemplate({ item: dataItem, r: that.templates.itemContent });
219222

220-
$(item).attr(kendoAttr(UNIQUE_ID), dataItem.uid).appendTo(that._getList());
223+
$(item).attr(kendoAttr(UNIQUE_ID), dataItem.uid).appendTo(list);
224+
221225
if (typeof dataItem === typeof "") {
222226
that.dataSource._data.push(dataItem);
223227
} else {
@@ -729,9 +733,11 @@ var __meta__ = { // jshint ignore:line
729733
var i;
730734

731735
that._unbindDataSource();
736+
that._unbindDataChange();
732737
for (i = 0; i < itemsLength; i++) {
733738
that._removeItem($(listItems[i]));
734739
}
740+
that._bindDataChange();
735741
that._bindDataSource();
736742
that._syncElement();
737743
that._updateToolbar();
@@ -879,6 +885,21 @@ var __meta__ = { // jshint ignore:line
879885
}
880886
},
881887

888+
_bindDataChange: function () {
889+
var dataSource = this.dataSource;
890+
if (dataSource._data && dataSource._changeHandler) {
891+
dataSource._data.bind(CHANGE, dataSource._changeHandler);
892+
dataSource._data.trigger(CHANGE);
893+
}
894+
},
895+
896+
_unbindDataChange: function () {
897+
var dataSource = this.dataSource;
898+
if (dataSource._data && dataSource._changeHandler) {
899+
dataSource._data.unbind(CHANGE, dataSource._changeHandler);
900+
}
901+
},
902+
882903
_bindDataSource: function() {
883904
var that = this;
884905
var dataSource = that.dataSource;
@@ -1287,14 +1308,19 @@ var __meta__ = { // jshint ignore:line
12871308
},
12881309

12891310
getUpdatedSelection: function(items) {
1311+
1312+
if (items.length !== 1) {
1313+
return null;
1314+
}
1315+
12901316
var that = this;
12911317
var itemFilter = that.options.filter;
12921318
var sourceListBox = that.getSourceListBox();
12931319
var lastEnabledItem = sourceListBox ? sourceListBox.items().filter(itemFilter).last() : null;
12941320
var containsLastItem = $(items).filter(lastEnabledItem).length > 0;
12951321
var itemToSelect = containsLastItem ? $(items).prevAll(itemFilter)[0] : $(items).nextAll(itemFilter)[0];
12961322

1297-
if ($(items).length === 1 && itemToSelect) {
1323+
if (itemToSelect) {
12981324
return itemToSelect;
12991325
} else {
13001326
return null;
@@ -1364,7 +1390,7 @@ var __meta__ = { // jshint ignore:line
13641390
canExecute: function() {
13651391
var sourceListBox = this.getSourceListBox();
13661392

1367-
return (sourceListBox ? sourceListBox.items().filter(ENABLED_ITEM_SELECTOR).length > 0 : false);
1393+
return (sourceListBox ? sourceListBox.wrapper.find(ENABLED_ITEMS_SELECTOR).length > 0 : false);
13681394
},
13691395

13701396
getItems: function() {
@@ -1381,7 +1407,7 @@ var __meta__ = { // jshint ignore:line
13811407
canExecute: function() {
13821408
var sourceListBox = this.getSourceListBox();
13831409

1384-
return (sourceListBox ? sourceListBox.items().filter(ENABLED_ITEM_SELECTOR).length > 0 : false);
1410+
return (sourceListBox ? sourceListBox.wrapper.find(ENABLED_ITEMS_SELECTOR).length > 0 : false);
13851411
},
13861412

13871413
getItems: function() {
@@ -1496,13 +1522,14 @@ var __meta__ = { // jshint ignore:line
14961522
_updateToolState: function(toolName) {
14971523
var that = this;
14981524
var command = CommandFactory.current.create(toolName, { listBox: that.listBox });
1499-
var toolElement = that.element.find("[data-command='" + toolName + "']")[0];
1525+
var tool = that.element.find("[data-command='" + toolName + "']");
1526+
var toolElement = tool[0];
15001527

15011528
if (toolElement && command && command.canExecute) {
15021529
if (command.canExecute()) {
1503-
$(toolElement).removeClass(DISABLED_STATE_CLASS).removeAttr(TABINDEX);
1530+
tool.removeClass(DISABLED_STATE_CLASS).removeAttr(TABINDEX);
15041531
} else {
1505-
$(toolElement).addClass(DISABLED_STATE_CLASS).attr(TABINDEX, "-1");
1532+
tool.addClass(DISABLED_STATE_CLASS).attr(TABINDEX, "-1");
15061533
}
15071534
}
15081535
}

src/messages/kendo.messages.nl-BE.js

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

382+
/* FileManager messages */
383+
384+
if (kendo.ui.FileManager) {
385+
kendo.ui.FileManager.prototype.options.messages = $.extend(true, kendo.ui.FileManager.prototype.options.messages, {
386+
"toolbar": {
387+
"createFolder": "Nieuwe map",
388+
"upload": "Uploaden",
389+
"sortDirection": "Sorteer richting",
390+
"sortDirectionAsc": "Sorteer richting oplopend",
391+
"sortDirectionDesc": "Sorteer richting aflopend",
392+
"sortField": "Sorteren op",
393+
"nameField": "Naam",
394+
"sizeField": "Bestandsgrootte",
395+
"typeField": "Type",
396+
"dateModifiedField": "Datum gewijzigd",
397+
"dateCreatedField": "Datum gecreeërd",
398+
"listView": "Lijstweergave",
399+
"gridView": "Rasterweergave",
400+
"search" : "zoek",
401+
"details": "Details bekijken",
402+
"detailsChecked": "Aan",
403+
"detailsUnchecked": "Uit",
404+
"delete": "Verwijderen",
405+
"rename": "Naam wijzigen"
406+
},
407+
"views": {
408+
"nameField": "Naam",
409+
"sizeField": "Bestandsgrootte",
410+
"typeField": "Type",
411+
"dateModifiedField": "Datum gewijzigd",
412+
"dateCreatedField": "Datum gecreeërd",
413+
"items": "Items"
414+
},
415+
"dialogs": {
416+
"upload": {
417+
"title": "Bestanden uploaden",
418+
"clear": "Lijst wissen",
419+
"done": "Klaar"
420+
},
421+
"moveConfirm": {
422+
"title": "Bevestigen",
423+
"content": "<p style = 'text-align: center;'> Wilt u verplaatsen of kopiëren? </p>",
424+
"okText": "Kopiëren",
425+
"cancel": "Annuleren",
426+
"close": "Sluiten"
427+
},
428+
"deleteConfirm": {
429+
"title": "Bevestigen",
430+
"content": "<p style = 'text-align: center;'> Weet u zeker dat u de geselecteerde bestanden wilt verwijderen? </br> U kunt deze actie niet ongedaan maken. </p>",
431+
"okText": "Verwijderen",
432+
"cancel": "Annuleren",
433+
"close": "Sluiten"
434+
},
435+
"renamePrompt": {
436+
"title": "Bevestigen",
437+
"content": "<p style = 'text-align: center;'> Voer een nieuwe naam in voor het bestand. </p>",
438+
"okText": "Naam wijzigen",
439+
"cancel": "Annuleren",
440+
"close": "Sluiten"
441+
}
442+
},
443+
"previewPane": {
444+
"noFileSelected": "Geen bestand geselecteerd",
445+
"extension": "Type",
446+
"size": "Grootte",
447+
"created": "Datum gecreeërd",
448+
"createdUtc": "Datum gecreeërd UTC",
449+
"modified": "datum gewijzigd",
450+
"modifiedUtc": "datum gewijzigd UTC",
451+
"items": "items"
452+
}
453+
});
454+
}
455+
382456
/* Upload messages */
383457

384458
if (kendo.ui.Upload) {

styles/web/common/upload.less

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,3 +395,28 @@ html .k-upload
395395
.k-rtl .k-file-extension-wrapper {
396396
margin-left: 14px;
397397
}
398+
399+
.k-upload .k-action-buttons {
400+
padding: 0;
401+
margin: 0;
402+
display: flex;
403+
flex-direction: row;
404+
clear: both;
405+
406+
.k-button {
407+
flex: 1 1 auto;
408+
margin: 0;
409+
}
410+
411+
.k-button + .k-button {
412+
margin: 0;
413+
}
414+
}
415+
416+
.k-no-flexbox .k-upload .k-action-buttons .k-button {
417+
border-width: 0;
418+
}
419+
420+
421+
422+

styles/web/type-bootstrap.less

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,13 +1603,7 @@ div.k-filebrowser-dropzone em
16031603
}
16041604

16051605
.k-upload .k-upload-selected {
1606-
color: @accent;
16071606
border-color: @widget-border-color;
1608-
1609-
&:hover {
1610-
color: @selected-text-color;
1611-
background-color: @selected-background;
1612-
}
16131607
}
16141608

16151609
// ImageBrowser

styles/web/type-default.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1636,7 +1636,6 @@ div.k-filebrowser-dropzone em
16361636
}
16371637

16381638
.k-upload .k-upload-selected {
1639-
color: contrast(@base, @widget-text-color, @accent, .9);
16401639
border-color: @widget-border-color;
16411640
}
16421641

styles/web/type-fiori.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1727,7 +1727,6 @@ div.k-filebrowser-dropzone em
17271727
}
17281728

17291729
.k-upload .k-upload-selected {
1730-
color: @accent;
17311730
border-color: @widget-border-color;
17321731
}
17331732

styles/web/type-material.less

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,13 +1694,7 @@ div.k-filebrowser-dropzone em
16941694
}
16951695

16961696
.k-upload .k-upload-selected {
1697-
color: @selected-text-color;
16981697
border-color: @widget-border-color;
1699-
1700-
&:hover {
1701-
color: @base;
1702-
background-color: @selected-text-color;
1703-
}
17041698
}
17051699

17061700
// ImageBrowser

0 commit comments

Comments
 (0)