X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=docs%2Fcontent%2Fshared-javascript-and-cpp-documentation%2Fprogramming-languages.md;h=5938e530891664593c8bd5ef55ba5172e7d2c134;hb=805ae527fca54726f894fb9936c288c7c0f7dbe7;hp=85393d6f5e585add0515d2abfb4e5beba5057cca;hpb=9f9bd6287b64fab61422e8b4a0d61a379c47176c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/docs/content/shared-javascript-and-cpp-documentation/programming-languages.md b/docs/content/shared-javascript-and-cpp-documentation/programming-languages.md index 85393d6..5938e53 100644 --- a/docs/content/shared-javascript-and-cpp-documentation/programming-languages.md +++ b/docs/content/shared-javascript-and-cpp-documentation/programming-languages.md @@ -13,15 +13,15 @@ actor.SetParentOrigin( Dali::ParentOrigin::CENTER ); actor.SetAnchorPoint( Dali::AnchorPoint::CENTER ); Dali::Stage::GetCurrent().Add( actor ); ... -bool OnPressed( Dali::Actor, const TouchEvent& event ) +bool OnPressed( Dali::Actor, const TouchData& touch ) { Dali::Animation anim = Dali::Animation::New( 1.5f ); - anim.AnimateTo( Property( actor, Actor::Property::POSITION ), Vector3( 200,-100,0), AlphaFunctions::Bounce ); + anim.AnimateTo( Property( actor, Actor::Property::POSITION ), Vector3( 200, -100, 0 ), AlphaFunctions::Bounce ); anim.play(); return true; // consume the touch event } ... -actor.TouchedSignal().Connect( &OnPressed ); +actor.TouchSignal().Connect( &OnPressed ); ~~~ */ @@ -34,16 +34,16 @@ actor.parentOrigin = dali.CENTER; actor.anchorPoint = dali.CENTER; dali.stage.add( actor ); ... -function onPressed( actor, touchEvent ) +function onPressed( actor, touch ) { var animOptions = { alpha: "bounce", delay: 0, duration: 15 }; var anim = new dali.Animation(); - anim.animateTo( actor, "position", [ 200,-100,0], animOptions ); + anim.animateTo( actor, "position", [ 200, -100, 0 ], animOptions ); anim.play(); return true; // consume the touch event } ... -actor.connect( "touched", onPressed ); +actor.connect( "touch", onPressed ); ~~~ @@ -62,7 +62,7 @@ actor.connect( "touched", onPressed ); "actor":"image", "property":"position", "value":[200,-100,0], - "alpha-function": "BOUNCE" + "alphaFunction": "BOUNCE" } ] } @@ -72,11 +72,11 @@ actor.connect( "touched", onPressed ); { "name":"image", "type":"Actor", - "anchor-point": "CENTER", - "parent-origin": "CENTER", + "anchorPoint": "CENTER", + "parentOrigin": "CENTER", "signals" : [ - { "name" : "touched", "action": "play", "animation": "move" } + { "name" : "touch", "action": "play", "animation": "move" } ] } ]