From 0c9599e598ca34e6b0ba27dae3cb319a668be7fd Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 10 Nov 2023 08:22:59 +0100 Subject: [PATCH] fix(deps): Readd fixed style import from nextcloud/dialogs `@nextcloud/dialogs` requires importing styles. But we use nextcloud dialogs in 60+ modules, it is easy to forgot import styles each time. Importing styles once per entry point is enough to use dialogs on the entry point. In this commit, styles are imported only in entry points were they are needed by a manual check. - Imported via common `init.js` - main: `main.js` - files-sidebar: `mainFilesSidebar.js + mainFilesSidebarLoader.js` - public-share-auth-sidebar: `mainPublicShareAuthSidebar.js` - public-share-sidebar: `mainPublicShareSidebar.js` - Imported manually - maps: `maps.js` - deck: `deck.js` - admin-settings: `mainAdminSettings.js` - recording: `mainRecording.js` - Don't use `@nextcloud/dialogs`: - dashboard: `dashboard.js` - flow: `flow.js` - collections: `collections.js` Signed-off-by: Joas Schilling Co-authored-by: Grigorii K. Shartsev --- src/deck.js | 2 ++ src/init.js | 2 ++ src/mainAdminSettings.js | 2 ++ src/mainRecording.js | 2 ++ src/maps.js | 2 ++ 5 files changed, 10 insertions(+) diff --git a/src/deck.js b/src/deck.js index 35199680429..5c333f5e331 100644 --- a/src/deck.js +++ b/src/deck.js @@ -33,6 +33,8 @@ import RoomSelector from './components/RoomSelector.vue' import { fetchConversation } from './services/conversationsService.js' import { postRichObjectToConversation } from './services/messagesService.js' +import '@nextcloud/dialogs/style.css' + (function(OC, OCA, t, n) { /** * @param {object} card The card object given by the deck app diff --git a/src/init.js b/src/init.js index b59a390ae5e..e47954d75d5 100644 --- a/src/init.js +++ b/src/init.js @@ -30,6 +30,8 @@ import BrowserStorage from './services/BrowserStorage.js' import { EventBus } from './services/EventBus.js' import store from './store/index.js' +import '@nextcloud/dialogs/style.css' + if (!window.OCA.Talk) { window.OCA.Talk = {} } diff --git a/src/mainAdminSettings.js b/src/mainAdminSettings.js index fa6a79e23c7..534b29fbe42 100644 --- a/src/mainAdminSettings.js +++ b/src/mainAdminSettings.js @@ -24,6 +24,8 @@ import Vue from 'vue' import AdminSettings from './views/AdminSettings.vue' +import '@nextcloud/dialogs/style.css' + Vue.prototype.t = t Vue.prototype.n = n Vue.prototype.OC = OC diff --git a/src/mainRecording.js b/src/mainRecording.js index 1a83ce2cf44..182c942d03f 100644 --- a/src/mainRecording.js +++ b/src/mainRecording.js @@ -49,6 +49,8 @@ import { signalingKill, } from './utils/webrtc/index.js' +import '@nextcloud/dialogs/style.css' + // Leaflet icon patch import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package import 'leaflet/dist/leaflet.css' diff --git a/src/maps.js b/src/maps.js index 3ced7ccee49..77df93fbb03 100644 --- a/src/maps.js +++ b/src/maps.js @@ -31,6 +31,8 @@ import RoomSelector from './components/RoomSelector.vue' import { postRichObjectToConversation } from './services/messagesService.js' +import '@nextcloud/dialogs/style.css' + (function(OC, OCA, t, n) { /** * @param {object} location Geo location object