From: Richard Huang <r.huang@samsung.com>
Date: Thu, 5 Nov 2015 11:11:30 +0000 (+0000)
Subject: Allow to extract string value from a property with type of property map in JavaScript
X-Git-Tag: dali_1.1.9~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=dc1e05d24ad5545247513cefe7c5c3290f1af7c2;ds=sidebyside

Allow to extract string value from a property with type of property map in JavaScript

Change-Id: I6a59cb84c9c105a0692d1492a7e34f80946b988e
---

diff --git a/plugins/dali-script-v8/src/object/property-value-wrapper.cpp b/plugins/dali-script-v8/src/object/property-value-wrapper.cpp
index f518848..b9d7b4c 100644
--- a/plugins/dali-script-v8/src/object/property-value-wrapper.cpp
+++ b/plugins/dali-script-v8/src/object/property-value-wrapper.cpp
@@ -762,6 +762,13 @@ Dali::Property::Value PropertyValueWrapper::ExtractPropertyValue( v8::Isolate* i
         Dali::Property::Map propertyMap = V8Utils::GetPropertyMapFromObject(isolate, object);
         daliPropertyValue = Dali::Property::Value( propertyMap );
       }
+      else if( V8Utils::IsStringPrimitiveOrObject( v8Value) )
+      {
+        // There are special cases where a property with property map type can accept a string value,
+        // so we do the additional check here.
+        daliPropertyValue = Dali::Property::Value( V8Utils::GetStringValue( isolate, v8Value) );
+      }
+
       break;
     }
     case Dali::Property::NONE:
@@ -769,9 +776,9 @@ Dali::Property::Value PropertyValueWrapper::ExtractPropertyValue( v8::Isolate* i
     {
       break;
     }
-   } // switch type
+  } // switch type
 
-   return daliPropertyValue;
+  return daliPropertyValue;
 }
 
 void PropertyValueWrapper::NewRotation( const v8::FunctionCallbackInfo< v8::Value >& args)