Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-13986] Fix remote backgroundImage in view #7644

Merged
merged 1 commit into from
Feb 2, 2016
Merged

[TIMOB-13986] Fix remote backgroundImage in view #7644

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion iphone/Classes/TiUtils.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1872,6 +1872,10 @@ +(UIImage*)loadBackgroundImage:(id)image forProxy:(TiProxy*)proxy
else if ([image isKindOfClass:[NSString class]]) {
NSURL *bgURL = [TiUtils toURL:image proxy:proxy];
resultImage = [[ImageLoader sharedLoader] loadImmediateImage:bgURL];
if (resultImage==nil)
{
resultImage = [[ImageLoader sharedLoader] loadRemote:bgURL];
}
if (resultImage==nil && [image isEqualToString:@"Default.png"])
{
// special case where we're asking for Default.png and it's in Bundle not path
Expand All @@ -1886,7 +1890,7 @@ +(UIImage*)loadBackgroundImage:(id)image forProxy:(TiProxy*)proxy
}
}
else if ([image isKindOfClass:[TiBlob class]]) {
resultImage = [image image];
resultImage = [(TiBlob*)image image];
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To clarify: This just resolves/cleans a Xcode warning unrelated to the above code.

}
return resultImage;
}
Expand Down