mirror of
https://github.com/TelegramMessenger/Telegram-iOS.git
synced 2026-07-06 03:33:41 +02:00
Merge commit '63a37c5bec'
This commit is contained in:
commit
5aeb390d8c
13 changed files with 98 additions and 63 deletions
|
|
@ -290,13 +290,13 @@ public final class WebAppController: ViewController, AttachmentContainable {
|
|||
}
|
||||
}
|
||||
}
|
||||
if #available(iOS 13.0, *) {
|
||||
if self.presentationData.theme.overallDarkAppearance {
|
||||
webView.overrideUserInterfaceStyle = .dark
|
||||
} else {
|
||||
webView.overrideUserInterfaceStyle = .unspecified
|
||||
}
|
||||
|
||||
if self.presentationData.theme.overallDarkAppearance {
|
||||
webView.overrideUserInterfaceStyle = .dark
|
||||
} else {
|
||||
webView.overrideUserInterfaceStyle = .unspecified
|
||||
}
|
||||
|
||||
self.webView = webView
|
||||
|
||||
self.addSubnode(self.backgroundNode)
|
||||
|
|
@ -1093,6 +1093,9 @@ public final class WebAppController: ViewController, AttachmentContainable {
|
|||
guard let controller = self.controller else {
|
||||
return
|
||||
}
|
||||
guard message.frameInfo.isMainFrame else {
|
||||
return
|
||||
}
|
||||
guard let body = message.body as? [String: Any] else {
|
||||
return
|
||||
}
|
||||
|
|
@ -2028,12 +2031,10 @@ public final class WebAppController: ViewController, AttachmentContainable {
|
|||
self.updateHeaderBackgroundColor(transition: .immediate)
|
||||
self.sendThemeChangedEvent()
|
||||
|
||||
if #available(iOS 13.0, *) {
|
||||
if self.presentationData.theme.overallDarkAppearance {
|
||||
self.webView?.overrideUserInterfaceStyle = .dark
|
||||
} else {
|
||||
self.webView?.overrideUserInterfaceStyle = .unspecified
|
||||
}
|
||||
if self.presentationData.theme.overallDarkAppearance {
|
||||
self.webView?.overrideUserInterfaceStyle = .dark
|
||||
} else {
|
||||
self.webView?.overrideUserInterfaceStyle = .unspecified
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ final class WebAppWebView: WKWebView {
|
|||
let contentController = WKUserContentController()
|
||||
|
||||
var handleScriptMessageImpl: ((WKScriptMessage) -> Void)?
|
||||
let eventProxyScript = WKUserScript(source: eventProxySource, injectionTime: .atDocumentStart, forMainFrameOnly: false)
|
||||
let eventProxyScript = WKUserScript(source: eventProxySource, injectionTime: .atDocumentStart, forMainFrameOnly: true)
|
||||
contentController.addUserScript(eventProxyScript)
|
||||
contentController.add(WeakGameScriptMessageHandler { message in
|
||||
handleScriptMessageImpl?(message)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue