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 "DALi Version 1.0.48" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
src
/
utils
/
v8-utils.cpp
diff --git
a/plugins/dali-script-v8/src/utils/v8-utils.cpp
b/plugins/dali-script-v8/src/utils/v8-utils.cpp
index
1d73b9c
..
3466198
100644
(file)
--- a/
plugins/dali-script-v8/src/utils/v8-utils.cpp
+++ b/
plugins/dali-script-v8/src/utils/v8-utils.cpp
@@
-64,7
+64,7
@@
void Log(const v8::FunctionCallbackInfo< v8::Value >& args)
std::cout << " ";
}
v8::String::Utf8Value utf8_value( args[i] );
std::cout << " ";
}
v8::String::Utf8Value utf8_value( args[i] );
- std::cout << *utf8_value;
+ std::cout << *utf8_value
<< "\n"
;
}
}
}
}
@@
-85,6
+85,7
@@
void LogError(const v8::FunctionCallbackInfo< v8::Value >& args)
}
v8::String::Utf8Value utf8_value( args[i] );
output += *utf8_value;
}
v8::String::Utf8Value utf8_value( args[i] );
output += *utf8_value;
+ output +="\n";
}
DALI_LOG_ERROR_NOFN( "JavaScript: %s",output.c_str() );
}
}
DALI_LOG_ERROR_NOFN( "JavaScript: %s",output.c_str() );
}
@@
-332,7
+333,7
@@
bool GetBooleanValue( v8::Isolate* isolate, const v8::Local<v8::Value>& value )
else if (value->IsBooleanObject() )
{
const v8::Local<v8::BooleanObject> object = v8::Local<v8::BooleanObject>::Cast(value);
else if (value->IsBooleanObject() )
{
const v8::Local<v8::BooleanObject> object = v8::Local<v8::BooleanObject>::Cast(value);
- return object->
ValueOf
();
+ return object->
BooleanValue
();
}
DALI_SCRIPT_EXCEPTION(isolate, "no bool found");
return false;
}
DALI_SCRIPT_EXCEPTION(isolate, "no bool found");
return false;
@@
-421,18
+422,12
@@
Property::Value GetPropertyValueFromObject( bool& found, v8::Isolate* isolate, c
v8::Local<v8::Number> v = value->ToNumber();
return Dali::Property::Value(static_cast<float>(v->Value()));
}
v8::Local<v8::Number> v = value->ToNumber();
return Dali::Property::Value(static_cast<float>(v->Value()));
}
- else if( value->IsInt32() )
+ else if( value->IsInt32()
|| value->IsUint32()
)
{
found = true;
v8::Local<v8::Int32> v = value->ToInt32();
return Dali::Property::Value(static_cast<int>(v->Value()));
}
{
found = true;
v8::Local<v8::Int32> v = value->ToInt32();
return Dali::Property::Value(static_cast<int>(v->Value()));
}
- else if ( value->IsUint32() )
- {
- found = true;
- v8::Local<v8::Uint32> v = value->ToUint32();
- return Dali::Property::Value(static_cast<unsigned int>(v->Value()));
- }
return daliPropertyValue;
}
return daliPropertyValue;
}
@@
-893,11
+888,6
@@
void CreatePropertyMap( v8::Isolate* isolate, const Property::Map& map, v8::Loca
v8Value = v8::Integer::New( isolate, value.Get<int>());
break;
}
v8Value = v8::Integer::New( isolate, value.Get<int>());
break;
}
- case Dali::Property::UNSIGNED_INTEGER:
- {
- v8Value = v8::Integer::New( isolate, value.Get<unsigned int>());
- break;
- }
case Dali::Property::STRING:
{
std::string string = value.Get< std::string >();
case Dali::Property::STRING:
{
std::string string = value.Get< std::string >();