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
Merge "text-decorator to use ImageView instead of ImageActors" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
src
/
animation
/
animation-api.cpp
diff --git
a/plugins/dali-script-v8/src/animation/animation-api.cpp
b/plugins/dali-script-v8/src/animation/animation-api.cpp
index
653f1d3
..
0db4482
100644
(file)
--- a/
plugins/dali-script-v8/src/animation/animation-api.cpp
+++ b/
plugins/dali-script-v8/src/animation/animation-api.cpp
@@
-245,9
+245,9
@@
bool GetAnimationParameters( v8::Isolate* isolate,
AnimationParameters& animParams,
AnimationApi::AnimationParameterType type)
{
AnimationParameters& animParams,
AnimationApi::AnimationParameterType type)
{
- // used for things like anim.AnimateBy( myImage
Actor
, property-name, property-value (or Javascript number array));
+ // used for things like anim.AnimateBy( myImage
View
, property-name, property-value (or Javascript number array));
// 1 extract property handle from param1.
// 1 extract property handle from param1.
- // 2 extract property name from param2 (
can be in the format "u-color" or "uColor"
+ // 2 extract property name from param2 (
in the format "uColor" )
// 3 extract PropertyValue from param3
// 4 extract animation options ( delay, duration, alpha func)
// 3 extract PropertyValue from param3
// 4 extract animation options ( delay, duration, alpha func)
@@
-273,9
+273,7
@@
bool GetAnimationParameters( v8::Isolate* isolate,
if( index == Property::INVALID_INDEX )
{
if( index == Property::INVALID_INDEX )
{
- // convert the property name from "uColor" to "u-color"
- std::string convetedName = V8Utils::JavaScriptNameToPropertyName( propertyName );
- index = animParams.target.GetPropertyIndex( convetedName );
+ index = animParams.target.GetPropertyIndex( propertyName );
}
animParams.propertyIndex = index;
}
animParams.propertyIndex = index;