projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
a073ebf
)
Support to extract values from property map within property map in JavaScript binding
12/51012/2
author
Richard Huang
<r.huang@samsung.com>
Wed, 4 Nov 2015 11:30:38 +0000
(11:30 +0000)
committer
Richard Huang
<r.huang@samsung.com>
Wed, 4 Nov 2015 11:33:58 +0000
(
03:33
-0800)
Change-Id: I70832fdff8b72bea73e200e88ff751d87b756234
plugins/dali-script-v8/src/utils/v8-utils.cpp
patch
|
blob
|
history
diff --git
a/plugins/dali-script-v8/src/utils/v8-utils.cpp
b/plugins/dali-script-v8/src/utils/v8-utils.cpp
index
8d83b55
..
4d09da9
100644
(file)
--- a/
plugins/dali-script-v8/src/utils/v8-utils.cpp
+++ b/
plugins/dali-script-v8/src/utils/v8-utils.cpp
@@
-434,6
+434,14
@@
Property::Map GetPropertyMapFromObject( v8::Isolate* isolate, const v8::Local<v8
{
propertyMap[ keyString ] = PropertyValueWrapper::VectorOrMatrixFromV8Array( isolate, value);
}
+ else if( value->IsObject() )
+ {
+ Dali::Property::Map map = V8Utils::GetPropertyMapFromObject(isolate, value->ToObject());
+ if( !map.Empty() )
+ {
+ propertyMap[ keyString ] = Dali::Property::Value( map );
+ }
+ }
}
return propertyMap;