MESSENGER-2762 Initial Merge

This commit is contained in:
Frank Rotermund
2022-03-17 15:51:23 +01:00
parent ecae8d618f
commit c2108a2178
384 changed files with 17708 additions and 1928 deletions

View File

@@ -1,5 +1,6 @@
/*
Copyright 2017 Vector Creations Ltd
Copyright (c) 2021 BWI GmbH
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -76,4 +77,21 @@
[super destroy];
}
- (void)setURL:(NSString *)URL
{
if (webView && BuildSettings.enableJSInWebView == false) {
webView.configuration.preferences.javaScriptEnabled = NO;
}
[super setURL:URL];
}
- (void)setLocalHTMLFile:(NSString *)localHTMLFile
{
if (webView && BuildSettings.enableJSInWebView == false) {
webView.configuration.preferences.javaScriptEnabled = NO;
}
[super setLocalHTMLFile:localHTMLFile];
}
@end