Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorLouis Chemineau <louis@chmn.me>2021-12-02 16:50:49 +0300
committerJohn Molakvoæ <skjnldsv@protonmail.com>2022-01-08 12:12:47 +0300
commitadfb9010d47c91c5cc95b764d68ec181a029b475 (patch)
tree6899c32dd81015e76609edf6ae371ab2082925b0 /apps
parentf8f09bff0409347573464aba31a9775157c87530 (diff)
Migrate to webpack v5
Signed-off-by: Louis Chemineau <louis@chmn.me>
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/src/mixins/SharesMixin.js14
-rw-r--r--apps/settings/src/components/Markdown.vue2
-rw-r--r--apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php2
3 files changed, 11 insertions, 7 deletions
diff --git a/apps/files_sharing/src/mixins/SharesMixin.js b/apps/files_sharing/src/mixins/SharesMixin.js
index 15d3e2712cf..df0d0fec31d 100644
--- a/apps/files_sharing/src/mixins/SharesMixin.js
+++ b/apps/files_sharing/src/mixins/SharesMixin.js
@@ -93,7 +93,8 @@ export default {
/**
* Does the current share have a note
- * @returns {boolean}
+ *
+ * @return {boolean}
*/
hasNote: {
get() {
@@ -143,7 +144,7 @@ export default {
* firing the request
*
* @param {Share} share the share to check
- * @returns {Boolean}
+ * @return {boolean}
*/
checkShare(share) {
if (share.password) {
@@ -187,7 +188,8 @@ export default {
/**
* Note changed, let's save it to a different key
- * @param {String} note the share note
+ *
+ * @param {string} note the share note
*/
onNoteChange(note) {
this.$set(this.share, 'newNote', note.trim())
@@ -241,7 +243,7 @@ export default {
// share api controller accepts
propertyNames.map(p => (properties[p] = this.share[p].toString()))
- this.updateQueue.add(async() => {
+ this.updateQueue.add(async () => {
this.saving = true
this.errors = {}
try {
@@ -270,6 +272,7 @@ export default {
/**
* Manage sync errors
+ *
* @param {string} property the errored property, e.g. 'password'
* @param {string} message the error message
*/
@@ -321,8 +324,9 @@ export default {
/**
* Returns which dates are disabled for the datepicker
+ *
* @param {Date} date date to check
- * @returns {boolean}
+ * @return {boolean}
*/
disabledDate(date) {
const dateMoment = moment(date)
diff --git a/apps/settings/src/components/Markdown.vue b/apps/settings/src/components/Markdown.vue
index 1f7f9b01cf6..fbbbf7456a1 100644
--- a/apps/settings/src/components/Markdown.vue
+++ b/apps/settings/src/components/Markdown.vue
@@ -25,7 +25,7 @@
</template>
<script>
-import marked from 'marked'
+import { marked } from 'marked'
import dompurify from 'dompurify'
export default {
diff --git a/apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php b/apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php
index c98e988a37c..6fe2f728de0 100644
--- a/apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php
+++ b/apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php
@@ -99,7 +99,7 @@ class BeforeTemplateRenderedListener implements IEventListener {
return ['profileEnabled' => $this->isProfileEnabled($account)];
});
- \OCP\Util::addScript('user_status', 'user_status-menu');
+ \OCP\Util::addScript('user_status', 'menu');
\OCP\Util::addStyle('user_status', 'user-status-menu');
}
}