Merge "Add IMPORT_DALI_API to item-layout" into tizen

diff --git a/build/tizen/docs/Makefile.am b/build/tizen/docs/Makefile.am
index 8d70825..1314654 100644 (file)
--- a/build/tizen/docs/Makefile.am
+++ b/build/tizen/docs/Makefile.am
@@ -5,3 +5,6 @@ all-local:
        @cat doxygen-errors.txt
        @if [ -s doxygen-errors.txt ]; then exit 1 ; fi
        @rm doxygen-errors.txt
+# Build JavaScript API documentation using yuidoc ( Yahoo JavaScript Documentation Tool )
+# We first test yuidoc exists, then change in to the dali-script-v8 docs directory and run yuidoc
+       @if [ ! `which yuidoc` = "" ]; then cd ../../../plugins/dali-script-v8/docs && yuidoc --config yuidoc.json -e ".cpp,.js,.md"  -o generated .. ../../../docs/content/shared-javascript-and-cpp-documentation/ ; fi
\ No newline at end of file

diff --git a/plugins/dali-script-v8/docs/content/constants.js b/plugins/dali-script-v8/docs/content/constants.js
index a6b2e1e..d70d538 100644 (file)
--- a/plugins/dali-script-v8/docs/content/constants.js
+++ b/plugins/dali-script-v8/docs/content/constants.js
@@ -4,7 +4,7 @@
 
 Constants accessible under the dali global object.
   
-    actor.parentOrigin = dali.BACK_TOP_LEFT;
+    actor.parentOrigin = dali.TOP_LEFT;
     actor.color = dali.COLOR_RED;
     actor.setBlendFunc( dali.BLEND_FACTOR_ONE_MINUS_SRC_COLOR, dali.BLEND_FACTOR_SRC_ALPHA_SATURATE );
 
@@ -12,15 +12,6 @@ Constants accessible under the dali global object.
 | Constant Name | value |
 |---------------|-------|
 |  ** actor.parentOrigin and actor.anchorPoint  **      |                      |
-|BACK_TOP_LEFT      |  (0.0f, 0.0f, 0.0f)  |
-|BACK_TOP_CENTER    |  (0.5f, 0.0f, 0.0f)  |
-|BACK_TOP_RIGHT     |  (1.0f, 0.0f, 0.0f)  |
-|BACK_CENTER_LEFT   |  (0.0f, 0.5f, 0.0f)  |
-|BACK_CENTER        |  (0.5f, 0.5f, 0.0f)  |
-|BACK_CENTER_RIGHT  |  (1.0f, 0.5f, 0.0f)  |
-|BACK_BOTTOM_LEFT   |  (0.0f, 1.0f, 0.0f)  |
-|BACK_BOTTOM_CENTER  |  (0.5f, 1.0f, 0.0f)  |
-|BACK_BOTTOM_RIGHT   |  (1.0f, 1.0f, 0.0f)  |
 |TOP_LEFT            |  (0.0f, 0.0f, 0.5f)  |
 |TOP_CENTER          |  (0.5f, 0.0f, 0.5f)  |
 |TOP_RIGHT          |  (1.0f, 0.0f, 0.5f)  |
@@ -31,16 +22,6 @@ Constants accessible under the dali global object.
 |BOTTOM_CENTER       |  (0.5f, 1.0f, 0.5f)  |
 |BOTTOM_RIGHT        |  (1.0f, 1.0f, 0.5f)  |
 
-|FRONT_TOP_LEFT      |  (0.0f, 0.0f, 1.0f)  |
-|FRONT_TOP_CENTER    |  (0.5f, 0.0f, 1.0f)  |
-|FRONT_TOP_RIGHT     |  (1.0f, 0.0f, 1.0f)  |
-|FRONT_CENTER_LEFT   |  (0.0f, 0.5f, 1.0f)  |
-|FRONT_CENTER        |  (0.5f, 0.5f, 1.0f)  |
-|FRONT_CENTER_RIGHT  |  (1.0f, 0.5f, 1.0f)  |
-|FRONT_BOTTOM_LEFT   |  (0.0f, 1.0f, 1.0f)  |
-|FRONT_BOTTOM_CENTER |  (0.5f, 1.0f, 1.0f)  |
-|FRONT_BOTTOM_RIGHT  |  (1.0f, 1.0f, 1.0f)  |
-
 
 |** Vector3 ** | |
 |VECTOR3_ONE                  |  (1.0f, 1.0f, 1.0f)         |

