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
Fix JavaScript docs, where orientation property still called rotation
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
docs
/
content
/
actor.js
diff --git
a/plugins/dali-script-v8/docs/content/actor.js
b/plugins/dali-script-v8/docs/content/actor.js
index
300ae3d
..
9b4b4ff
100644
(file)
--- 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 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();
var textActor = new dali.TextActor("hello world");
var camera = new dali.CameraActor();
var layer = new dali.Layer();
@@
-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
var anim = new dali.Animation( 4 );
var rotation = new dali.Rotation( 90, 0, 0 ); // pitch, yaw, roll
- anim.animateBy( actor, "
ro
tation", rotation );
+ anim.animateBy( actor, "
orien
tation", rotation );
anim.play();
return true;
}
// connect to touch events
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
}
```
// connect to touch events
- myActor.
connect
( "hovered", onHover);
+ myActor.
on
( "hovered", onHover);
#### Mouse wheel event
#### Mouse wheel event
@@
-162,7
+161,7
@@
mouseWheelEvent = {
}
// connect to touch events
}
// connect to touch events
-myActor.
connect
( "mouseWheelEvent", onMouseWheel );
+myActor.
on
( "mouseWheelEvent", onMouseWheel );
```
#### Key events
```
#### Key events
@@
-196,8
+195,8
@@
See
worldPositionX |FLOAT | ✘ | ✘
worldPositionY |FLOAT | ✘ | ✘
worldPositionZ |FLOAT | ✘ | ✘
worldPositionX |FLOAT | ✘ | ✘
worldPositionY |FLOAT | ✘ | ✘
worldPositionZ |FLOAT | ✘ | ✘
-
rotation
|ROTATION | ✔ | ✔
- world
Rotation
|ROTATION | ✘ | ✘
+
orientation
|ROTATION | ✔ | ✔
+ world
Orientation
|ROTATION | ✘ | ✘
scale |VECTOR3 | ✔ | ✔
scaleX |FLOAT | ✔ | ✔
scaleY |FLOAT | ✔ | ✔
scale |VECTOR3 | ✔ | ✔
scaleX |FLOAT | ✔ | ✔
scaleY |FLOAT | ✔ | ✔
@@
-214,7
+213,7
@@
See
name |STRING | ✔ | ✘
sensitive |BOOLEAN | ✔ | ✘
leaveRequired |BOOLEAN | ✔ | ✘
name |STRING | ✔ | ✘
sensitive |BOOLEAN | ✔ | ✘
leaveRequired |BOOLEAN | ✔ | ✘
- inherit
Rotation
|BOOLEAN | ✔ | ✘
+ inherit
Orientation
|BOOLEAN | ✔ | ✘
inheritScale |BOOLEAN | ✔ | ✘
colorMode |NUMBER | ✔ | ✘
positionInheritance |NUMBER | ✔ | ✘
inheritScale |BOOLEAN | ✔ | ✘
colorMode |NUMBER | ✔ | ✘
positionInheritance |NUMBER | ✔ | ✘
@@
-382,19
+381,19
@@
WORLD_POSITION_Z
/**
/**
- * Actors
ro
tation
- * @property
ro
tation
+ * Actors
orien
tation
+ * @property
orien
tation
* @type dali Rotation object
*/
* @type dali Rotation object
*/
-
RO
TATION
+
ORIEN
TATION
/**
/**
- * Actors world-
ro
tation
- * @property world
Ro
tation
+ * Actors world-
orien
tation
+ * @property world
Orien
tation
* @type dali Rotation object ( read only)
*/
* @type dali Rotation object ( read only)
*/
-WORLD_
RO
TATION
+WORLD_
ORIEN
TATION
/**
* Actors scale
/**
* Actors scale
@@
-522,10
+521,10
@@
LEAVE_REQUIRED
/**
* Set whether a child actor inherits it's parent's orientation.
* @type Boolean
/**
* Set whether a child actor inherits it's parent's orientation.
* @type Boolean
- * @property inherit
Ro
tation
+ * @property inherit
Orien
tation
* @default true
*/
* @default true
*/
-INHERIT_
RO
TATION,
+INHERIT_
ORIEN
TATION,
/**
/**