X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-script-v8%2Fdocs%2Fcontent%2Factor.js;h=9b4b4ffe9ea7a1f00b33367b497b413b219ae463;hp=e2ce270f4c246cdd8e434a7ff3c2a2dfaf39dad9;hb=912e891b33f2b3b10392094c57b17eefa560b1fa;hpb=8c31a5ca493d17693e53f9909a4453b1fa058ab3 diff --git a/plugins/dali-script-v8/docs/content/actor.js b/plugins/dali-script-v8/docs/content/actor.js index e2ce270..9b4b4ff 100644 --- a/plugins/dali-script-v8/docs/content/actor.js +++ b/plugins/dali-script-v8/docs/content/actor.js @@ -9,7 +9,6 @@ ``` var actor = new dali.Actor(); -var imageActor = new dali.ImageActor(); var textActor = new dali.TextActor("hello world"); var camera = new dali.CameraActor(); var layer = new dali.Layer(); @@ -72,13 +71,13 @@ Note that since DALi is a 3D toolkit, this behaviour is the result of a default The actor provides the following call back events -| Name | Description | Parameters passed to call back | -|-------------------|----------------------------------------|--------------------------| -|touched | touch event | (actor, touchEvent ) | -|hovered | mouse or pointer hovering over actor | (actor, hoverEvent) | -|mouse-wheel-event | mouse wheel events | (actor, wheelEvent) | -|on-stage | actor has been moved on stage | (actor) | -|off-stage | actor has been moved off stage | (actor) | +| Name | Description | Parameters passed to call back | +|-----------------|----------------------------------------|--------------------------| +|touched | touch event | (actor, touchEvent ) | +|hovered | mouse or pointer hovering over actor | (actor, hoverEvent) | +|mouseWheelEvent | mouse wheel events | (actor, wheelEvent) | +|onStage | actor has been moved on stage | (actor) | +|offStage | actor has been moved off stage | (actor) | #### Touch event @@ -119,13 +118,13 @@ function OnPressed( actor, touchEvent ) var anim = new dali.Animation( 4 ); var rotation = new dali.Rotation( 90, 0, 0 ); // pitch, yaw, roll - anim.animateBy( actor, "rotation", rotation ); + anim.animateBy( actor, "orientation", rotation ); anim.play(); return true; } // connect to touch events -myActor.connect( "touched", onPressed ); +myActor.on( "touched", onPressed ); ``` @@ -144,7 +143,7 @@ hoverEvent = { } ``` // connect to touch events - myActor.connect( "hovered", onHover); + myActor.on( "hovered", onHover); #### Mouse wheel event @@ -162,7 +161,7 @@ mouseWheelEvent = { } // connect to touch events -myActor.connect( "mouse-wheel-event", onMouseWheel ); +myActor.on( "mouseWheelEvent", onMouseWheel ); ``` #### Key events @@ -196,8 +195,8 @@ See worldPositionX |FLOAT | ✘ | ✘ worldPositionY |FLOAT | ✘ | ✘ worldPositionZ |FLOAT | ✘ | ✘ - rotation |ROTATION | ✔ | ✔ - worldRotation |ROTATION | ✘ | ✘ + orientation |ROTATION | ✔ | ✔ + worldOrientation |ROTATION | ✘ | ✘ scale |VECTOR3 | ✔ | ✔ scaleX |FLOAT | ✔ | ✔ scaleY |FLOAT | ✔ | ✔ @@ -214,7 +213,7 @@ See name |STRING | ✔ | ✘ sensitive |BOOLEAN | ✔ | ✘ leaveRequired |BOOLEAN | ✔ | ✘ - inheritRotation |BOOLEAN | ✔ | ✘ + inheritOrientation |BOOLEAN | ✔ | ✘ inheritScale |BOOLEAN | ✔ | ✘ colorMode |NUMBER | ✔ | ✘ positionInheritance |NUMBER | ✔ | ✘ @@ -382,19 +381,19 @@ WORLD_POSITION_Z /** - * Actors rotation - * @property rotation + * Actors orientation + * @property orientation * @type dali Rotation object */ -ROTATION +ORIENTATION /** - * Actors world-rotation - * @property worldRotation + * Actors world-orientation + * @property worldOrientation * @type dali Rotation object ( read only) */ -WORLD_ROTATION +WORLD_ORIENTATION /** * Actors scale @@ -522,10 +521,10 @@ LEAVE_REQUIRED /** * Set whether a child actor inherits it's parent's orientation. * @type Boolean - * @property inheritRotation + * @property inheritOrientation * @default true */ -INHERIT_ROTATION, +INHERIT_ORIENTATION, /**