projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(V8 Plugin) Use new Touch API
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
src
/
signals
/
dali-any-javascript-converter.cpp
diff --git
a/plugins/dali-script-v8/src/signals/dali-any-javascript-converter.cpp
b/plugins/dali-script-v8/src/signals/dali-any-javascript-converter.cpp
index
faeaf25
..
b675779
100644
(file)
--- a/
plugins/dali-script-v8/src/signals/dali-any-javascript-converter.cpp
+++ b/
plugins/dali-script-v8/src/signals/dali-any-javascript-converter.cpp
@@
-66,9
+66,9
@@
v8::Local<v8::Value> DaliAnyConverter::ConvertToJavaScriptObject(v8::Isolate* is
{
returnValue = PropertyValueWrapper::WrapDaliProperty( isolate, value.Get<Vector3>() );
}
{
returnValue = PropertyValueWrapper::WrapDaliProperty( isolate, value.Get<Vector3>() );
}
- else if( typeInfo == typeid( Dali::Touch
Event
) )
+ else if( typeInfo == typeid( Dali::Touch
Data
) )
{
{
- returnValue = EventObjectGenerator::CreateTouch
Event( isolate, value.Get<TouchEvent
>() );
+ returnValue = EventObjectGenerator::CreateTouch
Data( isolate, value.Get<TouchData
>() );
}
else if( typeInfo == typeid( Dali::HoverEvent ) )
{
}
else if( typeInfo == typeid( Dali::HoverEvent ) )
{