@@ -82,13 +82,7 @@ export class ElectronMainUIService
8282 }
8383
8484 async moveToTrash ( path : string ) {
85- if ( semver . lt ( process . versions . electron , '13.0.0' ) ) {
86- // Removed: shell.moveItemToTrash()
87- // https://www.electronjs.org/docs/latest/breaking-changes#removed-shellmoveitemtotrash
88- await ( shell as any ) . moveItemToTrash ( path ) ;
89- } else {
90- await shell . trashItem ( path ) ;
91- }
85+ await shell . trashItem ( path ) ;
9286 }
9387
9488 async revealInFinder ( path : string ) {
@@ -145,23 +139,17 @@ export class ElectronMainUIService
145139 async showOpenDialog ( windowId : number , options : Electron . OpenDialogOptions ) : Promise < string [ ] | undefined > {
146140 return new Promise ( ( resolve , reject ) => {
147141 try {
148- if ( semver . lt ( process . versions . electron , '6.0.0' ) ) {
149- ( dialog as any ) . showOpenDialog ( BrowserWindow . fromId ( windowId ) , options , ( paths ) => {
150- resolve ( paths ) ;
151- } ) ;
152- } else {
153- const win = BrowserWindow . fromId ( windowId ) ;
154- if ( ! win ) {
155- return reject ( new Error ( `BrowserWindow ${ windowId } not found` ) ) ;
156- }
157- dialog . showOpenDialog ( win , options ) . then ( ( value ) => {
158- if ( value . canceled ) {
159- resolve ( undefined ) ;
160- } else {
161- resolve ( value . filePaths ) ;
162- }
163- } , reject ) ;
142+ const win = BrowserWindow . fromId ( windowId ) ;
143+ if ( ! win ) {
144+ return reject ( new Error ( `BrowserWindow ${ windowId } not found` ) ) ;
164145 }
146+ dialog . showOpenDialog ( win , options ) . then ( ( value ) => {
147+ if ( value . canceled ) {
148+ resolve ( undefined ) ;
149+ } else {
150+ resolve ( value . filePaths ) ;
151+ }
152+ } , reject ) ;
165153 } catch ( e ) {
166154 reject ( e ) ;
167155 }
@@ -170,23 +158,17 @@ export class ElectronMainUIService
170158 async showSaveDialog ( windowId : number , options : Electron . SaveDialogOptions ) : Promise < string | undefined > {
171159 return new Promise ( ( resolve , reject ) => {
172160 try {
173- if ( semver . lt ( process . versions . electron , '6.0.0' ) ) {
174- ( dialog as any ) . showSaveDialog ( BrowserWindow . fromId ( windowId ) , options , ( path ) => {
175- resolve ( path ) ;
176- } ) ;
177- } else {
178- const win = BrowserWindow . fromId ( windowId ) ;
179- if ( ! win ) {
180- return reject ( new Error ( `BrowserWindow ${ windowId } not found` ) ) ;
181- }
182- dialog . showSaveDialog ( win , options ) . then ( ( value ) => {
183- if ( value . canceled ) {
184- resolve ( undefined ) ;
185- } else {
186- resolve ( value . filePath ) ;
187- }
188- } , reject ) ;
161+ const win = BrowserWindow . fromId ( windowId ) ;
162+ if ( ! win ) {
163+ return reject ( new Error ( `BrowserWindow ${ windowId } not found` ) ) ;
189164 }
165+ dialog . showSaveDialog ( win , options ) . then ( ( value ) => {
166+ if ( value . canceled ) {
167+ resolve ( undefined ) ;
168+ } else {
169+ resolve ( value . filePath ) ;
170+ }
171+ } , reject ) ;
190172 } catch ( e ) {
191173 reject ( e ) ;
192174 }
0 commit comments