File tree 3 files changed +11
-9
lines changed 3 files changed +11
-9
lines changed Original file line number Diff line number Diff line change @@ -354,14 +354,7 @@ export class DesktopIconView extends EventEmitter {
354
354
}
355
355
356
356
createRootContextMenu ( ev ) {
357
- const _ = this . core . make ( 'osjs/locale' ) . translate ;
358
-
359
- this . core . make ( 'osjs/contextmenu' , {
360
- position : ev ,
361
- menu : [ {
362
- label : _ ( 'LBL_REFRESH' ) ,
363
- onclick : ( ) => this . iconview . reload ( )
364
- } ]
365
- } ) ;
357
+ this . core . make ( 'osjs/desktop' )
358
+ . openContextMenu ( ev ) ;
366
359
}
367
360
}
Original file line number Diff line number Diff line change @@ -647,6 +647,7 @@ export default class Desktop extends EventEmitter {
647
647
const lockSettings = this . core . config ( 'desktop.lock' ) ;
648
648
const extras = [ ] . concat ( ...this . contextmenuEntries . map ( e => typeof e === 'function' ? e ( ) : e ) ) ;
649
649
const config = this . core . config ( 'desktop.contextmenu' ) ;
650
+ const hasIconview = this . core . make ( 'osjs/settings' ) . get ( 'osjs/desktop' , 'iconview.enabled' ) ;
650
651
651
652
if ( config === false || config . enabled === false ) {
652
653
return ;
@@ -681,6 +682,13 @@ export default class Desktop extends EventEmitter {
681
682
} ) )
682
683
} ] ;
683
684
685
+ if ( hasIconview && this . iconview ) {
686
+ defaultItems . push ( {
687
+ label : _ ( 'LBL_REFRESH' ) ,
688
+ onclick : ( ) => this . iconview . iconview . reload ( )
689
+ } ) ;
690
+ }
691
+
684
692
const base = useDefaults === 'function'
685
693
? config . defaults ( this , defaultItems )
686
694
: ( useDefaults ? defaultItems : [ ] ) ;
Original file line number Diff line number Diff line change @@ -62,6 +62,7 @@ export default class DesktopServiceProvider extends ServiceProvider {
62
62
this . desktop . init ( ) ;
63
63
64
64
this . core . singleton ( 'osjs/desktop' , ( ) => ( {
65
+ openContextMenu : ev => this . desktop . onContextMenu ( ev ) ,
65
66
addContextMenuEntries : entries => this . desktop . addContextMenu ( entries ) ,
66
67
applySettings : settings => this . desktop . applySettings ( settings ) ,
67
68
getRect : ( ) => this . desktop . getRect ( )
You can’t perform that action at this time.
0 commit comments