Use desktop contextmenu in iconview (#51)

Author: andersevenrud

src/adapters/ui/iconview.js

@@ -354,14 +354,7 @@ export class DesktopIconView extends EventEmitter {
   }
 
   createRootContextMenu(ev) {
-    const _ = this.core.make('osjs/locale').translate;
-
-    this.core.make('osjs/contextmenu', {
-      position: ev,
-      menu: [{
-        label: _('LBL_REFRESH'),
-        onclick: () => this.iconview.reload()
-      }]
-    });
+    this.core.make('osjs/desktop')
+      .openContextMenu(ev);
   }
 }

src/desktop.js

@@ -647,6 +647,7 @@ export default class Desktop extends EventEmitter {
     const lockSettings = this.core.config('desktop.lock');
     const extras = [].concat(...this.contextmenuEntries.map(e => typeof e === 'function' ? e() : e));
     const config = this.core.config('desktop.contextmenu');
+    const hasIconview = this.core.make('osjs/settings').get('osjs/desktop', 'iconview.enabled');
 
     if (config === false || config.enabled === false) {
       return;
@@ -681,6 +682,13 @@ export default class Desktop extends EventEmitter {
       }))
     }];
 
+    if (hasIconview && this.iconview) {
+      defaultItems.push({
+        label: _('LBL_REFRESH'),
+        onclick: () => this.iconview.iconview.reload()
+      });
+    }
+
     const base = useDefaults === 'function'
       ? config.defaults(this, defaultItems)
       : (useDefaults ? defaultItems : []);

src/providers/desktop.js

@@ -62,6 +62,7 @@ export default class DesktopServiceProvider extends ServiceProvider {
     this.desktop.init();
 
     this.core.singleton('osjs/desktop', () => ({
+      openContextMenu: ev => this.desktop.onContextMenu(ev),
       addContextMenuEntries: entries => this.desktop.addContextMenu(entries),
       applySettings: settings => this.desktop.applySettings(settings),
       getRect: () => this.desktop.getRect()