diff --git a/media/iphone/Classes/StoryDetailViewController.m b/media/iphone/Classes/StoryDetailViewController.m index 7ddfdc214..fa092dcd3 100644 --- a/media/iphone/Classes/StoryDetailViewController.m +++ b/media/iphone/Classes/StoryDetailViewController.m @@ -146,8 +146,8 @@ sharingHtmlString = [NSString stringWithFormat:@ "
" "
" - "Share this story" - "Save this story" + "Share this story" +// "Save this story" "
"]; NSString *story_author = @""; if ([appDelegate.activeStory objectForKey:@"story_authors"]) { @@ -182,12 +182,12 @@ [appDelegate.activeStory objectForKey:@"story_title"], story_author, story_tags]; - NSString *htmlString = [NSString stringWithFormat:@"%@ %@%@
%@
", + NSString *htmlString = [NSString stringWithFormat:@"%@ %@%@
%@
%@", universalImgCssString, customImgCssString, storyHeader, - [appDelegate.activeStory objectForKey:@"story_content"]//, - //sharingHtmlString + [appDelegate.activeStory objectForKey:@"story_content"], + sharingHtmlString ]; NSLog(@"\n\n\n\nstory content\n\n\n%@
%@
\n\n\n", storyHeader, [appDelegate.activeStory objectForKey:@"story_content"]); @@ -260,10 +260,14 @@ shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType { if (navigationType == UIWebViewNavigationTypeLinkClicked) { NSURL *url = [request URL]; - [appDelegate showOriginalStory:url]; - return NO; + if ([[url absoluteString] isEqualToString: @"nb-share://share-link"]) { + [appDelegate showShareView]; + return NO; + } else { + [appDelegate showOriginalStory:url]; + return NO; + } } - return YES; } diff --git a/media/iphone/Resources-iPad/Classes/FeedDetailViewController~ipad.xib b/media/iphone/Resources-iPad/Classes/FeedDetailViewController~ipad.xib index c3ec423e8..58ee830ab 100644 --- a/media/iphone/Resources-iPad/Classes/FeedDetailViewController~ipad.xib +++ b/media/iphone/Resources-iPad/Classes/FeedDetailViewController~ipad.xib @@ -1467,6 +1467,7 @@ moveSiteViewController navigationController originalStoryViewController + shareViewController splitStoryController splitStoryDetailNavigationController splitStoryDetailViewController @@ -1487,6 +1488,7 @@ MoveSiteViewController UINavigationController OriginalStoryViewController + ShareViewController UISplitViewController UINavigationController SplitStoryDetailViewController @@ -1510,6 +1512,7 @@ moveSiteViewController navigationController originalStoryViewController + shareViewController splitStoryController splitStoryDetailNavigationController splitStoryDetailViewController @@ -1566,6 +1569,10 @@ originalStoryViewController OriginalStoryViewController + + shareViewController + ShareViewController + splitStoryController UISplitViewController @@ -1863,6 +1870,85 @@ ./Classes/OriginalStoryViewController.h + + ShareViewController + UIViewController + + YES + + YES + doCancelButton: + doShareThisStory: + doToggleButton: + + + YES + id + id + id + + + + YES + + YES + doCancelButton: + doShareThisStory: + doToggleButton: + + + YES + + doCancelButton: + id + + + doShareThisStory: + id + + + doToggleButton: + id + + + + + YES + + YES + appDelegate + commentField + + + YES + NewsBlurAppDelegate + UITextView + + + + YES + + YES + appDelegate + commentField + + + YES + + appDelegate + NewsBlurAppDelegate + + + commentField + UITextView + + + + + IBProjectSource + ./Classes/ShareViewController.h + + SplitStoryDetailViewController UIViewController @@ -1891,6 +1977,7 @@ YES doNextUnreadStory doPreviousStory + doShareButton: toggleFontSize: @@ -1898,6 +1985,7 @@ id id id + id @@ -1906,6 +1994,7 @@ YES doNextUnreadStory doPreviousStory + doShareButton: toggleFontSize: @@ -1918,6 +2007,10 @@ doPreviousStory id + + doShareButton: + id + toggleFontSize: id diff --git a/media/iphone/Resources-iPad/Classes/StoryDetailViewController~ipad.xib b/media/iphone/Resources-iPad/Classes/StoryDetailViewController~ipad.xib index cf97926d3..edd7b2329 100644 --- a/media/iphone/Resources-iPad/Classes/StoryDetailViewController~ipad.xib +++ b/media/iphone/Resources-iPad/Classes/StoryDetailViewController~ipad.xib @@ -4461,7 +4461,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {{356, 17}, {56, 11}} - NO IBIPadFramework 0.5 @@ -4508,18 +4507,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 20 - - Share - IBIPadFramework - 1 - - - - A - IBIPadFramework - 1 - - Next unread IBIPadFramework @@ -4637,22 +4624,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 58 - - - toggleFontSize: - - - - 73 - - - - doShareButton: - - - - 75 - @@ -4697,8 +4668,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE - - @@ -4746,16 +4715,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE - - 72 - - - - - 74 - - - @@ -4777,8 +4736,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 47.IBPluginDependency 48.IBPluginDependency 63.IBPluginDependency - 72.IBPluginDependency - 74.IBPluginDependency YES @@ -4800,8 +4757,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -6276,6 +6231,77 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE ShareViewController UIViewController + + YES + + YES + doCancelButton: + doShareThisStory: + doToggleButton: + + + YES + id + id + id + + + + YES + + YES + doCancelButton: + doShareThisStory: + doToggleButton: + + + YES + + doCancelButton: + id + + + doShareThisStory: + id + + + doToggleButton: + id + + + + + YES + + YES + appDelegate + commentField + + + YES + NewsBlurAppDelegate + UITextView + + + + YES + + YES + appDelegate + commentField + + + YES + + appDelegate + NewsBlurAppDelegate + + + commentField + UITextView + + + IBProjectSource ./Classes/ShareViewController.h diff --git a/media/iphone/storyDetailView.css b/media/iphone/storyDetailView.css index 7195da208..7dc5e5ad4 100644 --- a/media/iphone/storyDetailView.css +++ b/media/iphone/storyDetailView.css @@ -1,3 +1,6 @@ +/* Disable certain interactions on touch devices */ +body { -webkit-touch-callout: none; -webkit-text-size-adjust: none; -webkit-user-select: none; -webkit-highlight: none; -webkit-tap-highlight-color: rgba(0,0,0,0); } + body { line-height: 1.6; font-size: 17px; diff --git a/media/iphone/storyDetailView.js b/media/iphone/storyDetailView.js index fc147d813..c2590dba5 100644 --- a/media/iphone/storyDetailView.js +++ b/media/iphone/storyDetailView.js @@ -1,5 +1,4 @@ Zepto(function($) { - $('img').each(function() { setImage(this); });