Merge pull request #1258 from nextcloud/revert/1238

Revert "Move to @nextcloud/capabilities"
nextcloud · Nov 18, 2020 · 24611fa · 24611fa
2 parents 7681e9d + 401b971
commit 24611fa
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
@@ -249,7 +249,6 @@ import SettingsSelectTag from './SettingsSelectTag'
 import SettingsSelectGroup from './SettingsSelectGroup'
 import SettingsExternalApps from './SettingsExternalApps'
 import { generateUrl } from '@nextcloud/router'
-import { getCapabilities } from '@nextcloud/capabilities'
 
 const SERVER_STATE_OK = 0
 const SERVER_STATE_LOADING = 1
@@ -275,7 +274,7 @@ export default {
 	data() {
 		return {
 			serverMode: '',
-			serverError: Object.values(getCapabilities()['richdocuments'].collabora).length > 0 ? SERVER_STATE_OK : SERVER_STATE_CONNECTION_ERROR,
+			serverError: Object.values(OC.getCapabilities()['richdocuments'].collabora).length > 0 ? SERVER_STATE_OK : SERVER_STATE_CONNECTION_ERROR,
 			hostErrors: [window.location.host === 'localhost' || window.location.host === '127.0.0.1', window.location.protocol !== 'https:', false],
 			demoServers: null,
 			CODEInstalled: 'richdocumentscode' in OC.appswebroots,

diff --git a/src/files.js b/src/files.js
@@ -7,7 +7,6 @@ import FilesAppIntegration from './view/FilesAppIntegration'
 import '../css/viewer.scss'
 import { splitPath } from './helpers'
 import NewFileMenu from './view/NewFileMenu'
-import { getCapabilities } from '@nextcloud/capabilities'
 
 const FRAME_DOCUMENT = 'FRAME_DOCUMENT'
 const PostMessages = new PostMessageService({
@@ -23,14 +22,14 @@ const odfViewer = {
 	open: false,
 	receivedLoading: false,
 	isCollaboraConfigured: (
-		(getCapabilities().richdocuments.config.wopi_url.indexOf('proxy.php') !== -1)
-		|| (typeof getCapabilities().richdocuments.collabora === 'object' && getCapabilities().richdocuments.collabora.length !== 0)),
-	supportedMimes: getCapabilities().richdocuments.mimetypes.concat(getCapabilities().richdocuments.mimetypesNoDefaultOpen),
-	excludeMimeFromDefaultOpen: getCapabilities().richdocuments.mimetypesNoDefaultOpen,
+		(OC.getCapabilities().richdocuments.config.wopi_url.indexOf('proxy.php') !== -1)
+		|| (typeof OC.getCapabilities().richdocuments.collabora === 'object' && OC.getCapabilities().richdocuments.collabora.length !== 0)),
+	supportedMimes: OC.getCapabilities().richdocuments.mimetypes.concat(OC.getCapabilities().richdocuments.mimetypesNoDefaultOpen),
+	excludeMimeFromDefaultOpen: OC.getCapabilities().richdocuments.mimetypesNoDefaultOpen,
 	hideDownloadMimes: ['image/jpeg', 'image/svg+xml', 'image/cgm', 'image/vnd.dxf', 'image/x-emf', 'image/x-wmf', 'image/x-wpg', 'image/x-freehand', 'image/bmp', 'image/png', 'image/gif', 'image/tiff', 'image/jpg', 'image/jpeg', 'text/plain', 'application/pdf'],
 
 	registerFileActions() {
-		const EDIT_ACTION_NAME = 'Edit with ' + getCapabilities().richdocuments.productName
+		const EDIT_ACTION_NAME = 'Edit with ' + OC.getCapabilities().richdocuments.productName
 		for (let mime of odfViewer.supportedMimes) {
 			OCA.Files.fileActions.register(
 				mime,
@@ -42,7 +41,7 @@ const odfViewer = {
 					const shareOwnerId = fileModel.shareOwnerId
 					return this.onEdit(fileName, { ...context, shareOwnerId })
 				},
-				t('richdocuments', 'Edit with {productName}', { productName: getCapabilities().richdocuments.productName }, undefined, { escape: false })
+				t('richdocuments', 'Edit with {productName}', { productName: OC.getCapabilities().richdocuments.productName }, undefined, { escape: false })
 			)
 			if (odfViewer.excludeMimeFromDefaultOpen.indexOf(mime) === -1 || isDownloadHidden) {
 				OCA.Files.fileActions.setDefault(mime, EDIT_ACTION_NAME)
@@ -136,9 +135,9 @@ const odfViewer = {
 		odfViewer.loadingTimeout = setTimeout(function() {
 			if (!odfViewer.receivedLoading) {
 				odfViewer.onClose()
-				OC.Notification.showTemporary(t('richdocuments', 'Failed to load {productName} - please try again later', { productName: getCapabilities().richdocuments.productName || 'Collabora Online' }))
+				OC.Notification.showTemporary(t('richdocuments', 'Failed to load {productName} - please try again later', { productName: OC.getCapabilities().richdocuments.productName || 'Collabora Online' }))
 			}
-		}, (getCapabilities().richdocuments.config.timeout * 1000 || 15000))
+		}, (OC.getCapabilities().richdocuments.config.timeout * 1000 || 15000))
 		$iframe.src = documentUrl
 
 		$('body').css('overscroll-behavior-y', 'none')
@@ -208,7 +207,7 @@ const odfViewer = {
 	}
 }
 
-const settings = getCapabilities()['richdocuments']['config'] || {}
+const settings = OC.getCapabilities()['richdocuments']['config'] || {}
 Config.update('ooxml', settings['doc_format'] === 'ooxml')
 
 window.OCA.RichDocuments = {
@@ -285,7 +284,7 @@ $(document).ready(function() {
 			if (args.Status === 'Timeout') {
 				odfViewer.onClose()
 				OC.Notification.showTemporary(t('richdocuments', 'Failed to connect to {productName}. Please try again later or contact your server administrator.',
-					{ productName: getCapabilities().richdocuments.productName }
+					{ productName: OC.getCapabilities().richdocuments.productName }
 				))
 			}
 			break

diff --git a/src/helpers/types.js b/src/helpers/types.js
@@ -20,9 +20,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import { getCapabilities } from '@nextcloud/capabilities'
 
-const ooxml = getCapabilities()['richdocuments']['config']['doc_format'] === 'ooxml'
+const ooxml = OC.getCapabilities()['richdocuments']['config']['doc_format'] === 'ooxml'
 
 const getFileTypes = () => {
 	if (ooxml) {

diff --git a/src/view/NewFileMenu.js b/src/view/NewFileMenu.js
@@ -21,7 +21,6 @@
  */
 
 import Types from '../helpers/types'
-import { getCapabilities } from '@nextcloud/capabilities'
 
 /** @type OC.Plugin */
 const NewFileMenu = {
@@ -38,7 +37,7 @@ const NewFileMenu = {
 			iconClass: 'icon-filetype-document',
 			fileType: 'x-office-document',
 			actionHandler: function(filename) {
-				if (getCapabilities().richdocuments.templates) {
+				if (OC.getCapabilities().richdocuments.templates) {
 					self._openTemplatePicker('document', document.mime, filename)
 				} else {
 					self._createDocument(document.mime, filename)
@@ -53,7 +52,7 @@ const NewFileMenu = {
 			iconClass: 'icon-filetype-spreadsheet',
 			fileType: 'x-office-spreadsheet',
 			actionHandler: function(filename) {
-				if (getCapabilities().richdocuments.templates) {
+				if (OC.getCapabilities().richdocuments.templates) {
 					self._openTemplatePicker('spreadsheet', spreadsheet.mime, filename)
 				} else {
 					self._createDocument(spreadsheet.mime, filename)
@@ -68,7 +67,7 @@ const NewFileMenu = {
 			iconClass: 'icon-filetype-presentation',
 			fileType: 'x-office-presentation',
 			actionHandler: function(filename) {
-				if (getCapabilities().richdocuments.templates) {
+				if (OC.getCapabilities().richdocuments.templates) {
 					self._openTemplatePicker('presentation', presentation.mime, filename)
 				} else {
 					self._createDocument(presentation.mime, filename)