File tree Expand file tree Collapse file tree 3 files changed +2
-4
lines changed Expand file tree Collapse file tree 3 files changed +2
-4
lines changed Original file line number Diff line number Diff line change @@ -1615,7 +1615,4 @@ scalesPageToFitProperty.register(WebViewExtBase);
1615
1615
mediaPlaybackRequiresUserActionProperty . register ( WebViewExtBase ) ;
1616
1616
appCachePathProperty . register ( WebViewExtBase ) ;
1617
1617
limitsNavigationsToAppBoundDomainsProperty . register ( WebViewExtBase ) ;
1618
- < < < << << HEAD
1619
1618
scrollBarIndicatorVisibleProperty . register ( WebViewExtBase ) ;
1620
- === === =
1621
- >>> >>> > master
Original file line number Diff line number Diff line change @@ -3,8 +3,8 @@ import { isEnabledProperty } from '@nativescript/core/ui/core/view';
3
3
import {
4
4
NavigationType ,
5
5
ViewPortProperties ,
6
- WebViewTraceCategory ,
7
6
WebViewExtBase ,
7
+ WebViewTraceCategory ,
8
8
allowsInlineMediaPlaybackProperty ,
9
9
autoInjectJSBridgeProperty ,
10
10
limitsNavigationsToAppBoundDomainsProperty ,
Original file line number Diff line number Diff line change 1
1
/// <reference path="./types/android/webviewinterface.d.ts" />
2
2
/// <reference path="./types/url.d.ts" />
3
3
/// <reference path="./types/ios/ios.d.ts" />
4
+ /// <reference path="../../node_modules/@nativescript/types-ios/lib/ios/objc-x86_64/objc!WebKit.d.ts" />
You can’t perform that action at this time.
0 commit comments