From e8fe00003b326867de480d919fdfe78ced9e7857 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Thu, 14 Mar 2019 14:42:42 +0100
Subject: Dispatch event to allow apps to load their script for collections
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/files_sharing/src/additionalScripts.js          | 18 +-----------------
 .../src/collaborationresourceshandler.js             | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 apps/files_sharing/src/collaborationresourceshandler.js

(limited to 'apps/files_sharing/src')

diff --git a/apps/files_sharing/src/additionalScripts.js b/apps/files_sharing/src/additionalScripts.js
index 94c0f232ce3..b0525a64a12 100644
--- a/apps/files_sharing/src/additionalScripts.js
+++ b/apps/files_sharing/src/additionalScripts.js
@@ -8,22 +8,6 @@ import './sharebreadcrumbview'
 import './style/sharetabview.scss'
 import './style/sharebreadcrumb.scss'
 
-window.OCP.Collaboration.registerType('files', {
-	action: () => {
-		return new Promise((resolve, reject) => {
-			OC.dialogs.filepicker('Link to a file', function (f) {
-				const client = OC.Files.getClient();
-				client.getFileInfo(f).then((status, fileInfo) => {
-					resolve(fileInfo.id);
-				}, () => {
-					reject();
-				});
-			}, false);
-		});
-	},
-	/** used in "Link to a {typeString}" */
-	typeString: t('files_sharing', 'file'),
-	typeIconClass: 'icon-files-dark'
-});
+import './collaborationresourceshandler.js'
 
 window.OCA.Sharing = OCA.Sharing;
diff --git a/apps/files_sharing/src/collaborationresourceshandler.js b/apps/files_sharing/src/collaborationresourceshandler.js
new file mode 100644
index 00000000000..fe27bd7fca0
--- /dev/null
+++ b/apps/files_sharing/src/collaborationresourceshandler.js
@@ -0,0 +1,20 @@
+__webpack_public_path__ = OC.linkTo('files_sharing', 'js/dist/');
+__webpack_nonce__ = btoa(OC.requestToken);
+
+window.OCP.Collaboration.registerType('files', {
+	action: () => {
+		return new Promise((resolve, reject) => {
+			OC.dialogs.filepicker('Link to a file', function (f) {
+				const client = OC.Files.getClient();
+				client.getFileInfo(f).then((status, fileInfo) => {
+					resolve(fileInfo.id);
+				}, () => {
+					reject();
+				});
+			}, false);
+		});
+	},
+	/** used in "Link to a {typeString}" */
+	typeString: t('files_sharing', 'file'),
+	typeIconClass: 'icon-files-dark'
+});
-- 
cgit v1.2.3


From 8a26022f921f169198fa3e1b2dd79e62914c5dc0 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Thu, 14 Mar 2019 17:41:25 +0100
Subject: Adjust resource type to file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/files_sharing/src/collaborationresourceshandler.js | 2 +-
 apps/files_sharing/src/views/CollaborationView.vue      | 2 +-
 core/src/OCP/collaboration.js                           | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'apps/files_sharing/src')

diff --git a/apps/files_sharing/src/collaborationresourceshandler.js b/apps/files_sharing/src/collaborationresourceshandler.js
index fe27bd7fca0..0ad7220d78e 100644
--- a/apps/files_sharing/src/collaborationresourceshandler.js
+++ b/apps/files_sharing/src/collaborationresourceshandler.js
@@ -1,7 +1,7 @@
 __webpack_public_path__ = OC.linkTo('files_sharing', 'js/dist/');
 __webpack_nonce__ = btoa(OC.requestToken);
 
-window.OCP.Collaboration.registerType('files', {
+window.OCP.Collaboration.registerType('file', {
 	action: () => {
 		return new Promise((resolve, reject) => {
 			OC.dialogs.filepicker('Link to a file', function (f) {
diff --git a/apps/files_sharing/src/views/CollaborationView.vue b/apps/files_sharing/src/views/CollaborationView.vue
index 6a64abb1467..9049db9f635 100644
--- a/apps/files_sharing/src/views/CollaborationView.vue
+++ b/apps/files_sharing/src/views/CollaborationView.vue
@@ -21,7 +21,7 @@
   -->
 
 <template>
-	<collection-list v-if="fileId" type="files" :id="fileId" :name="filename"></collection-list>
+	<collection-list v-if="fileId" type="file" :id="fileId" :name="filename"></collection-list>
 </template>
 
 <script>
diff --git a/core/src/OCP/collaboration.js b/core/src/OCP/collaboration.js
index 96a20bffc9c..cfbdb467f5e 100644
--- a/core/src/OCP/collaboration.js
+++ b/core/src/OCP/collaboration.js
@@ -39,7 +39,6 @@ export default {
 	 * @param {TypeDefinition} typeDefinition
 	 */
 	registerType(type, typeDefinition) {
-		console.log('Type ' + type + ' registered')
 		types[type] = typeDefinition;
 	},
 	trigger(type) {
-- 
cgit v1.2.3