Merge pull request #3323 from vishalduggal/timob-10804-30X

[TIMOB-10804] (3_0_X) Stop mangling TiDimension objects
tidev · Nov 12, 2012 · b7beec5 · b7beec5
2 parents c9cc724 + 41b7084
commit b7beec5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/iphone/Classes/TiAnimation.h b/iphone/Classes/TiAnimation.h
@@ -63,12 +63,12 @@
 @interface TiAnimation : TiProxy {
 @private
 	NSNumber	*zIndex;
-	NSNumber	*left;
-	NSNumber	*right;
-	NSNumber	*top;
-	NSNumber	*bottom;
-	NSNumber	*width;
-	NSNumber	*height;
+	id  left;
+	id  right;
+	id  top;
+	id  bottom;
+	id  width;
+	id  height;
 	NSNumber	*duration;
 	TiPoint		*center;
 	TiColor		*backgroundColor;
@@ -110,12 +110,12 @@
 
 // animatable properties against what is being animated
 @property(nonatomic,retain,readwrite) NSNumber	*zIndex;
-@property(nonatomic,retain,readwrite) NSNumber	*left;
-@property(nonatomic,retain,readwrite) NSNumber	*right;
-@property(nonatomic,retain,readwrite) NSNumber	*top;
-@property(nonatomic,retain,readwrite) NSNumber	*bottom;
-@property(nonatomic,retain,readwrite) NSNumber	*width;
-@property(nonatomic,retain,readwrite) NSNumber	*height;
+@property(nonatomic,retain,readwrite) id    left;
+@property(nonatomic,retain,readwrite) id    right;
+@property(nonatomic,retain,readwrite) id    top;
+@property(nonatomic,retain,readwrite) id    bottom;
+@property(nonatomic,retain,readwrite) id    width;
+@property(nonatomic,retain,readwrite) id    height;
 @property(nonatomic,retain,readwrite) NSNumber	*duration;
 @property(nonatomic,retain,readwrite) TiPoint	*center;
 @property(nonatomic,retain,readwrite) TiColor	*color;

diff --git a/iphone/Classes/TiAnimation.m b/iphone/Classes/TiAnimation.m
@@ -88,12 +88,12 @@ -(id)initWithDictionary:(NSDictionary*)properties context:(id<TiEvaluator>)conte
 }\
 
 		SET_FLOAT_PROP(zIndex,properties);
-		SET_FLOAT_PROP(left,properties);
-		SET_FLOAT_PROP(right,properties);
-		SET_FLOAT_PROP(top,properties);
-		SET_FLOAT_PROP(bottom,properties);
-		SET_FLOAT_PROP(width,properties);
-		SET_FLOAT_PROP(height,properties);
+		SET_ID_PROP(left,properties);
+		SET_ID_PROP(right,properties);
+		SET_ID_PROP(top,properties);
+		SET_ID_PROP(bottom,properties);
+		SET_ID_PROP(width,properties);
+		SET_ID_PROP(height,properties);
 		SET_FLOAT_PROP(duration,properties);
 		SET_FLOAT_PROP(opacity,properties);
 		SET_FLOAT_PROP(delay,properties);