Skip to content

Commit 9e5d0f0

Browse files
farfromrefugfarfromrefug
committed
chore: lint
1 parent 0e3e172 commit 9e5d0f0

File tree

4 files changed

+112
-82
lines changed

4 files changed

+112
-82
lines changed

‎src/webview-ext-common.ts

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @typescript-eslint/unified-signatures */
12
/* eslint-disable @typescript-eslint/adjacent-overload-signatures */
23
import {
34
CSSType,
@@ -11,8 +12,8 @@ import {
1112
path,
1213
} from '@nativescript/core';
1314
import { isEnabledProperty } from '@nativescript/core/ui/core/view';
14-
import { metadataViewPort, webViewBridge, promisePolyfill } from './nativescript-webview-bridge-loader';
1515
import normalizeUrl from 'normalize-url';
16+
import { metadataViewPort, promisePolyfill, webViewBridge } from './nativescript-webview-bridge-loader';
1617

1718
export interface ViewPortProperties {
1819
width?: number | 'device-width';
@@ -349,7 +350,7 @@ export interface WebConsoleEventData extends WebViewExtEventData {
349350
export interface RequestPermissionsEventData extends WebViewExtEventData {
350351
eventName: EventNames.RequestPermissions;
351352
url: string;
352-
permissions: string[]
353+
permissions: string[];
353354
}
354355

355356
/**
@@ -600,9 +601,11 @@ export class WebViewExtBase extends ContainerView {
600601

601602
this.notify(args);
602603

603-
this.getTitle()
604-
.then((title) => title && this._titleChanged(title))
605-
.catch(() => void 0);
604+
if (this.hasListeners(WebViewExtBase.titleChangedEvent)) {
605+
this.getTitle()
606+
.then((title) => title && this._titleChanged(title))
607+
.catch(() => void 0);
608+
}
606609

607610
return args;
608611
}
@@ -1563,21 +1566,20 @@ export class WebViewExtBase extends ContainerView {
15631566
return true;
15641567
}
15651568

1566-
async _onRequestPermissions (permissions) {
1569+
async _onRequestPermissions(permissions) {
15671570
if (!this.hasListeners(EventNames.RequestPermissions)) {
1568-
return false
1571+
return false;
15691572
}
1570-
return new Promise<void>((resolve, reject)=>{
1573+
return new Promise<void>((resolve, reject) => {
15711574
const args = {
15721575
eventName: EventNames.RequestPermissions,
15731576
object: this,
15741577
url: this.src,
1575-
permissions: permissions,
1576-
callback: function (allow) {
1578+
permissions,
1579+
callback(allow) {
15771580
if (allow) {
15781581
resolve();
1579-
}
1580-
else {
1582+
} else {
15811583
reject();
15821584
}
15831585
},

‎src/webview-ext.android.ts

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ import { File, Trace, knownFolders } from '@nativescript/core';
22
import { isEnabledProperty } from '@nativescript/core/ui/core/view';
33
import {
44
CacheMode,
5+
NotaTraceCategory,
56
UnsupportedSDKError,
67
WebViewExtBase,
8+
allowsInlineMediaPlaybackProperty,
79
builtInZoomControlsProperty,
810
cacheModeProperty,
911
databaseStorageProperty,
1012
debugModeProperty,
1113
displayZoomControlsProperty,
1214
domStorageProperty,
1315
isScrollEnabledProperty,
16+
mediaPlaybackRequiresUserActionProperty,
1417
supportZoomProperty,
1518
webConsoleProperty,
16-
NotaTraceCategory,
17-
mediaPlaybackRequiresUserActionProperty,
18-
allowsInlineMediaPlaybackProperty,
1919
} from './webview-ext-common';
2020

2121
export * from './webview-ext-common';
@@ -317,7 +317,6 @@ function initializeWebViewClient(): void {
317317
}
318318
owner._onLoadFinished(failingUrl, `${description}(${errorCode})`).catch(() => void 0);
319319
}
320-
321320
}
322321

323322
WebViewExtClient = WebViewExtClientImpl;
@@ -496,7 +495,7 @@ function initializeWebViewClient(): void {
496495

497496
return false;
498497
}
499-
async _onPermissionsRequest (permissionRequest: android.webkit.PermissionRequest) {
498+
async _onPermissionsRequest(permissionRequest: android.webkit.PermissionRequest) {
500499
try {
501500
const requests = permissionRequest.getResources();
502501
const wantedPermissions = new Array();
@@ -505,12 +504,12 @@ function initializeWebViewClient(): void {
505504
switch (requests[i]) {
506505
case android.webkit.PermissionRequest.RESOURCE_AUDIO_CAPTURE: {
507506
requestedPermissions.push(android.webkit.PermissionRequest.RESOURCE_AUDIO_CAPTURE);
508-
wantedPermissions.push("audio");
507+
wantedPermissions.push('audio');
509508
break;
510509
}
511510
case android.webkit.PermissionRequest.RESOURCE_VIDEO_CAPTURE: {
512511
requestedPermissions.push(android.webkit.PermissionRequest.RESOURCE_VIDEO_CAPTURE);
513-
wantedPermissions.push("camera");
512+
wantedPermissions.push('camera');
514513
break;
515514
}
516515
}
@@ -519,14 +518,14 @@ function initializeWebViewClient(): void {
519518
permissionRequest.deny();
520519
}
521520
await this.owner.get()._onRequestPermissions(wantedPermissions);
522-
521+
523522
permissionRequest.grant(requestedPermissions);
524-
} catch(err) {
523+
} catch (err) {
525524
console.error(err);
526525
permissionRequest.deny();
527526
}
528527
}
529-
onPermissionRequest (permissionRequest: android.webkit.PermissionRequest) {
528+
onPermissionRequest(permissionRequest: android.webkit.PermissionRequest) {
530529
this._onPermissionsRequest(permissionRequest);
531530
}
532531
// onPermissionRequestCanceled (permissionRequest: android.webkit.PermissionRequest) {
@@ -654,7 +653,7 @@ export class AWebView extends WebViewExtBase {
654653
return;
655654
}
656655

657-
return await super.ensurePromiseSupport();
656+
return super.ensurePromiseSupport();
658657
}
659658

660659
public _loadUrl(src: string) {
@@ -680,7 +679,11 @@ export class AWebView extends WebViewExtBase {
680679

681680
const baseUrl = `file:///${knownFolders.currentApp().path}/`;
682681
if (Trace.isEnabled()) {
683-
Trace.write(`WebViewExt<android>._loadData("${src}") -> baseUrl: "${baseUrl}"`, NotaTraceCategory, Trace.messageType.info);
682+
Trace.write(
683+
`WebViewExt<android>._loadData("${src}") -> baseUrl: "${baseUrl}"`,
684+
NotaTraceCategory,
685+
Trace.messageType.info
686+
);
684687
}
685688
nativeView.loadDataWithBaseURL(baseUrl, src, 'text/html', 'utf-8', null!);
686689
}
@@ -760,7 +763,11 @@ export class AWebView extends WebViewExtBase {
760763

761764
public unregisterLocalResource(resourceName: string) {
762765
if (Trace.isEnabled()) {
763-
Trace.write(`WebViewExt<android>.unregisterLocalResource("${resourceName}")`, NotaTraceCategory, Trace.messageType.info);
766+
Trace.write(
767+
`WebViewExt<android>.unregisterLocalResource("${resourceName}")`,
768+
NotaTraceCategory,
769+
Trace.messageType.info
770+
);
764771
}
765772
resourceName = this.fixLocalResourceName(resourceName);
766773

@@ -828,7 +835,11 @@ export class AWebView extends WebViewExtBase {
828835
const androidWebView = this.nativeViewProtected;
829836
if (!androidWebView) {
830837
if (Trace.isEnabled()) {
831-
Trace.write('WebViewExt<android>.executeJavaScript() -> no nativeView?', NotaTraceCategory, Trace.messageType.error);
838+
Trace.write(
839+
'WebViewExt<android>.executeJavaScript() -> no nativeView?',
840+
NotaTraceCategory,
841+
Trace.messageType.error
842+
);
832843
}
833844
reject(new Error('Native Android not initialized, cannot call executeJavaScript'));
834845

@@ -1065,7 +1076,6 @@ export class AWebView extends WebViewExtBase {
10651076
}
10661077
}
10671078

1068-
10691079
[mediaPlaybackRequiresUserActionProperty.setNative](enabled: boolean) {
10701080
this.nativeViewProtected.getSettings().setMediaPlaybackRequiresUserGesture(enabled);
10711081
}

‎src/webview-ext.ios.ts

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
import { File, Trace, alert, confirm, knownFolders, profile, prompt } from '@nativescript/core';
22
import { isEnabledProperty } from '@nativescript/core/ui/core/view';
33
import { webViewBridge } from './nativescript-webview-bridge-loader';
4-
import { NavigationType, WebViewExtBase, autoInjectJSBridgeProperty, scrollBounceProperty, NotaTraceCategory, webRTCProperty, mediaPlaybackRequiresUserActionProperty, allowsInlineMediaPlaybackProperty } from './webview-ext-common';
4+
import {
5+
NavigationType,
6+
NotaTraceCategory,
7+
WebViewExtBase,
8+
allowsInlineMediaPlaybackProperty,
9+
autoInjectJSBridgeProperty,
10+
mediaPlaybackRequiresUserActionProperty,
11+
scrollBounceProperty,
12+
webRTCProperty,
13+
} from './webview-ext-common';
514

615
export * from './webview-ext-common';
716

@@ -10,7 +19,7 @@ const messageHandlerName = 'nsBridge';
1019
export class AWebView extends WebViewExtBase {
1120
public ios: WKWebView;
1221
nativeViewProtected: WKWebView;
13-
webViewRTC: WKWebViewRTC
22+
webViewRTC: WKWebViewRTC;
1423

1524
public static supportXLocalScheme = typeof CustomUrlSchemeHandler !== 'undefined';
1625

@@ -457,12 +466,17 @@ export class AWebView extends WebViewExtBase {
457466
return;
458467
}
459468

460-
this.webViewRTC = WKWebViewRTC.alloc().initWithWkwebviewContentController(nativeView, nativeView.configuration.userContentController);
469+
this.webViewRTC = WKWebViewRTC.alloc().initWithWkwebviewContentController(
470+
nativeView,
471+
nativeView.configuration.userContentController
472+
);
461473
}
462474

463475
[mediaPlaybackRequiresUserActionProperty.setNative](enabled: boolean) {
464-
this.nativeViewProtected.configuration.setValueForKey(enabled?WKAudiovisualMediaTypes.All:WKAudiovisualMediaTypes.None, 'mediaTypesRequiringUserActionForPlayback');
465-
476+
this.nativeViewProtected.configuration.setValueForKey(
477+
enabled ? WKAudiovisualMediaTypes.All : WKAudiovisualMediaTypes.None,
478+
'mediaTypesRequiringUserActionForPlayback'
479+
);
466480
}
467481
[allowsInlineMediaPlaybackProperty.setNative](enabled: boolean) {
468482
this.nativeViewProtected.configuration.setValueForKey(enabled, 'allowsInlineMediaPlayback');

‎www-src/rollup.config.js

Lines changed: 54 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,60 @@ import typescript from '@rollup/plugin-typescript';
33
import commonjs from '@rollup/plugin-commonjs';
44
import cleanup from 'rollup-plugin-cleanup';
55

6-
export default [{
7-
input: 'bridge.android.ts',
8-
plugins: [
9-
commonjs({transformMixedEsModules:true}),
10-
typescript(),
11-
cleanup({comments:'none'}),
12-
strip({functions: ['assert.*', 'debug', 'alert']})
13-
],
6+
export default [
7+
{
8+
input: 'bridge.android.ts',
9+
plugins: [
10+
commonjs({ transformMixedEsModules: true }),
11+
typescript(),
12+
cleanup({ comments: 'none' }),
13+
strip({ functions: ['assert.*', 'debug', 'alert'] }),
14+
],
1415

15-
output: [
16-
{
17-
format: 'cjs',
18-
esModule: false,
19-
strict: false,
20-
file: '../build/bridge.android.js',
21-
// plugins: [terser()]
22-
}
23-
]
24-
},{
25-
input: 'bridge.ios.ts',
26-
plugins: [
27-
commonjs({transformMixedEsModules:true}),
28-
typescript(),
29-
strip({functions: ['assert.*', 'debug', 'alert']})
30-
],
16+
output: [
17+
{
18+
format: 'cjs',
19+
esModule: false,
20+
strict: false,
21+
file: '../build/bridge.android.js',
22+
// plugins: [terser()]
23+
},
24+
],
25+
},
26+
{
27+
input: 'bridge.ios.ts',
28+
plugins: [
29+
commonjs({ transformMixedEsModules: true }),
30+
typescript(),
31+
strip({ functions: ['assert.*', 'debug', 'alert'] }),
32+
],
3133

32-
output: [
33-
{
34-
format: 'cjs',
35-
esModule: false,
36-
strict: false,
37-
file: '../build/bridge.ios.js',
38-
// plugins: [terser()]
39-
}
40-
]
41-
},{
42-
input: 'metadata-view-port.ts',
43-
plugins: [
44-
commonjs({transformMixedEsModules:true}),
45-
typescript(),
46-
strip({functions: ['assert.*', 'debug', 'alert']})
47-
],
34+
output: [
35+
{
36+
format: 'cjs',
37+
esModule: false,
38+
strict: false,
39+
file: '../build/bridge.ios.js',
40+
// plugins: [terser()]
41+
},
42+
],
43+
},
44+
{
45+
input: 'metadata-view-port.ts',
46+
plugins: [
47+
commonjs({ transformMixedEsModules: true }),
48+
typescript(),
49+
strip({ functions: ['assert.*', 'debug', 'alert'] }),
50+
],
4851

49-
output: [
50-
{
51-
format: 'cjs',
52-
esModule: false,
53-
strict: false,
54-
file: '../build/metadata-view-port.js',
55-
// plugins: [terser()]
56-
}
57-
]
58-
}];
52+
output: [
53+
{
54+
format: 'cjs',
55+
esModule: false,
56+
strict: false,
57+
file: '../build/metadata-view-port.js',
58+
// plugins: [terser()]
59+
},
60+
],
61+
},
62+
];

0 commit comments

Comments
 (0)