Skip to content

Commit 1f5db2e

Browse files
committed
Use desktop contextmenu in iconview (#51)
1 parent 044c1a5 commit 1f5db2e

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

src/adapters/ui/iconview.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -354,14 +354,7 @@ export class DesktopIconView extends EventEmitter {
354354
}
355355

356356
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);
366359
}
367360
}

src/desktop.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,7 @@ export default class Desktop extends EventEmitter {
647647
const lockSettings = this.core.config('desktop.lock');
648648
const extras = [].concat(...this.contextmenuEntries.map(e => typeof e === 'function' ? e() : e));
649649
const config = this.core.config('desktop.contextmenu');
650+
const hasIconview = this.core.make('osjs/settings').get('osjs/desktop', 'iconview.enabled');
650651

651652
if (config === false || config.enabled === false) {
652653
return;
@@ -681,6 +682,13 @@ export default class Desktop extends EventEmitter {
681682
}))
682683
}];
683684

685+
if (hasIconview && this.iconview) {
686+
defaultItems.push({
687+
label: _('LBL_REFRESH'),
688+
onclick: () => this.iconview.iconview.reload()
689+
});
690+
}
691+
684692
const base = useDefaults === 'function'
685693
? config.defaults(this, defaultItems)
686694
: (useDefaults ? defaultItems : []);

src/providers/desktop.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export default class DesktopServiceProvider extends ServiceProvider {
6262
this.desktop.init();
6363

6464
this.core.singleton('osjs/desktop', () => ({
65+
openContextMenu: ev => this.desktop.onContextMenu(ev),
6566
addContextMenuEntries: entries => this.desktop.addContextMenu(entries),
6667
applySettings: settings => this.desktop.applySettings(settings),
6768
getRect: () => this.desktop.getRect()

0 commit comments

Comments
 (0)