extensions: Import ExtensionUtils as module

ExtensionUtils has been converted to ESM and split into two modules,
for extensions and prefs respectively.

Adjust to those changes.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/266>
This commit is contained in:
Florian Müllner
2023-07-15 14:13:25 +02:00
parent 1155170c7c
commit e75a1a15ac
15 changed files with 28 additions and 17 deletions
+2 -1
View File
@@ -11,8 +11,9 @@ import Shell from 'gi://Shell';
import St from 'gi://St';
const {EventEmitter} = imports.misc.signals;
import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js';
const DND = imports.ui.dnd;
const ExtensionUtils = imports.misc.extensionUtils;
const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu;
const PopupMenu = imports.ui.popupMenu;
+2 -1
View File
@@ -3,7 +3,8 @@
import Shell from 'gi://Shell';
const ExtensionUtils = imports.misc.extensionUtils;
import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js';
const Main = imports.ui.main;
class WindowMover {
+1 -1
View File
@@ -7,7 +7,7 @@ import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import Gtk from 'gi://Gtk';
const ExtensionUtils = imports.misc.extensionUtils;
import * as ExtensionUtils from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
const _ = ExtensionUtils.gettext;
+2 -1
View File
@@ -5,7 +5,8 @@ import GObject from 'gi://GObject';
import Shell from 'gi://Shell';
import St from 'gi://St';
const ExtensionUtils = imports.misc.extensionUtils;
import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js';
const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu;
const PopupMenu = imports.ui.popupMenu;
@@ -1,7 +1,8 @@
// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
import Clutter from 'gi://Clutter';
const ExtensionUtils = imports.misc.extensionUtils;
import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js';
const Main = imports.ui.main;
const {WindowPreview} = imports.ui.windowPreview;
const Workspace = imports.ui.workspace;
+2 -1
View File
@@ -3,7 +3,8 @@ import Clutter from 'gi://Clutter';
import GObject from 'gi://GObject';
import St from 'gi://St';
const ExtensionUtils = imports.misc.extensionUtils;
import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js';
const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu;
const PopupMenu = imports.ui.popupMenu;
+3 -2
View File
@@ -4,11 +4,12 @@ import GLib from 'gi://GLib';
import Shell from 'gi://Shell';
const {EventEmitter} = imports.misc.signals;
const ExtensionUtils = imports.misc.extensionUtils;
import {gettext} from 'resource:///org/gnome/shell/extensions/extension.js';
const Main = imports.ui.main;
const ShellMountOperation = imports.ui.shellMountOperation;
const _ = ExtensionUtils.gettext;
const _ = gettext;
const N_ = x => x;
Gio._promisify(Gio.AppInfo, 'launch_default_for_uri_async');
@@ -23,7 +23,8 @@ import Meta from 'gi://Meta';
import Shell from 'gi://Shell';
import St from 'gi://St';
const ExtensionUtils = imports.misc.extensionUtils;
import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js';
const Main = imports.ui.main;
const MESSAGE_FADE_TIME = 2000;
+2 -1
View File
@@ -3,7 +3,8 @@
import Gio from 'gi://Gio';
const ExtensionUtils = imports.misc.extensionUtils;
import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js';
const Main = imports.ui.main;
import {getThemeDirs, getModeThemeDirs} from './util.js';
+1 -1
View File
@@ -9,7 +9,7 @@ import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import Gtk from 'gi://Gtk';
const ExtensionUtils = imports.misc.extensionUtils;
import * as ExtensionUtils from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
import {getThemeDirs, getModeThemeDirs} from './util.js';
+2 -1
View File
@@ -7,8 +7,9 @@ import Meta from 'gi://Meta';
import Shell from 'gi://Shell';
import St from 'gi://St';
import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js';
const DND = imports.ui.dnd;
const ExtensionUtils = imports.misc.extensionUtils;
const Main = imports.ui.main;
const Overview = imports.ui.overview;
const PopupMenu = imports.ui.popupMenu;
+1 -1
View File
@@ -5,7 +5,7 @@ import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import Gtk from 'gi://Gtk';
const ExtensionUtils = imports.misc.extensionUtils;
import * as ExtensionUtils from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
const _ = ExtensionUtils.gettext;
+3 -2
View File
@@ -4,13 +4,14 @@ import GObject from 'gi://GObject';
import Meta from 'gi://Meta';
import St from 'gi://St';
import {gettext} from 'resource:///org/gnome/shell/extensions/extension.js';
const DND = imports.ui.dnd;
const ExtensionUtils = imports.misc.extensionUtils;
const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu;
const PopupMenu = imports.ui.popupMenu;
const _ = ExtensionUtils.gettext;
const _ = gettext;
const TOOLTIP_OFFSET = 6;
const TOOLTIP_ANIMATION_TIME = 150;
+2 -1
View File
@@ -5,8 +5,9 @@ import GObject from 'gi://GObject';
import Meta from 'gi://Meta';
import St from 'gi://St';
import * as ExtensionUtils from 'resource:///org/gnome/shell/extensions/extension.js';
const DND = imports.ui.dnd;
const ExtensionUtils = imports.misc.extensionUtils;
const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu;
const PopupMenu = imports.ui.popupMenu;
+1 -1
View File
@@ -6,7 +6,7 @@ import GObject from 'gi://GObject';
import Gtk from 'gi://Gtk';
import Pango from 'gi://Pango';
const ExtensionUtils = imports.misc.extensionUtils;
import * as ExtensionUtils from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
const _ = ExtensionUtils.gettext;
const N_ = e => e;