Merge pull request #4770 from vishalduggal/timob-15319

[TIMOB-15319] Fix Search bar background image
tidev · Oct 8, 2013 · fd835dd · fd835dd
2 parents a456eef + 46e4918
commit fd835dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/iphone/Classes/TiUILabel.m b/iphone/Classes/TiUILabel.m
@@ -260,11 +260,6 @@ -(void) updateBackgroundImageFrameWithPadding
     [self backgroundImageLayer].frame = backgroundFrame;
 }
 
--(void)setBackgroundImage_:(id)url
-{
-    [super setBackgroundImage_:url];
-}
-
 -(void)setBackgroundPaddingLeft_:(id)left
 {
     padding.origin.x = [TiUtils floatValue:left];

diff --git a/iphone/Classes/TiUISearchBar.m b/iphone/Classes/TiUISearchBar.m
@@ -15,6 +15,7 @@
 #import "TiUtils.h"
 #import "TiUISearchBarProxy.h"
 #import "TiUISearchBar.h"
+#import "ImageLoader.h"
 
 @implementation TiUISearchBar
 
@@ -143,15 +144,11 @@ -(void)setBarColor_:(id)value
 	}
 }
 
--(CALayer *)backgroundImageLayer
+-(void)setBackgroundImage_:(id)arg
 {
-	if(backgroundLayer==nil)
-	{
-		backgroundLayer = [[CALayer alloc] init];
-		[backgroundLayer setFrame:[self bounds]];
-		[[[self searchBar] layer] insertSublayer:backgroundLayer atIndex:1];
-	}
-	return backgroundLayer;
+    UIImage *image = [self loadImage:arg];
+    [[self searchBar] setBackgroundImage:image];
+    self.backgroundImage = arg;
 }
 
 #pragma mark Delegate