Skip to content

Commit cc1b4ab

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 890a3ce commit cc1b4ab

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/kendo.combobox.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ var __meta__ = { // jshint ignore:line
142142
suggest: false,
143143
cascadeFrom: "",
144144
cascadeFromField: "",
145+
cascadeFromParentField: "",
145146
ignoreCase: true,
146147
animation: {},
147148
virtual: false,
@@ -809,7 +810,7 @@ var __meta__ = { // jshint ignore:line
809810

810811
if(dataItem){
811812
shouldTrigger = that._value(dataItem) !== List.unifyType(that.value(), typeof that._value(dataItem));
812-
813+
813814
if(!shouldTrigger){
814815
that.input.val(that._accessor());
815816
}
@@ -991,7 +992,7 @@ var __meta__ = { // jshint ignore:line
991992

992993
if(dataItem){
993994
shouldTrigger = that._value(dataItem) !== List.unifyType(that.value(), typeof that._value(dataItem));
994-
995+
995996
if(!shouldTrigger){
996997
that.input.val(that._accessor());
997998
}

src/kendo.dropdownlist.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ var __meta__ = { // jshint ignore:line
160160
optionLabel: "",
161161
cascadeFrom: "",
162162
cascadeFromField: "",
163+
cascadeFromParentField: "",
163164
ignoreCase: true,
164165
animation: {},
165166
filter: "none",

0 commit comments

Comments
 (0)