diff --git a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate
index ec172514e523712c1d6b27616dbfc40f6a87b3b0..424a7f522d30ea9dd0cde4dbadd6748348ff002b 100644
Binary files a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate and b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.h b/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.h
index 1e8f55ef5970900f878a9c455b24624bc40541ba..b140b25016a62c0084bd669942d2efa78494bbc0 100644
--- a/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.h
+++ b/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.h
@@ -24,7 +24,7 @@
#import <UIKit/UIKit.h>
@class CISDOBIpadEntity, CISDOBOpenBisModel, CISDOBAppDelegate;
-@interface CISDOBDetailViewController : UIViewController <UISplitViewControllerDelegate, UIWebViewDelegate>
+@interface CISDOBDetailViewController : UIViewController <UISplitViewControllerDelegate, UIWebViewDelegate, UIPopoverControllerDelegate>
@property (weak, nonatomic) CISDOBAppDelegate *appDelegate;
@property (strong, nonatomic) CISDOBOpenBisModel *openBisModel;
diff --git a/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m b/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m
index fe1db2904fb98f81a532c73e39cb53947ee77d84..45011fefe1b3db5cf57108e04fa2f05990c0bb87 100644
--- a/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m
+++ b/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m
@@ -143,9 +143,17 @@
imageUrl = [self.openBisModel urlFromUrlString: self.detailItem.imageUrlString];
}
imageViewController.imageUrl = imageUrl;
+ // Order sensitive -- this line needs to happen after setting the url.
+ [(UIStoryboardPopoverSegue *)segue popoverController].delegate = self;
}
}
+#pragma mark - UIPopoverControllerDelegate
+- (BOOL)popoverControllerShouldDismissPopover:(UIPopoverController *)popoverController
+{
+ return YES;
+}
+
#pragma mark - Split view
- (void)splitViewController:(UISplitViewController *)splitController willHideViewController:(UIViewController *)viewController withBarButtonItem:(UIBarButtonItem *)barButtonItem forPopoverController:(UIPopoverController *)popoverController
diff --git a/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPad.storyboard b/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPad.storyboard
index 55d8e652c1bdc934b40238cda862c2b9fde31b99..a21259be76786023ed42cb018d708911eae8a3b9 100644
--- a/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPad.storyboard
+++ b/openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPad.storyboard
@@ -89,7 +89,7 @@
<outlet property="delegate" destination="4" id="ZAW-uH-UCE"/>
</connections>
</tableView>
- <webView contentMode="scaleToFill" scalesPageToFit="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rUU-Fj-t5t">
+ <webView multipleTouchEnabled="YES" contentMode="scaleToFill" scalesPageToFit="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rUU-Fj-t5t">
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" constant="231" id="1jB-hU-Cjx"/>
@@ -103,7 +103,7 @@
<rect key="frame" x="12" y="6" width="527" height="33"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xTL-xF-3F3">
+ <label opaque="NO" clipsSubviews="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xTL-xF-3F3">
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="3ah-YY-mCe"/>
@@ -125,7 +125,7 @@
<barButtonItem title="Zoom Image" id="ZrU-PG-qcH">
<connections>
<action selector="toggleImageViewMaximization:" destination="4" id="MJw-ZW-Tfx"/>
- <segue destination="Jth-PN-dE1" kind="popover" identifier="ImageFullscreen" popoverAnchorBarButtonItem="ZrU-PG-qcH" id="Wmu-mK-2m5">
+ <segue destination="Jth-PN-dE1" kind="popover" identifier="ImageFullscreen" popoverAnchorView="rUU-Fj-t5t" id="Wmu-mK-2m5">
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
</segue>
</connections>
@@ -397,11 +397,12 @@ If you are a user of an openBIS server, plese enter the URL and your login detai
<scene sceneID="7Y2-7U-x48">
<objects>
<viewController title="Image" id="Jth-PN-dE1" customClass="CISDOBImageViewPopoverController" sceneMemberID="viewController">
- <webView key="view" contentMode="scaleToFill" id="vBh-MQ-5Tm">
+ <webView key="view" multipleTouchEnabled="YES" contentMode="scaleToFill" scalesPageToFit="YES" id="vBh-MQ-5Tm">
<rect key="frame" x="0.0" y="20" width="748" height="1044"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+ <dataDetectorType key="dataDetectorTypes"/>
</webView>
<connections>
<outlet property="webView" destination="vBh-MQ-5Tm" id="8LE-n7-KZf"/>
@@ -431,6 +432,7 @@ If you are a user of an openBIS server, plese enter the URL and your login detai
<class className="CISDOBDetailViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/CISDOBDetailViewController.h"/>
<relationships>
+ <relationship kind="action" name="showImagePopover:"/>
<relationship kind="outlet" name="identifierLabel" candidateClass="UILabel"/>
<relationship kind="outlet" name="propertiesTableView" candidateClass="UITableView"/>
<relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/>