Merge pull request #1092 from nextcloud/bugfix/noid/open-deck-links-i…

…n-same-tab Open the deck links in the same tab
nextcloud · Oct 15, 2021 · 519c37c · 519c37c
2 parents 6d47210 + 5514d81
commit 519c37c
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 16 deletions.
diff --git a/js/notifications-main.js b/js/notifications-main.js
diff --git a/js/notifications-main.js.LICENSE.txt b/js/notifications-main.js.LICENSE.txt
@@ -45,7 +45,7 @@
 /**
  * @copyright Copyright (c) 2018 Joas Schilling <coding@schilljs.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -220,7 +220,7 @@
 /**
  * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

diff --git a/js/notifications-main.js.map b/js/notifications-main.js.map
diff --git a/js/notifications-settings.js.LICENSE.txt b/js/notifications-settings.js.LICENSE.txt
@@ -36,7 +36,7 @@
 /**
  * @copyright Copyright (c) 2021 Julien Barnoin <julien@barnoin.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

diff --git a/js/notifications-settings.js.map b/js/notifications-settings.js.map
diff --git a/src/App.vue b/src/App.vue
@@ -245,7 +245,8 @@ export default {
 
 		/**
 		 * Update the title to show * if there are new notifications
-		 * @param {Object} notifications The list of notifications
+		 *
+		 * @param {object} notifications The list of notifications
 		 */
 		_updateDocTitleOnNewNotifications(notifications) {
 			if (notifications.length > this._oldcount) {
@@ -271,8 +272,8 @@ export default {
 		},
 
 		/**
-			 * Performs the AJAX request to retrieve the notifications
-			 */
+		 * Performs the AJAX request to retrieve the notifications
+		 */
 		async _fetch() {
 			const response = await getNotificationsData(this.tabId, this.lastETag, !this.backgroundFetching)
 
@@ -339,7 +340,8 @@ export default {
 		/**
 		 * The app was disabled or has no notifiers, so we can stop polling
 		 * And hide the UI as well
-		 * @param {Boolean} temporary If false, the notification bell will be hidden
+		 *
+		 * @param {boolean} temporary If false, the notification bell will be hidden
 		 */
 		_shutDownNotifications(temporary) {
 			console.debug('Shutting down notifications ' + ((temporary) ? 'temporary' : 'bye'))

diff --git a/src/Components/Notification.vue b/src/Components/Notification.vue
@@ -266,6 +266,7 @@ export default {
 
 		/**
 		 * Create a browser notification
+		 *
 		 * @see https://developer.mozilla.org/en/docs/Web/API/notification
 		 */
 		_createWebNotification() {

diff --git a/src/Components/Parameters/DefaultParameter.vue b/src/Components/Parameters/DefaultParameter.vue
@@ -20,7 +20,11 @@
 -->
 
 <template>
-	<a v-if="link"
+	<a v-if="hasInternalLink"
+		:href="link">
+		<strong>{{ name }}</strong>
+	</a>
+	<a v-else-if="link"
 		:href="link"
 		class="external"
 		target="_blank"
@@ -51,6 +55,15 @@ export default {
 			default: '',
 		},
 	},
+
+	computed: {
+		hasInternalLink() {
+			return this.link && (
+				this.type === 'deck-board'
+				|| this.type === 'deck-card'
+			)
+		},
+	},
 }
 </script>
 

diff --git a/src/main.js b/src/main.js
@@ -1,7 +1,7 @@
 /**
  * @copyright Copyright (c) 2018 Joas Schilling <coding@schilljs.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

diff --git a/src/services/BrowserStorage.js b/src/services/BrowserStorage.js
@@ -1,7 +1,7 @@
 /**
  * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

diff --git a/src/services/notificationsService.js b/src/services/notificationsService.js
@@ -1,7 +1,7 @@
 /**
  * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

diff --git a/src/settings.js b/src/settings.js
@@ -1,7 +1,7 @@
 /**
  * @copyright Copyright (c) 2021 Julien Barnoin <julien@barnoin.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as