public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing user tag view on ipad.

Browse source
This commit is contained in:
Samuel Clay 2014-11-10 16:16:14 -08:00
parent 5fda173146
commit fa55b2f3ac
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/ios/Classes/NBContainerViewController.m
View file

@ -26,6 +26,7 @@
#import "TrainerViewController.h"
#import "OvershareKit.h"
#import "StoriesCollection.h"
#import "UserTagsViewController.h"
#define NB_DEFAULT_MASTER_WIDTH 270
#define NB_DEFAULT_MASTER_WIDTH_LANDSCAPE 370
@ -401,9 +402,10 @@
popoverController.delegate = self;
[popoverController setPopoverContentSize:CGSizeMake(220, 382)];
[appDelegate.userTagsViewController view]; // Force viewDidLoad
CGRect frame = [sender CGRectValue];
[popoverController presentPopoverFromRect:frame
inView:self.storyPageControl.view
inView:self.storyPageControl.currentPage.view
permittedArrowDirections:UIPopoverArrowDirectionAny
animated:YES];
}

8
clients/ios/Resources-iPad/MainWindow~ipad.xib
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<dependencies>
<deployment defaultVersion="1792" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UIApplication">
@ -35,6 +35,7 @@
<outlet property="storyPageControl" destination="290" id="292"/>
<outlet property="trainerViewController" destination="287" id="289"/>
<outlet property="userProfileViewController" destination="235" id="236"/>
<outlet property="userTagsViewController" destination="v2Q-Hh-f3K" id="5CE-5l-aoS"/>
<outlet property="window" destination="12" id="78"/>
</connections>
</customObject>
@ -136,6 +137,7 @@
<outlet property="appDelegate" destination="3" id="125"/>
</connections>
</viewController>
<viewController id="v2Q-Hh-f3K" customClass="UserTagsViewController"/>
<viewController nibName="TrainerViewController" id="287" userLabel="Trainer View Controller" customClass="TrainerViewController">
<extendedEdge key="edgesForExtendedLayout"/>
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>

5
clients/ios/Resources-iPhone/MainWindow.xib
View file

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UIApplication">

4
clients/ios/static/fastTouch.js
View file

@ -470,7 +470,7 @@ FastClick.prototype.onTouchMove = function(event) {
(function(targetElement) {
setTimeout(function() {
targetElement.className = targetElement.className.replace(/ ?pressed/gi, '');
}, 100);
}, 20);
})(this.targetElement);
this.targetElement = null;
@ -534,7 +534,7 @@ FastClick.prototype.onTouchEnd = function(event) {
(function(targetElement) {
setTimeout(function() {
targetElement.className = targetElement.className.replace(/ ?pressed/gi, '');
}, 100);
}, 20);
})(this.targetElement);
// On some iOS devices, the targetElement supplied with the event is invalid if the layer