X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-script-v8%2Fsrc%2Futils%2Fv8-utils.cpp;h=ce656c0a39bfdb5de8629bc17c79a8094494163e;hp=b77d458497e988a3eb54d3231101c6110312667b;hb=b0d0b451bd3414c8f502810f45fcacba2882d717;hpb=6e1c16f82d6ea3d44f74e4dc11212ac18c963ef4 diff --git a/plugins/dali-script-v8/src/utils/v8-utils.cpp b/plugins/dali-script-v8/src/utils/v8-utils.cpp index b77d458..ce656c0 100644 --- a/plugins/dali-script-v8/src/utils/v8-utils.cpp +++ b/plugins/dali-script-v8/src/utils/v8-utils.cpp @@ -87,7 +87,7 @@ void LogError(const v8::FunctionCallbackInfo< v8::Value >& args) output += *utf8_value; output +="\n"; } - DALI_LOG_ERROR_NOFN( "JavaScript: %s",output.c_str() ); + DALI_LOG_ERROR_NOFN( "JavaScript: %s\n",output.c_str() ); } void GetFileContents(const std::string &fileName, std::string& contents) @@ -378,8 +378,6 @@ std::string PropertyNameToJavaScriptName(const std::string& hyphenatedName) return ret; } - - void ScriptError( const char* function, v8::Isolate* isolate, std::string errorString ) { v8::EscapableHandleScope scope( isolate); @@ -393,6 +391,12 @@ void ScriptError( const char* function, v8::Isolate* isolate, std::string errorS isolate->ThrowException( v8::String::NewFromUtf8( isolate, errorMsg.c_str()) ); } +void ScriptWarning( const char* function, std::string warningString ) +{ + std::string warningMsg = std::string(function) + std::string("(), ") + warningString; + DALI_LOG_WARNING("%s \n", warningMsg.c_str() ); +} + bool IsBooleanPrimitiveOrObject( const v8::Local& value ) { return ( value->IsBoolean() || value->IsBooleanObject()); @@ -504,6 +508,13 @@ Property::Value GetPropertyValueFromObject( bool& found, v8::Isolate* isolate, c v8::Local v = value->ToInt32(); return Dali::Property::Value(static_cast(v->Value())); } + else if( value->IsString() ) + { + found = true; + std::string valueString = V8Utils::v8StringToStdString( value ); + return Dali::Property::Value(valueString); + } + return daliPropertyValue; }