Skip to content

Commit e9c9ab4

Browse files
committed
Revert "BREAKING CHANGE: List valueId values array becomes an Object value: valueString"
This reverts commit 60272ab.
1 parent 60272ab commit e9c9ab4

File tree

2 files changed

+6
-19
lines changed

2 files changed

+6
-19
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ node_modules
1212
.idea
1313
.tags
1414
.vscode
15-
16-
ozwcache_*.xml

src/utils.cc

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -128,25 +128,14 @@ void setValObj(Local<Object> &valobj, OpenZWave::ValueID &value)
128128
}
129129
case OpenZWave::ValueID::ValueType_List:
130130
{
131-
int32 val;
132-
::std::vector <::std::string > items;
133-
::std::vector <int32> itemsvalues;
134-
v8::Local<v8::Object> values = Nan::New<v8::Object>();
135-
131+
::std::string val;
132+
::std::vector<::std::string> items;
136133
// populate array of all available items in the list
137-
OZWManager( GetValueListItems, value, &items);
138-
OZWManager( GetValueListValues, value, &itemsvalues);
139-
140-
// popolate the object value: item
141-
for (int i = 0; (unsigned)i < items.size(); i++) {
142-
Nan::Set(values, Nan::New<v8::String>(::std::to_string(itemsvalues[i])).ToLocalChecked(), Nan::New<v8::String>(items[i].c_str()).ToLocalChecked());
143-
}
144-
145-
Nan::Set(valobj, Nan::New<v8::String>("values").ToLocalChecked(), values);
134+
OZWManager(GetValueListItems, value, &items);
135+
AddArrayOfStringProp(valobj, values, items);
146136
// populated selected element
147-
OZWManager( GetValueListSelection, value, &val);
148-
AddIntegerProp(valobj, value, val);
149-
break;
137+
OZWManager(GetValueListSelection, value, &val);
138+
AddStringProp(valobj, value, val.c_str()) break;
150139
}
151140
case OpenZWave::ValueID::ValueType_Short:
152141
{

0 commit comments

Comments
 (0)