Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
formatting .m files
  • Loading branch information
uc-apa committed May 7, 2020
commit 8aaa583f4e14212b15c8a96f5c0f18c40d3855fc
24 changes: 12 additions & 12 deletions packages/webview_flutter/ios/Classes/FlutterWebView.m
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ - (instancetype)initWithFrame:(CGRect)frame
[self applySettings:settings];
// TODO(amirh): return an error if apply settings failed once it's possible to do so.
// https://github.com/flutter/flutter/issues/36228

NSString* html = args[@"html"];
if ([html isKindOfClass:[NSString class]]) {
NSString* baseURLString = args[@"baseUrl"];
if ([baseURLString isKindOfClass:[NSString class]]) {
baseURL = [NSURL URLWithString:baseURLString];
[_webView loadHTMLString:html baseURL: baseURL];
[_webView loadHTMLString:html baseURL:baseURL];
} else {
[_webView loadHTMLString:html baseURL: nil];
[_webView loadHTMLString:html baseURL:nil];
}
} else {
NSString* initialUrl = args[@"initialUrl"];
Expand All @@ -130,7 +130,7 @@ - (instancetype)initWithFrame:(CGRect)frame
return self;
}

NSURL *baseURL = nil;
NSURL* baseURL = nil;

- (UIView*)view {
return _webView;
Expand Down Expand Up @@ -199,15 +199,15 @@ - (void)onLoadUrl:(FlutterMethodCall*)call result:(FlutterResult)result {
}

- (void)onLoadHtml:(FlutterMethodCall*)call result:(FlutterResult)result {
NSString* html = [call arguments][@"html"];
if ([html isKindOfClass:[NSString class]]) {
if (baseURL != nil) {
[_webView loadHTMLString:html baseURL: baseURL];
} else {
[_webView loadHTMLString:html baseURL: nil];
}
NSString* html = [call arguments][@"html"];
if ([html isKindOfClass:[NSString class]]) {
if (baseURL != nil) {
[_webView loadHTMLString:html baseURL:baseURL];
} else {
[_webView loadHTMLString:html baseURL:nil];
}
result(nil);
}
result(nil);
}

- (void)onCanGoBack:(FlutterMethodCall*)call result:(FlutterResult)result {
Expand Down