Merge pull request #8517 from hansemannn/TIMOB-24040

[TIMOB-24040] iOS: Handle empty string ("") in backgroundImage
tidev · Oct 17, 2016 · fb0212a · fb0212a
2 parents 89dcd1a + 7102a4a
commit fb0212a
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/iphone/Classes/TiUtils.m b/iphone/Classes/TiUtils.m
@@ -1983,28 +1983,28 @@ +(UIImage*)loadBackgroundImage:(id)image forProxy:(TiProxy*)proxy
     UIImage* resultImage = nil;
     if ([image isKindOfClass:[UIImage class]]) {
         resultImage = image;
-    }
-    else if ([image isKindOfClass:[NSString class]]) {
+    } else if ([image isKindOfClass:[NSString class]]) {
+        if ([image isEqualToString:@""]) {
+            return nil;
+        }
+
         NSURL *bgURL = [TiUtils toURL:image proxy:proxy];
         resultImage = [[ImageLoader sharedLoader] loadImmediateImage:bgURL];
-        if (resultImage==nil)
+        if (resultImage == nil)
         {
             resultImage = [[ImageLoader sharedLoader] loadRemote:bgURL];
         }
-        if (resultImage==nil && [image isEqualToString:@"Default.png"])
-        {
+        if (resultImage == nil && [image isEqualToString:@"Default.png"]) {
             // special case where we're asking for Default.png and it's in Bundle not path
             resultImage = [UIImage imageNamed:image];
         }
-        if((resultImage != nil) && ([resultImage imageOrientation] != UIImageOrientationUp))
-        {
+        if((resultImage != nil) && ([resultImage imageOrientation] != UIImageOrientationUp)) {
             resultImage = [UIImageResize resizedImage:[resultImage size] 
                                  interpolationQuality:kCGInterpolationNone 
                                                 image:resultImage 
                                                 hires:NO];
         }
-    }
-    else if ([image isKindOfClass:[TiBlob class]]) {
+    } else if ([image isKindOfClass:[TiBlob class]]) {
         resultImage = [(TiBlob*)image image];
     }
     return resultImage;