Merge pull request #2360 from sptramer/timob-8955

[TIMOB-8955] Set gradient page context as execution context only if available.
tidev · Jun 11, 2012 · c712fd1 · c712fd1
2 parents 3783942 + 436bed7
commit c712fd1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/iphone/Classes/TiGradient.m b/iphone/Classes/TiGradient.m
@@ -280,7 +280,8 @@ +(TiGradient *)gradientFromObject:(id)value proxy:(TiProxy *)proxy
 {
 	if ([value isKindOfClass:[NSDictionary class]])
 	{
-		TiGradient * newGradient = [[[TiGradient alloc] _initWithPageContext:[proxy executionContext]] autorelease];
+        id<TiEvaluator> context = ([proxy executionContext] == nil) ? [proxy pageContext] : [proxy executionContext];
+		TiGradient * newGradient = [[[TiGradient alloc] _initWithPageContext:context] autorelease];
 		[newGradient _initWithProperties:value];
 		return newGradient;
 	}