Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: btelintelo/campjoy
base: daddec6829
...
head fork: btelintelo/campjoy
compare: 427283006e
  • 3 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
View
18 ios/Camp Joy Outdoors/CJOIdentifyNavigationViewController.m
@@ -47,19 +47,15 @@ - (void)viewDidLoad
-(void)handleGlossaryNotification:(NSNotification *) notification {
NSDictionary * userInfo = notification.userInfo;
NSString * term = [userInfo[@"term"] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-;
- dispatch_async(dispatch_get_main_queue(), ^{
- CJOGlossaryDefinitionViewController * definitionViewController = [[UIStoryboard storyboardWithName:@"glossary_iPhone" bundle:nil] instantiateViewControllerWithIdentifier:@"definition"];
- definitionViewController.word = term;
- [self pushViewController:definitionViewController animated:YES];
- });
-}
+ NSString *boardName = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone ? @"glossary_iPhone" : @"glossary_iPad";
+ UIStoryboard *board = [UIStoryboard storyboardWithName:boardName bundle:nil];
+
+ CJOGlossaryDefinitionViewController *definitionViewController = [board instantiateViewControllerWithIdentifier:@"definition"];
+ definitionViewController.word = term;
+ [self pushViewController:definitionViewController animated:YES];
-- (void)didReceiveMemoryWarning
-{
- [super didReceiveMemoryWarning];
- // Dispose of any resources that can be recreated.
}
+
@end
View
2  scripts/imgsizer.rb
@@ -20,11 +20,13 @@ def prerender(dirname, filename)
scales.each do|scale|
width = (size * scale).to_i
thumbname = "trees/#{slug}/#{basename}#{ext.downcase}"
+ androidthumbname = "trees/#{slug}_#{basename}#{ext.downcase}"
if(File.exist?(thumbname) == false)
original = fullname
image = Magick::ImageList.new(original)
thumb = image.resize_to_fit(width)
thumb.write(thumbname)
+ thumb.write(androidthumbname)
thumb = nil
end
end

No commit comments for this range

Something went wrong with that request. Please try again.