Brion VIBBER has submitted this change and it was merged.
Change subject: Edit preview html is now styled correctly.
......................................................................
Edit preview html is now styled correctly.
Change-Id: Ibf1c50e231b8f2d134fe3257edd371bc1e800afd
---
M wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
1 file changed, 20 insertions(+), 3 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
index 2ed380b..44deed1 100644
--- a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
+++ b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
@@ -24,6 +24,7 @@
#import "TitleSubtitleView.h"
#import "Defines.h"
#import "WMF_Colors.h"
+#import "CommunicationBridge.h"
#define NAV ((NavController *)self.navigationController)
@@ -50,9 +51,26 @@
@property (weak, nonatomic) IBOutlet NSLayoutConstraint
*previewWebViewBottomConstraint;
@property (weak, nonatomic) IBOutlet UIWebView *previewWebView;
+@property (strong, nonatomic) CommunicationBridge *bridge;
+
@end
@implementation PreviewAndSaveViewController
+
+-(void)resetBridge
+{
+ self.bridge = [[CommunicationBridge alloc]
initWithWebView:self.previewWebView];
+
+ [self.bridge addListener:@"DOMLoaded" withBlock:^(NSString *messageType,
NSDictionary *payload) {
+
+ }];
+
+ __weak PreviewAndSaveViewController *weakSelf = self;
+
+ [self.bridge addListener:@"linkClicked" withBlock:^(NSString *messageType,
NSDictionary *payload) {
+ [weakSelf.previewWebView
stringByEvaluatingJavaScriptFromString:[NSString
stringWithFormat:@"alert('%@')", payload[@"href"]]];
+ }];
+}
// Handle nav bar taps.
- (void)navItemTappedNotification:(NSNotification *)notification
@@ -197,9 +215,8 @@
[self showAlert:@""];
- NSURL *baseUrl = [[SessionSingleton sharedInstance]
urlForDomain:[SessionSingleton sharedInstance].currentArticleDomain];
-
- [self.previewWebView loadHTMLString:result baseURL:baseUrl];
+ [self resetBridge];
+ [self.bridge sendMessage:@"append" withPayload:@{@"html": result}];
isAleadyPreviewing = NO;
--
To view, visit https://gerrit.wikimedia.org/r/125502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf1c50e231b8f2d134fe3257edd371bc1e800afd
Gerrit-PatchSet: 2
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
