Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix that allow binding key value to select component #74

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 69 additions & 3 deletions ui/select.reel/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,80 @@ exports.Select = AbstractSelect.specialize(/** @lends Select */{
}

// Select the current value.
selectedIndex = organizedContent.indexOf(this.value);

if (this.value) {
selectedIndex = this.getValueIndex(this.value, organizedContent);
}else{
selectedIndex = 0;
}

//selectedIndex = organizedContent.indexOf(this.value);
if (selectedIndex == -1) {
selectedIndex = 0;
}

if (this.element.selectedIndex !== selectedIndex) {
this.element.selectedIndex = selectedIndex;
this.element.selectedIndex = selectedIndex;
}
},

getValueIndex: {
value: function (value, options) {

var selectedIndex = -1;
var firstItem;
var itemType;

//If options length > 0, get the first item object type
if (options && options.length > 0) {
firstItem = options[0];
itemType = typeof firstItem;
} else {
return selectedIndex;
}

//Judge if we directly match the item or we match the value
if (typeof value == itemType) {
for (var i = 0, n = options.length; i < n; i++) {
var item = options[i];

//If the select has valuePropertyName, use item[this.valuePropertyName] to do compare with value[this.valuePropertyName]
//Otherwise, compare the item and value directly
if (this.valuePropertyName) {
if (item[this.valuePropertyName] == value[this.valuePropertyName]) {
selectedIndex = i;
break;
}
} else {
if (item == value) {
selectedIndex = i;
break;
}
}
}
} else {


for (i = 0, n = options.length; i < n; i++) {
item = options[i];

//If the select has valuePropertyName, use item[this.valuePropertyName] to compare with value
//Because value should be the key value.
if (this.valuePropertyName) {
if (item[this.valuePropertyName] == value) {
selectedIndex = i;
break;
}
} else {
if (item == value) {
selectedIndex = i;
break;
}
}

}
}

return selectedIndex;
}
},

Expand Down