mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: replace .indexOf() with .includes() (#39195)

Browse source
This commit is contained in:
Milan Burda 2023-07-24 12:32:54 +02:00 • committed by GitHub
parent 9cd5de7588
commit 2c52eb7e1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/browser/api/menu.ts
View file

@ -82,7 +82,7 @@ Menu.prototype.popup = function (options = {}) {
// find which window to use // find which window to use
const wins = BaseWindow.getAllWindows(); const wins = BaseWindow.getAllWindows();
if (!wins || wins.indexOf(window as any) === -1) { if (!wins || !wins.includes(window as any)) {
window = BaseWindow.getFocusedWindow() as any; window = BaseWindow.getFocusedWindow() as any;
if (!window && wins && wins.length > 0) { if (!window && wins && wins.length > 0) {
window = wins[0] as any; window = wins[0] as any;

2
script/release/prepare-release.js
View file

@ -117,7 +117,7 @@ async function createRelease (branchToTarget, isBeta) {
name: `electron ${newVersion}`, name: `electron ${newVersion}`,
body: releaseBody, body: releaseBody,
prerelease: releaseIsPrelease, prerelease: releaseIsPrelease,
target_commitish: newVersion.indexOf('nightly') !== -1 ? 'main' : branchToTarget target_commitish: newVersion.includes('nightly') ? 'main' : branchToTarget
}).catch(err => { }).catch(err => {
console.log(`${fail} Error creating new release: `, err); console.log(`${fail} Error creating new release: `, err);
process.exit(1); process.exit(1);

2
script/release/release.js
View file

@ -50,7 +50,7 @@ async function getDraftRelease (version, skipValidation) {
if (!skipValidation) { if (!skipValidation) {
failureCount = 0; failureCount = 0;
check(drafts.length === 1, 'one draft exists', true); check(drafts.length === 1, 'one draft exists', true);
if (versionToCheck.indexOf('beta') > -1) { if (versionToCheck.includes('beta')) {
check(draft.prerelease, 'draft is a prerelease'); check(draft.prerelease, 'draft is a prerelease');
} }
check(draft.body.length > 50 && !draft.body.includes('(placeholder)'), 'draft has release notes'); check(draft.body.length > 50 && !draft.body.includes('(placeholder)'), 'draft has release notes');

2
spec/api-menu-spec.ts
View file

@ -948,7 +948,7 @@ describe('Menu module', function () {
await new Promise<void>((resolve) => { await new Promise<void>((resolve) => {
appProcess.stdout.on('data', data => { appProcess.stdout.on('data', data => {
output += data; output += data;
if (data.indexOf('Window has') > -1) { if (data.includes('Window has')) {
resolve(); resolve();
} }
}); });

2
spec/security-warnings-spec.ts
View file

@ -12,7 +12,7 @@ import { listen } from './lib/spec-helpers';
import { setTimeout } from 'node:timers/promises'; import { setTimeout } from 'node:timers/promises';
const messageContainsSecurityWarning = (event: Event, level: number, message: string) => { const messageContainsSecurityWarning = (event: Event, level: number, message: string) => {
return message.indexOf('Electron Security Warning') > -1; return message.includes('Electron Security Warning');
}; };
const isLoaded = (event: Event, level: number, message: string) => { const isLoaded = (event: Event, level: number, message: string) => {