Skip to content

Commit 0b1fc16

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent ed24ece commit 0b1fc16

10 files changed

+47
-44
lines changed

‎docs/_includes/search.html‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,42 @@
11
<script>
22
(function () {
33
var cx = {% if page.slug == 'knowledge_base' %} '{{site.google_custom_kb_search}}' {% else %} '{{site.google_custom_search}}' {% endif %};
4-
var gcse = document.createElement('script');
5-
gcse.async = true;
6-
gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
7-
'//www.google.com/cse/cse.js?cx=' + cx;
8-
var s = document.getElementsByTagName('script')[0];
9-
s.parentNode.insertBefore(gcse, s);
4+
var gcse = document.createElement('script');
5+
gcse.async = true;
6+
gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
7+
'//www.google.com/cse/cse.js?cx=' + cx;
8+
var s = document.getElementsByTagName('script')[0];
9+
s.parentNode.insertBefore(gcse, s);
1010
})();
1111

1212
</script>
1313

1414
<div id="page-search">
15-
<script src="http://www.google.com/jsapi"></script>
16-
{% javascript search %}
15+
<script src="http://www.google.com/jsapi"></script>
16+
{% javascript search %}
1717

18-
<script>
19-
$(document).ready(function(){
20-
var propertyName = {% case page.res_type %} {% when 'kb' %}'kb' {% when 'api' %} 'api' {% else %} 'docs' {% endcase %}
21-
viewModel.set(propertyName, true);
22-
viewModel.updateLabel();
18+
<script>
19+
$(document).ready(function () {
20+
var propertyNames = {% case page.res_type %} {% when 'kb' %} ['kb'] {% else %} ['docs', 'api', 'kb'] {% endcase %}
21+
for(var i = 0; i < propertyNames.length; i++) {
22+
viewModel.set(propertyNames[i], true);
23+
}
24+
viewModel.updateLabel();
2325
})
24-
</script>
26+
</script>
2527

26-
<div id="refine-search-popup" style="display: none">
27-
<ul>
28-
<li>
29-
<label class="custom-checkbox unselectable"><input type="checkbox" {% if page.res_type != 'kb' and page.res_type != 'api' %} disabled="true" {% endif %} data-bind="checked: docs" /><span class="k-icon k-i-check"></span>Search in Documentation</label>
30-
</li>
31-
<li>
32-
<label class="custom-checkbox unselectable"><input type="checkbox" {% if page.res_type == 'kb' %} disabled="true" {% endif %} data-bind="checked: kb" /><span class="k-icon k-i-check"></span>Search in Knowledge Base</label>
33-
</li>
34-
<li>
35-
<label class="custom-checkbox unselectable"><input type="checkbox" {% if page.res_type == 'api' %} disabled="true" {% endif %} data-bind="checked: api" /><span class="k-icon k-i-check"></span>Search in API Reference</label>
36-
</li>
37-
</ul>
38-
</div>
39-
<div class="gcse-search" data-gname="google-search"></div>
28+
<div id="refine-search-popup" style="display: none">
29+
<ul>
30+
<li>
31+
<label class="custom-checkbox unselectable"><input type="checkbox" {% if page.res_type != 'kb' and page.res_type != 'api' %} disabled="true" {% endif %} data-bind="checked: docs" /><span class="k-icon k-i-check"></span>Search in Documentation</label>
32+
</li>
33+
<li>
34+
<label class="custom-checkbox unselectable"><input type="checkbox" {% if page.res_type == 'kb' %} disabled="true" {% endif %} data-bind="checked: kb" /><span class="k-icon k-i-check"></span>Search in Knowledge Base</label>
35+
</li>
36+
<li>
37+
<label class="custom-checkbox unselectable"><input type="checkbox" {% if page.res_type == 'api' %} disabled="true" {% endif %} data-bind="checked: api" /><span class="k-icon k-i-check"></span>Search in API Reference</label>
38+
</li>
39+
</ul>
40+
</div>
41+
<div class="gcse-search" data-gname="google-search"></div>
4042
</div>

‎docs/knowledge-base/how-to-add-custom-filters.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ teampulseid:
1010
ticketid: 1118405
1111
pitsid:
1212

13+
res_type: kb
1314
---
1415

1516
## Environment

‎docs/knowledge-base/how-to-bind-a-dropdownlist-editor-aspnet-core-grid.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ page_title: Bind a DropDownList Editor in the Kendo UI Grid ASP.NET.Core
66
slug: dropdownlist_custom_editor_aspnetcore_grid
77
position: 0
88
tags: aspnet, core, kendo, grid, editor, dropdownlist,custom,editing, inline,incell, howto, bind, model
9+
res_type: kb
910
---
1011

1112
## Environment

‎docs/knowledge-base/how-to-page-break-by-group-grid-pdf-export.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ position: 0
88
tags: kendo,grid,pdf,export,group,page,break
99
ticketid: 1120369
1010

11+
res_type: kb
1112
---
1213

1314
## Environment

‎docs/knowledge-base/MaskedTextBox-does-not-allow-input-with-maxlength-attribute.md‎ renamed to ‎docs/knowledge-base/maskedtextbox-does-not-allow-input-with-maxlength-attribute.md‎

File renamed without changes.

‎src/kendo.binder.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,9 @@ var __meta__ = { // jshint ignore:line
949949
parents = this.bindings[bindingName]._parents();
950950

951951
for (idx = 0, length = view.length; idx < length; idx++) {
952-
bindElement(items[idx], view[idx], this._ns(e.ns), [view[idx]].concat(parents));
952+
if (items[idx]) {
953+
bindElement(items[idx], view[idx], this._ns(e.ns), [view[idx]].concat(parents));
954+
}
953955
}
954956
}
955957
},

‎src/kendo.dropdownlist.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ var __meta__ = { // jshint ignore:line
231231
that._filterSource();
232232
}
233233
} else if (that._allowOpening()) {
234+
that._open = true;
234235
that.popup.one("activate", that._focusInputHandler);
235236
that.popup.open();
236237
that._resizeFilterInput();
@@ -892,7 +893,7 @@ var __meta__ = { // jshint ignore:line
892893
return;
893894
}
894895

895-
if (filterInput && compareElement[0] === active) {
896+
if (filterInput && (compareElement[0] === active || this._open)) {
896897
this._prevent = true;
897898
this._focused = element.focus();
898899
}

‎src/kendo.menu.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ var __meta__ = { // jshint ignore:line
6767
popupSelector = groupSelector + "," + animationContainerSelector,
6868
allItemsSelector = ":not(.k-list) > .k-item",
6969
disabledSelector = ".k-item.k-state-disabled",
70-
itemSelector = ".k-item:not(.k-state-disabled)",
70+
itemSelector = ".k-item",
7171
linkSelector = ".k-item:not(.k-state-disabled) > .k-link",
7272
exclusionSelector = ":not(.k-item.k-separator)",
7373
nextSelector = itemSelector + exclusionSelector + ":eq(0)",
@@ -1699,7 +1699,7 @@ var __meta__ = { // jshint ignore:line
16991699
target = hoverItem.children(".k-link");
17001700
if (target.length > 0) {
17011701
that._click({ target: target[0], preventDefault: function () {}, enterKey: true });
1702-
if (hasChildren) {
1702+
if (hasChildren && !hoverItem.hasClass(DISABLEDSTATE)) {
17031703
that.open(hoverItem);
17041704
that._moveHover(hoverItem, that._childPopupElement(hoverItem).children().first());
17051705
} else {
@@ -1789,7 +1789,7 @@ var __meta__ = { // jshint ignore:line
17891789
if (!nextItem.length) {
17901790
nextItem = item.prevAll(lastSelector);
17911791
}
1792-
} else if (hasChildren) {
1792+
} else if (hasChildren && !item.hasClass(DISABLEDSTATE)) {
17931793
that.open(item);
17941794
nextItem = that._childPopupElement(item).children().first();
17951795
} else if (that.options.orientation == "horizontal") {

‎styles/mobile/common/navbar.less‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
line-height: 2.3em;
3131
margin-left: auto;
3232
margin-right: auto;
33+
34+
&:before {
35+
content: "";
36+
display: inline-block;
37+
width: 0;
38+
}
3339
}
3440

3541
.km-horizontal .km-view-title

‎styles/web/kendo.common-material.core.less‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -443,17 +443,6 @@
443443
}
444444

445445
.k-filebrowser {
446-
.k-filebrowser-toolbar {
447-
line-height: 3.5em;
448-
}
449-
450-
.k-filebrowser-toolbar .k-upload {
451-
margin-top: 3px;
452-
}
453-
454-
.k-filebrowser-toolbar .k-button-icon {
455-
margin-top: -3px;
456-
}
457446

458447
.k-upload .k-upload-button {
459448
vertical-align: bottom;

0 commit comments

Comments
 (0)