Fix JavaScript docs, where orientation property still called rotation 82/57782/3
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 22 Jan 2016 13:37:07 +0000 (13:37 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Mon, 25 Jan 2016 16:48:34 +0000 (16:48 +0000)
Change-Id: I9442b946debf8801f49adadd8de54904fc433560

plugins/dali-script-v8/docs/content/actor.js
plugins/dali-script-v8/docs/content/constants.js

index 98b35a4..9b4b4ff 100644 (file)
@@ -118,7 +118,7 @@ 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;
 }
@@ -195,8 +195,8 @@ See
  worldPositionX         |FLOAT       | &#10008;     | &#10008;
  worldPositionY         |FLOAT       | &#10008;     | &#10008;
  worldPositionZ         |FLOAT       | &#10008;     | &#10008;
rotation               |ROTATION    | &#10004;     | &#10004;
- worldRotation          |ROTATION    | &#10008;     | &#10008;
orientation            |ROTATION    | &#10004;     | &#10004;
+ worldOrientation       |ROTATION    | &#10008;     | &#10008;
  scale                  |VECTOR3     | &#10004;     | &#10004;
  scaleX                 |FLOAT       | &#10004;     | &#10004;
  scaleY                 |FLOAT       | &#10004;     | &#10004;
@@ -213,7 +213,7 @@ See
  name                   |STRING      | &#10004;     | &#10008;
  sensitive              |BOOLEAN     | &#10004;     | &#10008;
  leaveRequired          |BOOLEAN     | &#10004;     | &#10008;
- inheritRotation        |BOOLEAN     | &#10004;     | &#10008;
+ inheritOrientation     |BOOLEAN     | &#10004;     | &#10008;
  inheritScale           |BOOLEAN     | &#10004;     | &#10008;
  colorMode              |NUMBER      | &#10004;     | &#10008;
  positionInheritance    |NUMBER      | &#10004;     | &#10008;
@@ -381,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
@@ -521,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,
 
 
 /**
index a09ed33..0d27ff6 100644 (file)
@@ -169,24 +169,20 @@ Constants accessible under the dali global object.
 |GEOMETRY_TRIANGLE_STRIP              | integer value  |
 
 |**Property type ** | |
-|PROPERTY_NONE                        | integer value  |
+|PROPERTY_NONE                        | none  |
 |PROPERTY_BOOLEAN                     | integer value  |
-|PROPERTY_FLOAT                       | integer value  |
+|PROPERTY_FLOAT                       | float value  |
 |PROPERTY_INTEGER                     | integer value  |
-|PROPERTY_VECTOR2                     | integer value  |
-|PROPERTY_VECTOR3                     | integer value  |
-|PROPERTY_VECTOR4                     | integer value  |
-|PROPERTY_MATRIX3                     | integer value  |
-|PROPERTY_MATRIX                      | integer value  |
-|PROPERTY_RECTANGLE                   | integer value  |
-|PROPERTY_ROTATION                    | integer value  |
-|PROPERTY_STRING                      | integer value  |
-|PROPERTY_ARRAY                       | integer value  |
-|PROPERTY_MAP                         | integer value  |
-|PROPERTY_INVALID_INDEX               | integer value  |
-|PROPERTY_READ_ONLY                   | integer value  |
-|PROPERTY_READ_WRITE                  | integer value  |
-|PROPERTY_ANIMATABLE                  | integer value  |
+|PROPERTY_VECTOR2                     | Array[ float, float ] |
+|PROPERTY_VECTOR3                     | Array[ float, float, float ]  |
+|PROPERTY_VECTOR4                     | Array[ float, float, float, float ]  |
+|PROPERTY_MATRIX3                     | Object         |
+|PROPERTY_MATRIX                      | Object         |
+|PROPERTY_RECTANGLE                   | Object |
+|PROPERTY_ORIENTATION                 | Object  |
+|PROPERTY_STRING                      | String  |
+|PROPERTY_ARRAY                       | Object   |
+|PROPERTY_MAP                         | Object  |
 
 |**Item layout type ** | |
 |ITEM_LAYOUT_LIST                     | integer value  |