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 remote-tracking branch 'origin/tizen' into new_text
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
src
/
actors
/
actor-api.cpp
diff --git
a/plugins/dali-script-v8/src/actors/actor-api.cpp
b/plugins/dali-script-v8/src/actors/actor-api.cpp
index
4027a1b
..
c169b2a
100644
(file)
--- a/
plugins/dali-script-v8/src/actors/actor-api.cpp
+++ b/
plugins/dali-script-v8/src/actors/actor-api.cpp
@@
-19,7
+19,7
@@
#include "actor-api.h"
// EXTERNAL INCLUDES
#include "actor-api.h"
// EXTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/text-
view/text-view
.h>
+#include <dali-toolkit/public-api/controls/text-
controls/text-label
.h>
// INTERNAL INCLUDES
#include <v8-utils.h>
// INTERNAL INCLUDES
#include <v8-utils.h>
@@
-41,11
+41,11
@@
Actor GetActor( v8::Isolate* isolate, const v8::FunctionCallbackInfo<v8::Value>&
} //unanmed namespace
} //unanmed namespace
-namespace Text
View
Api
+namespace Text
Label
Api
{
Actor New( const v8::FunctionCallbackInfo< v8::Value >& args )
{
{
Actor New( const v8::FunctionCallbackInfo< v8::Value >& args )
{
- return Dali::Toolkit::Text
View
::New();
+ return Dali::Toolkit::Text
Label
::New();
}
}
}
}
@@
-485,7
+485,7
@@
void ActorApi::IsKeyboardFocusable( const v8::FunctionCallbackInfo<v8::Value>& a
*
* @for Actor
* @method getActorType
*
* @for Actor
* @method getActorType
- * @return {String} Actor, ImageActor,
TextActor,
MeshActor, Layer, CameraActor ...
+ * @return {String} Actor, ImageActor, MeshActor, Layer, CameraActor ...
*/
void ActorApi::GetActorType( const v8::FunctionCallbackInfo<v8::Value>& args )
{
*/
void ActorApi::GetActorType( const v8::FunctionCallbackInfo<v8::Value>& args )
{
@@
-557,7
+557,7
@@
void ActorApi::RotateBy( const v8::FunctionCallbackInfo<v8::Value>& args )
bool found( false );
Property::Value rotation = V8Utils::GetPropertyValueParameter( PARAMETER_0, found, isolate, args );
bool found( false );
Property::Value rotation = V8Utils::GetPropertyValueParameter( PARAMETER_0, found, isolate, args );
- if( rotation.GetType() != Property::
ORIEN
TATION )
+ if( rotation.GetType() != Property::
RO
TATION )
{
DALI_SCRIPT_EXCEPTION( isolate, "Rotation parameter missing" );
return;
{
DALI_SCRIPT_EXCEPTION( isolate, "Rotation parameter missing" );
return;