Merge pull request #975 from nextcloud/enh/capabiltities

2 files changed, 42 insertions, 33 deletions

diff --git a/src/helpers/types.js b/src/helpers/types.js
index 597f7c06..22ec61fb 100644
--- a/src/helpers/types.js
+++ b/src/helpers/types.js
@@ -21,23 +21,11 @@
  *
  */
 
-const getFileType = (document, ooxml) => {
-	let documentTypes = {
-		document: {
-			extension: 'odt',
-			mime: 'application/vnd.oasis.opendocument.text'
-		},
-		spreadsheet: {
-			extension: 'ods',
-			mime: 'application/vnd.oasis.opendocument.spreadsheet'
-		},
-		presentation: {
-			extension: 'odp',
-			mime: 'application/vnd.oasis.opendocument.presentation'
-		}
-	}
+const ooxml = OC.getCapabilities()['richdocuments']['config']['doc_format'] === 'ooxml'
+
+const getFileTypes = () => {
 	if (ooxml) {
-		documentTypes = {
+		return {
 			document: {
 				extension: 'docx',
 				mime: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
@@ -52,9 +40,27 @@ const getFileType = (document, ooxml) => {
 			}
 		}
 	}
-	return documentTypes[document]
+	return {
+		document: {
+			extension: 'odt',
+			mime: 'application/vnd.oasis.opendocument.text'
+		},
+		spreadsheet: {
+			extension: 'ods',
+			mime: 'application/vnd.oasis.opendocument.spreadsheet'
+		},
+		presentation: {
+			extension: 'odp',
+			mime: 'application/vnd.oasis.opendocument.presentation'
+		}
+	}
+}
+
+const getFileType = (document) => {
+	return getFileTypes()[document]
 }
 
 export default {
+	getFileTypes,
 	getFileType
 }
diff --git a/src/viewer.js b/src/viewer.js
index 4118564f..5c9e2b4d 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -86,9 +86,11 @@ const odfViewer = {
 			var fileDir = context.dir
 			var fileId = context.fileId || context.$file.attr('data-id')
 			var templateId = context.templateId
-			context.fileList.setViewerMode(true)
-			context.fileList.setPageTitle(fileName)
-			context.fileList.showMask()
+			if (context.fileList) {
+				context.fileList.setViewerMode(true)
+				context.fileList.setPageTitle(fileName)
+				context.fileList.showMask()
+			}
 		}
 		odfViewer.receivedLoading = false
 
@@ -216,17 +218,15 @@ const odfViewer = {
 		FilesAppIntegration.close()
 	},
 
-	registerFilesMenu: function(response) {
-		Config.update('ooxml', response.doc_format === 'ooxml')
+	registerFilesMenu: function() {
 
 		const registerFilesMenu = (OCA) => {
 			OCA.FilesLOMenu = {
 				attach: function(newFileMenu) {
 					var self = this
-					const ooxml = Config.get('ooxml')
-					const document = Types.getFileType('document', ooxml)
-					const spreadsheet = Types.getFileType('spreadsheet', ooxml)
-					const presentation = Types.getFileType('presentation', ooxml)
+					const document = Types.getFileType('document')
+					const spreadsheet = Types.getFileType('spreadsheet')
+					const presentation = Types.getFileType('presentation')
 
 					newFileMenu.addMenuEntry({
 						id: 'add-' + document.extension,
@@ -409,7 +409,15 @@ const odfViewer = {
 	}
 }
 
-window.OCA.RichDocuments = {}
+const settings = OC.getCapabilities()['richdocuments']['config'] || {}
+Config.update('ooxml', settings['doc_format'] === 'ooxml')
+
+window.OCA.RichDocuments = {
+	config: {
+		create: Types.getFileTypes()
+	}
+}
+
 $(document).ready(function() {
 	// register file actions and menu
 	if (typeof OCA !== 'undefined'
@@ -421,12 +429,7 @@ $(document).ready(function() {
 			odfViewer.supportedMimes.push('text/plain')
 		}
 		odfViewer.register()
-
-		$.get(OC.filePath('richdocuments', 'ajax', 'settings.php')).done(function(settings) {
-			// TODO: move ooxml setting to capabilities so we don't need this request
-			odfViewer.registerFilesMenu(settings)
-		})
-
+		odfViewer.registerFilesMenu()
 	}
 
 	// Open documents if a public page is opened for a supported mimetype