diff --git a/plugins/dali-script-v8/docs/content/shader-effect.js b/plugins/dali-script-v8/docs/content/shader-effect.js
index ea1eba8..eedfafa 100644 (file)
--- a/plugins/dali-script-v8/docs/content/shader-effect.js
+++ b/plugins/dali-script-v8/docs/content/shader-effect.js
@@ -168,7 +168,7 @@ var animOptions = {
 // if we go to 1.0 then it will go to a full box
 shaderAnim.animateTo( revealEffect, "uRadius", 0.5,animOptions);
 shaderAnim.play();
-
+```
 * * *
 ### Example of paper twisting in the wind with color (Vertex + Fragment Shader)
 
@@ -185,7 +185,7 @@ vertices. To do this we can break the image into a grid using the gridX and grid
 
 <img src="../assets/img/shader-grid-hint.png">
 
-
+```
 createTwistEffect = function()
 {
 

diff --git a/plugins/dali-script-v8/src/constants/constants-wrapper.cpp b/plugins/dali-script-v8/src/constants/constants-wrapper.cpp
index 1124956..e7c4c16 100644 (file)
--- a/plugins/dali-script-v8/src/constants/constants-wrapper.cpp
+++ b/plugins/dali-script-v8/src/constants/constants-wrapper.cpp
@@ -65,16 +65,6 @@ struct IntegerPair
 
 const Vector3Pair Vector3Table[] =
 {
-    { "BACK_TOP_LEFT"      , ParentOrigin::BACK_TOP_LEFT      },
-    { "BACK_TOP_CENTER"    , ParentOrigin::BACK_TOP_CENTER    },
-    { "BACK_TOP_RIGHT"     , ParentOrigin::BACK_TOP_RIGHT     },
-    { "BACK_CENTER_LEFT"   , ParentOrigin::BACK_CENTER_LEFT   },
-    { "BACK_CENTER"        , ParentOrigin::BACK_CENTER        },
-    { "BACK_CENTER_RIGHT"  , ParentOrigin::BACK_CENTER_RIGHT  },
-    { "BACK_BOTTOM_LEFT"   , ParentOrigin::BACK_BOTTOM_LEFT   },
-    { "BACK_BOTTOM_CENTER" , ParentOrigin::BACK_BOTTOM_CENTER },
-    { "BACK_BOTTOM_RIGHT"  , ParentOrigin::BACK_BOTTOM_RIGHT  },
-
     { "TOP_LEFT"            , ParentOrigin::TOP_LEFT          },
     { "TOP_CENTER"          , ParentOrigin::TOP_CENTER        },
     { "TOP_RIGHT"           , ParentOrigin::TOP_RIGHT         },
@@ -85,17 +75,6 @@ const Vector3Pair Vector3Table[] =
     { "BOTTOM_CENTER"       , ParentOrigin::BOTTOM_CENTER     },
     { "BOTTOM_RIGHT"        , ParentOrigin::BOTTOM_RIGHT      },
 
-    { "FRONT_TOP_LEFT"      , ParentOrigin::FRONT_TOP_LEFT     },
-    { "FRONT_TOP_CENTER"    , ParentOrigin::FRONT_TOP_CENTER   },
-    { "FRONT_TOP_RIGHT"     , ParentOrigin::FRONT_TOP_RIGHT    },
-    { "FRONT_CENTER_LEFT"   , ParentOrigin::FRONT_CENTER_LEFT  },
-    { "FRONT_CENTER"        , ParentOrigin::FRONT_CENTER       },
-    { "FRONT_CENTER_RIGHT"  , ParentOrigin::FRONT_CENTER_RIGHT },
-    { "FRONT_BOTTOM_LEFT"   , ParentOrigin::FRONT_BOTTOM_LEFT  },
-    { "FRONT_BOTTOM_CENTER" , ParentOrigin::FRONT_BOTTOM_CENTER},
-    { "FRONT_BOTTOM_RIGHT"  , ParentOrigin::FRONT_BOTTOM_RIGHT },
-
-
     { "VECTOR3_ONE"                  ,      Vector3::ONE                        },
     { "VECTOR3_XAXIS"                ,      Vector3::XAXIS                      },
     { "VECTOR3_YAXIS"                ,      Vector3::YAXIS                      },