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
Merge changes I150e1a74,Ie6d24150,I91081f5a into devel/master
[platform/core/uifw/dali-toolkit.git]
/
docs
/
content
/
shared-javascript-and-cpp-documentation
/
programming-languages.md
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
545d6c2
..
e2c4de2
100644
(file)
--- a/
docs/content/shared-javascript-and-cpp-documentation/programming-languages.md
+++ b/
docs/content/shared-javascript-and-cpp-documentation/programming-languages.md
@@
-1,5
+1,6
@@
-/**
- *
+<!--
+/**-->
+
# Programming Languages {#programming-languages}
DALi applications can be written in several different programming languages.
# Programming Languages {#programming-languages}
DALi applications can be written in several different programming languages.
@@
-61,7
+62,7
@@
actor.connect( "touched", onPressed );
"actor":"image",
"property":"position",
"value":[200,-100,0],
"actor":"image",
"property":"position",
"value":[200,-100,0],
- "alpha
-f
unction": "BOUNCE"
+ "alpha
F
unction": "BOUNCE"
}
]
}
}
]
}
@@
-71,8
+72,8
@@
actor.connect( "touched", onPressed );
{
"name":"image",
"type":"Actor",
{
"name":"image",
"type":"Actor",
- "anchor
-p
oint": "CENTER",
- "parent
-o
rigin": "CENTER",
+ "anchor
P
oint": "CENTER",
+ "parent
O
rigin": "CENTER",
"signals" :
[
{ "name" : "touched", "action": "play", "animation": "move" }
"signals" :
[
{ "name" : "touched", "action": "play", "animation": "move" }