From ec01e0a790448fff38364f629a4de4edb5d465bf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2019 12:05:10 +0000 Subject: [PATCH] Bump eslint-config-nextcloud from 0.0.6 to 0.1.0 Bumps [eslint-config-nextcloud](https://github.com/nextcloud/eslint-config-nextcloud) from 0.0.6 to 0.1.0. - [Release notes](https://github.com/nextcloud/eslint-config-nextcloud/releases) - [Commits](https://github.com/nextcloud/eslint-config-nextcloud/compare/v0.0.6...v0.1.0) Co-authored-by: Christoph Wurst Signed-off-by: dependabot-preview[bot] Signed-off-by: Christoph Wurst --- .eslintrc.js | 5 +- apps/accessibility/js/accessibility.js.map | Bin 785843 -> 785864 bytes apps/accessibility/src/Accessibility.vue | 22 ++-- .../src/components/ItemPreview.vue | 12 +-- apps/accessibility/src/main.js | 4 +- apps/comments/js/comments.js.map | Bin 182843 -> 182919 bytes apps/comments/src/activitytabviewplugin.js | 6 +- apps/comments/src/commentmodel.js | 20 ++-- apps/comments/src/commentsmodifymenu.js | 28 ++--- apps/comments/src/commentsummarymodel.js | 8 +- apps/comments/src/filesplugin.js | 40 +++---- apps/files/js/dist/personal-settings.js | Bin 382797 -> 382797 bytes apps/files/js/dist/personal-settings.js.map | Bin 1320683 -> 1320695 bytes apps/files/js/dist/sidebar.js | Bin 366830 -> 366830 bytes apps/files/js/dist/sidebar.js.map | Bin 1383708 -> 1383744 bytes apps/files/src/components/LegacyTab.vue | 18 ++-- apps/files/src/components/LegacyView.vue | 12 +-- .../files/src/components/PersonalSettings.vue | 4 +- .../components/TransferOwnershipDialogue.vue | 24 ++--- apps/files/src/services/FileInfo.js | 2 +- apps/files/src/sidebar.js | 6 +- apps/files/src/views/Sidebar.vue | 28 ++--- apps/files_sharing/js/app.js | 20 ++-- .../js/dist/additionalScripts.js.map | Bin 56282 -> 56296 bytes .../js/dist/collaboration.js.map | Bin 6287 -> 6288 bytes .../js/dist/files_sharing.js.map | Bin 45665 -> 45678 bytes .../js/dist/files_sharing_tab.js | Bin 1315744 -> 1315744 bytes .../js/dist/files_sharing_tab.js.map | Bin 3485631 -> 3485752 bytes apps/files_sharing/js/dist/main.js.map | Bin 6268 -> 6270 bytes .../js/dist/personal-settings.js.map | Bin 780148 -> 780152 bytes .../src/collaborationresourceshandler.js | 2 +- .../src/components/PersonalSettings.vue | 8 +- .../src/components/SharingEntry.vue | 20 ++-- .../src/components/SharingEntryInherited.vue | 12 +-- .../src/components/SharingEntryInternal.vue | 14 +-- .../src/components/SharingEntryLink.vue | 28 ++--- .../src/components/SharingEntrySimple.vue | 14 +-- .../src/components/SharingInput.vue | 36 +++---- apps/files_sharing/src/index.js | 4 +- .../files_sharing/src/mixins/ShareRequests.js | 6 +- apps/files_sharing/src/mixins/ShareTypes.js | 6 +- apps/files_sharing/src/mixins/SharesMixin.js | 24 ++--- apps/files_sharing/src/sharebreadcrumbview.js | 16 +-- apps/files_sharing/src/utils/SharedWithMe.js | 8 +- .../src/views/SharingInherited.vue | 16 +-- .../src/views/SharingLinkList.vue | 16 +-- apps/files_sharing/src/views/SharingList.vue | 14 +-- apps/files_sharing/src/views/SharingTab.vue | 28 ++--- apps/files_trashbin/js/files_trashbin.js.map | 2 +- apps/files_trashbin/src/app.js | 40 +++---- apps/files_versions/js/files_versions.js | Bin 30588 -> 30586 bytes apps/files_versions/js/files_versions.js.map | Bin 186861 -> 186896 bytes apps/files_versions/src/filesplugin.js | 2 +- apps/files_versions/src/versioncollection.js | 16 +-- apps/files_versions/src/versionmodel.js | 16 +-- apps/files_versions/src/versionstabview.js | 39 ++++--- apps/oauth2/js/oauth2.js | Bin 161132 -> 161132 bytes apps/oauth2/js/oauth2.js.map | Bin 806215 -> 806231 bytes apps/oauth2/src/App.vue | 16 +-- apps/oauth2/src/components/OAuthItem.vue | 12 +-- apps/oauth2/src/main.js | 4 +- apps/settings/js/vue-4.js | Bin 28903 -> 28905 bytes apps/settings/js/vue-4.js.map | Bin 92436 -> 92536 bytes apps/settings/js/vue-6.js | Bin 70323 -> 70323 bytes apps/settings/js/vue-6.js.map | Bin 172142 -> 172332 bytes .../js/vue-settings-admin-security.js | Bin 629162 -> 629162 bytes .../js/vue-settings-admin-security.js.map | Bin 2241261 -> 2241274 bytes .../js/vue-settings-apps-users-management.js | Bin 249912 -> 249912 bytes .../vue-settings-apps-users-management.js.map | Bin 1202843 -> 1202924 bytes .../js/vue-settings-personal-security.js | Bin 668169 -> 668169 bytes .../js/vue-settings-personal-security.js.map | Bin 2026875 -> 2026922 bytes apps/settings/src/App.vue | 2 +- .../src/components/AdminTwoFactor.vue | 18 ++-- apps/settings/src/components/AppDetails.vue | 25 ++--- apps/settings/src/components/AppList.vue | 18 ++-- .../src/components/AppList/AppItem.vue | 18 ++-- .../src/components/AppList/AppScore.vue | 8 +- .../settings/src/components/AppManagement.vue | 14 +-- apps/settings/src/components/AuthToken.vue | 30 +++--- .../settings/src/components/AuthTokenList.vue | 16 +-- .../src/components/AuthTokenSection.vue | 16 +-- .../src/components/AuthTokenSetupDialogue.vue | 20 ++-- apps/settings/src/components/PrefixMixin.vue | 4 +- .../src/components/SvgFilterMixin.vue | 6 +- apps/settings/src/components/UserList.vue | 50 ++++----- .../src/components/UserList/UserRow.vue | 102 +++++++++--------- .../src/components/UserList/UserRowSimple.vue | 28 ++--- apps/settings/src/main-admin-security.js | 2 +- .../src/main-apps-users-management.js | 2 +- apps/settings/src/main-personal-security.js | 4 +- apps/settings/src/mixins/UserRowMixin.js | 40 +++---- apps/settings/src/router.js | 20 ++-- apps/settings/src/store/admin-security.js | 6 +- apps/settings/src/store/api.js | 2 +- apps/settings/src/store/apps.js | 26 ++--- apps/settings/src/store/index.js | 8 +- apps/settings/src/store/oc.js | 2 +- apps/settings/src/store/settings.js | 6 +- apps/settings/src/store/users.js | 48 ++++----- apps/settings/src/views/Apps.vue | 44 ++++---- apps/settings/src/views/Users.vue | 82 +++++++------- apps/systemtags/js/systemtags.js.map | Bin 53922 -> 53991 bytes apps/systemtags/src/app.js | 6 +- apps/systemtags/src/filesplugin.js | 10 +- apps/systemtags/src/systemtagsfilelist.js | 48 ++++----- apps/systemtags/src/systemtagsinfoview.js | 18 ++-- .../src/systemtagsinfoviewtoggleview.js | 6 +- apps/twofactor_backupcodes/js/settings.js | Bin 156768 -> 156768 bytes apps/twofactor_backupcodes/js/settings.js.map | Bin 778964 -> 778973 bytes apps/twofactor_backupcodes/src/settings.js | 2 +- apps/twofactor_backupcodes/src/store.js | 8 +- .../src/views/PersonalSettings.vue | 8 +- .../js/updatenotification.js | Bin 554371 -> 554371 bytes .../js/updatenotification.js.map | Bin 1507898 -> 1507936 bytes .../src/components/UpdateNotification.vue | 54 +++++----- apps/updatenotification/src/init.js | 6 +- apps/workflowengine/js/workflowengine.js | Bin 1055138 -> 1055138 bytes apps/workflowengine/js/workflowengine.js.map | Bin 2643631 -> 2643792 bytes apps/workflowengine/src/components/Check.vue | 20 ++-- .../src/components/Checks/FileMimeType.vue | 28 ++--- .../src/components/Checks/FileSystemTag.vue | 14 +-- .../Checks/MultiselectTag/MultiselectTag.vue | 22 ++-- .../components/Checks/MultiselectTag/api.js | 8 +- .../src/components/Checks/RequestTime.vue | 18 ++-- .../src/components/Checks/RequestURL.vue | 30 +++--- .../components/Checks/RequestUserAgent.vue | 18 ++-- .../components/Checks/RequestUserGroup.vue | 20 ++-- .../src/components/Checks/file.js | 22 ++-- .../src/components/Checks/request.js | 18 ++-- apps/workflowengine/src/components/Event.vue | 12 +-- .../src/components/Operation.vue | 8 +- apps/workflowengine/src/components/Rule.vue | 18 ++-- .../src/components/Workflow.vue | 14 +-- apps/workflowengine/src/helpers/api.js | 2 +- apps/workflowengine/src/mixins/valueMixin.js | 16 +-- apps/workflowengine/src/store.js | 18 ++-- apps/workflowengine/src/workflowengine.js | 4 +- core/js/dist/login.js | Bin 693295 -> 693294 bytes core/js/dist/login.js.map | Bin 2836695 -> 2836890 bytes core/js/dist/main.js | Bin 1338491 -> 1338490 bytes core/js/dist/main.js.map | Bin 4659935 -> 4660212 bytes core/js/dist/maintenance.js | Bin 580842 -> 580841 bytes core/js/dist/maintenance.js.map | Bin 2314451 -> 2314594 bytes core/js/dist/recommendedapps.js | Bin 175958 -> 175958 bytes core/js/dist/recommendedapps.js.map | Bin 860218 -> 860243 bytes core/js/dist/systemtags.js.map | Bin 69958 -> 69967 bytes core/js/systemtags/systemtagmodel.js | 12 +-- .../systemtags/systemtagsmappingcollection.js | 4 +- core/src/OC/apps.js | 18 ++-- core/src/OC/backbone.js | 2 +- core/src/OC/currentuser.js | 2 +- core/src/OC/get_set.js | 2 +- core/src/OC/index.js | 20 ++-- core/src/OC/l10n-registry.js | 2 +- core/src/OC/l10n.js | 34 +++--- core/src/OC/msg.js | 2 +- core/src/OC/notification.js | 2 +- core/src/OC/password-confirmation.js | 28 ++--- core/src/OC/plugins.js | 12 +-- core/src/OC/query-string.js | 11 +- core/src/OC/requesttoken.js | 2 +- core/src/OC/routing.js | 4 +- core/src/OC/util-history.js | 22 ++-- core/src/OC/util.js | 42 ++++---- core/src/OC/webroot.js | 2 +- core/src/OCP/appconfig.js | 6 +- core/src/OCP/collaboration.js | 6 +- core/src/OCP/index.js | 4 +- core/src/OCP/loader.js | 14 +-- core/src/OCP/toast.js | 8 +- core/src/OCP/whatsnew.js | 16 +-- core/src/Polyfill/closest.js | 2 +- core/src/Polyfill/console.js | 2 +- core/src/Util/human-file-size.js | 8 +- core/src/components/ContactsMenu.js | 2 +- core/src/components/login/LoginForm.vue | 26 ++--- core/src/components/login/ResetPassword.vue | 18 ++-- core/src/components/login/UpdatePassword.vue | 18 ++-- core/src/components/setup/RecommendedApps.vue | 22 ++-- core/src/globals.js | 2 +- core/src/init.js | 4 +- core/src/jquery/avatar.js | 12 +-- core/src/jquery/contactsmenu.js | 26 ++--- core/src/jquery/index.js | 4 +- core/src/jquery/ocdialog.js | 32 +++--- core/src/jquery/octemplate.js | 18 ++-- core/src/jquery/selectrange.js | 2 +- core/src/jquery/showpassword.js | 22 ++-- core/src/jquery/tipsy.js | 4 +- core/src/jquery/ui-fixes.js | 2 +- core/src/login.js | 4 +- core/src/mixins/Nextcloud.js | 6 +- core/src/recommendedapps.js | 4 +- core/src/views/Login.vue | 32 +++--- package-lock.json | 6 +- package.json | 2 +- 196 files changed, 1191 insertions(+), 1187 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index be6da20033..1f5dd9468f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -10,5 +10,8 @@ module.exports = { dayNames: true, firstDay: true }, - extends: ['nextcloud'] + extends: ['nextcloud'], + rules: { + 'no-tabs': 'warn', + } } diff --git a/apps/accessibility/js/accessibility.js.map b/apps/accessibility/js/accessibility.js.map index 6297ccf87a989329b438ec861600fb00016c431b..ccd51efe8bae92193356cd5640f48680d7e0e596 100644 GIT binary patch delta 283 zcmdn|TmQsw{SC|OSS*Z^QYWvjTh3x`WRV19s5jTvx7XG)0x=U1GXpUT5VHa?8xXSt zF$WNH0x{S2+Inuua1QfCb5kRe)YR?su5r7vFzQUNf59y_{pT%iT~3{tyqJ=hl3JbV zy0^K{^250x;aZ*TY>q*3e+F^oZAgmtMvB0&$)9L8FjX6 zzT|!ZRI^?1J@-9kn1LWWz_$GP#2v+woS#=bJ>oO>3@#9>L?I_LFME3aFE**|LSMLZ ZnAyRu06Gb1d+oL#+_|i9k)prcjsTGuYo`DJ delta 274 zcmX@{TYvL!{SC|OSWJuzEGDn6Th5Y}W?~3rs5jTvx7XG)0x=U1GXpUT5VHa?8xXSt zF$WNH0x{S2+Inuua1P6)WYa{mG_&pVu5r7vOrQ9kTV(o=Tip8WF?lg1F(tLr4Q_Lv z<$-cQRPA=2JKO=R9G1z6#zrZI$1J?1&L8?r{}?Z=*T=P*vM|IRJC z-Qy+qW!CL7@44?W^Fqu6Spc$v^D}o8Q%>si^v~QgIC4@;6ml~2vZv?&Vw2jg{DnJ* enH6mBbfCSp(^uc&=G(6LgFBuTD%$>++Ytad{%wZ< diff --git a/apps/accessibility/src/Accessibility.vue b/apps/accessibility/src/Accessibility.vue index 6ba680dc00..63cfec20c9 100644 --- a/apps/accessibility/src/Accessibility.vue +++ b/apps/accessibility/src/Accessibility.vue @@ -34,12 +34,12 @@ export default { props: { availableConfig: { type: Object, - required: true + required: true, }, userConfig: { type: Object, - required: true - } + required: true, + }, }, computed: { themes() { @@ -55,7 +55,7 @@ export default { return { theme: this.userConfig.theme, highcontrast: this.userConfig.highcontrast, - font: this.userConfig.font + font: this.userConfig.font, } }, description() { @@ -87,7 +87,7 @@ export default { }, designteamLink() { return `${t('accessibility', 'our design team')}` - } + }, }, methods: { // SELECT handlers @@ -123,17 +123,17 @@ export default { url: generateOcsUrl('apps/accessibility/api/v1/config', 2) + type, method: isDelete ? 'DELETE' : 'PUT', data: { - value: id - } + value: id, + }, }) this.userConfig[type] = id // Remove old link - let link = document.querySelector('link[rel=stylesheet][href*=accessibility][href*=user-]') + const link = document.querySelector('link[rel=stylesheet][href*=accessibility][href*=user-]') if (!link) { // insert new css - let link = document.createElement('link') + const link = document.createElement('link') link.rel = 'stylesheet' link.href = generateUrl('/apps/accessibility/css/user-style.css') + '?v=' + new Date().getTime() document.head.appendChild(link) @@ -157,7 +157,7 @@ export default { console.error(err, err.response) OC.Notification.showTemporary(t('accessibility', err.response.data.ocs.meta.message + '. Unable to apply the setting.')) } - } - } + }, + }, } diff --git a/apps/accessibility/src/components/ItemPreview.vue b/apps/accessibility/src/components/ItemPreview.vue index c0e52cc051..9c74eb03fd 100644 --- a/apps/accessibility/src/components/ItemPreview.vue +++ b/apps/accessibility/src/components/ItemPreview.vue @@ -19,12 +19,12 @@ export default { props: { preview: { type: Object, - required: true + required: true, }, selected: { type: String, - default: null - } + default: null, + }, }, computed: { checked: { @@ -33,8 +33,8 @@ export default { }, set(checked) { this.$emit('select', checked ? this.preview.id : '') - } - } - } + }, + }, + }, } diff --git a/apps/accessibility/src/main.js b/apps/accessibility/src/main.js index 0cb5952234..2f2db68968 100644 --- a/apps/accessibility/src/main.js +++ b/apps/accessibility/src/main.js @@ -14,7 +14,7 @@ const View = Vue.extend(App) const accessibility = new View({ propsData: { availableConfig, - userConfig - } + userConfig, + }, }) accessibility.$mount('#accessibility') diff --git a/apps/comments/js/comments.js.map b/apps/comments/js/comments.js.map index d9871a2779a970e2fc9176e31653b78a79e50c61..8f7c9551061b5794e72197c99479129488ef82af 100644 GIT binary patch delta 1100 zcmY*WTSyd980P;iqcps%Zf35ITiIGun$cCeoE=?VZCXXbGFw?Mx$3&6u4abyP$5QS zHR(}w)xx4E!q{NwMhQVt6ofCm#TN9?V-Hb1bwe-=SSCmWv3fl#7XSOm-4d#$W1YRW4(=TjiGrWrZkxcH_cn6iN+EkIGej zp`hnyG&3FXTAAr1Z~Vp-*A5qBoOG1>IfXd4C`{bvAX<3X2ENd;k+-lx?WtlJjzjH= z5!F>KR}xa?cQ9cQ@gFpb&DC-RQI207UB~=wqi*!tLj$90qTM$sxJGO?vl3rrkl?(ZiGVY_Aub|$Iq z#*mHGhS0+mJGHT(g^~221fAN);3&f#lQQIJlapTx)Fv({tneDTimnn_C5mgS#~49w zV_oCjc!KplgSzqr2L-xZ+e24SAQxCx8s%UMX!TQ5Kz zf=uUTAxRHkgxA0h;TX)IuP;H5(2yZmC1C9kSOh#X1dpS9jRC#jGVI{8D{*MmN3K9; z;{WN=O^BsMGjKK{)Zfm)ZO;EN4;KCMEjY~^FvPic;CGX-567d4?n}TQ>~dQoo;Mj2 z)dbj70v(mEIhgs8cPsCt&4wLAK zbi5mFtX1Kq+un1P?uBUcTcfJfRbo$BX*Eb>Ht)tH2N5xV|fLK_I_uS~2J zR{#sxrXZ;;*SJpzbKAwedfLhk#Qrc$2ox=5w4I2cE&&J&X kmS^KbHkUUS*Xx_sw6><>F_ob*trEce;gHqv}i#YSJ)dp-lD!-J&ZP z4f%e}=g@w?lSA+O7p-1eUR22wT`pHZM3}K&=gr4lF7sVqHu$3p`ln%)5v=7iT)PhH za@3J})x%hAz{ML&T!9){Y^hhPncjAFU?t~g4|t&|dVU}?W}$IZ@L6SE1&`^w&50Y$ z9wUE;sC8+Az&xeuVU6h>`u6`P)~TtrOwXIUi7t$48Sc~yD^)jR?gGJM?u`{ZSCXfj zor86J@XNt%u-;4xwI>+|<^A{7OQ=uK3e4-FWju5*q(H!Y6B^*UeMp5ub9m@I*Jp+u zseWC)!jVSN)~t!=49qQIP7bf&(b?hKDMpEK4`{7&G0%Qo-OF^p84f!*|0H)+wB zn=as|vPcF5qOFm!k7VzLHp(@@Mm^myO^Kf&$vSia8j&17x%_kyo&ueY#|(OT34$>} zUptjuhBRuO1%=+sLITlcxGUq)^XDL$m2BE{@b&mL%h*51=o=c z&}P{jsDSLrcj6u)tX?PHk|nD+6BAIHJG1_7+Lbjo!kWp#DWJ(Ih^6stERv}&+1NzC try!2@').addClass('message-overlay') + const $overlay = $('
').addClass('message-overlay') $el.find('.activitymessage').after($overlay) $el.on('click', this._onClickCollapsedComment) } @@ -38,7 +38,7 @@ * Copy of CommentsTabView._onClickComment() */ _onClickCollapsedComment: function(ev) { - var $row = $(ev.target) + let $row = $(ev.target) if (!$row.is('.comment')) { $row = $row.closest('.comment') } @@ -50,7 +50,7 @@ */ _isLong: function(message) { return message.length > 250 || (message.match(/\n/g) || []).length > 1 - } + }, } })() diff --git a/apps/comments/src/commentmodel.js b/apps/comments/src/commentmodel.js index 804fbdfd3c..252cf5dc66 100644 --- a/apps/comments/src/commentmodel.js +++ b/apps/comments/src/commentmodel.js @@ -20,7 +20,7 @@ PROPERTY_OBJECTTYPE: '{' + OC.Files.Client.NS_OWNCLOUD + '}objectType', PROPERTY_ACTORDISPLAYNAME: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorDisplayName', PROPERTY_CREATIONDATETIME: '{' + OC.Files.Client.NS_OWNCLOUD + '}creationDateTime', - PROPERTY_MENTIONS: '{' + OC.Files.Client.NS_OWNCLOUD + '}mentions' + PROPERTY_MENTIONS: '{' + OC.Files.Client.NS_OWNCLOUD + '}mentions', }) /** @@ -30,13 +30,13 @@ * Comment * */ - var CommentModel = OC.Backbone.Model.extend( + const CommentModel = OC.Backbone.Model.extend( /** @lends OCA.Comments.CommentModel.prototype */ { sync: OC.Backbone.davSync, defaults: { actorType: 'users', - objectType: 'files' + objectType: 'files', }, davProperties: { @@ -49,7 +49,7 @@ 'objectType': OC.Files.Client.PROPERTY_OBJECTTYPE, 'objectId': OC.Files.Client.PROPERTY_OBJECTID, 'isUnread': OC.Files.Client.PROPERTY_ISUNREAD, - 'mentions': OC.Files.Client.PROPERTY_MENTIONS + 'mentions': OC.Files.Client.PROPERTY_MENTIONS, }, parse: function(data) { @@ -63,7 +63,7 @@ objectType: data.objectType, objectId: data.objectId, isUnread: (data.isUnread === 'true'), - mentions: this._parseMentions(data.mentions) + mentions: this._parseMentions(data.mentions), } }, @@ -71,14 +71,14 @@ if (_.isUndefined(mentions)) { return {} } - var result = {} - for (var i in mentions) { - var mention = mentions[i] + const result = {} + for (const i in mentions) { + const mention = mentions[i] if (_.isUndefined(mention.localName) || mention.localName !== 'mention') { continue } result[i] = {} - for (var child = mention.firstChild; child; child = child.nextSibling) { + for (let child = mention.firstChild; child; child = child.nextSibling) { if (_.isUndefined(child.localName) || !child.localName.startsWith('mention')) { continue } @@ -86,7 +86,7 @@ } } return result - } + }, }) OCA.Comments.CommentModel = CommentModel diff --git a/apps/comments/src/commentsmodifymenu.js b/apps/comments/src/commentsmodifymenu.js index 7c9470f13b..340e71aa5f 100644 --- a/apps/comments/src/commentsmodifymenu.js +++ b/apps/comments/src/commentsmodifymenu.js @@ -16,26 +16,26 @@ * @memberof OC.Comments * @private */ - var CommentsModifyMenu = OC.Backbone.View.extend({ + const CommentsModifyMenu = OC.Backbone.View.extend({ tagName: 'div', className: 'commentsModifyMenu popovermenu bubble menu', _scopes: [ { name: 'edit', displayName: t('comments', 'Edit comment'), - iconClass: 'icon-rename' + iconClass: 'icon-rename', }, { name: 'delete', displayName: t('comments', 'Delete comment'), - iconClass: 'icon-delete' - } + iconClass: 'icon-delete', + }, ], initialize: function() { }, events: { - 'click a.action': '_onClickAction' + 'click a.action': '_onClickAction', }, /** @@ -44,7 +44,7 @@ * @param {Object} event event object */ _onClickAction: function(event) { - var $target = $(event.currentTarget) + let $target = $(event.currentTarget) if (!$target.hasClass('menuitem')) { $target = $target.closest('.menuitem') } @@ -59,7 +59,7 @@ */ render: function() { this.$el.html(OCA.Comments.Templates['commentsmodifymenu']({ - items: this._scopes + items: this._scopes, })) }, @@ -70,19 +70,19 @@ show: function(context) { this._context = context - for (var i in this._scopes) { + for (const i in this._scopes) { this._scopes[i].active = false } - var $el = $(context.target) - var offsetIcon = $el.offset() - var offsetContainer = $el.closest('.authorRow').offset() + const $el = $(context.target) + const offsetIcon = $el.offset() + const offsetContainer = $el.closest('.authorRow').offset() // adding some extra top offset to push the menu below the button. - var position = { + const position = { top: offsetIcon.top - offsetContainer.top + 48, left: '', - right: '' + right: '', } position.left = offsetIcon.left - offsetContainer.left @@ -100,7 +100,7 @@ this.$el.removeClass('hidden') OC.showMenu(null, this.$el) - } + }, }) OCA.Comments = OCA.Comments || {} diff --git a/apps/comments/src/commentsummarymodel.js b/apps/comments/src/commentsummarymodel.js index 1a3002a9f7..5589b1807c 100644 --- a/apps/comments/src/commentsummarymodel.js +++ b/apps/comments/src/commentsummarymodel.js @@ -11,7 +11,7 @@ (function(OC, OCA) { _.extend(OC.Files.Client, { - PROPERTY_READMARKER: '{' + OC.Files.Client.NS_OWNCLOUD + '}readMarker' + PROPERTY_READMARKER: '{' + OC.Files.Client.NS_OWNCLOUD + '}readMarker', }) /** @@ -22,7 +22,7 @@ * like the read marker. * */ - var CommentSummaryModel = OC.Backbone.Model.extend( + const CommentSummaryModel = OC.Backbone.Model.extend( /** @lends OCA.Comments.CommentSummaryModel.prototype */ { sync: OC.Backbone.davSync, @@ -41,7 +41,7 @@ _objectId: null, davProperties: { - 'readMarker': OC.Files.Client.PROPERTY_READMARKER + 'readMarker': OC.Files.Client.PROPERTY_READMARKER, }, /** @@ -63,7 +63,7 @@ return OC.linkToRemote('dav') + '/comments/' + encodeURIComponent(this._objectType) + '/' + encodeURIComponent(this.id) + '/' - } + }, }) OCA.Comments.CommentSummaryModel = CommentSummaryModel diff --git a/apps/comments/src/filesplugin.js b/apps/comments/src/filesplugin.js index 3e0cdd7f70..1a3a2c5348 100644 --- a/apps/comments/src/filesplugin.js +++ b/apps/comments/src/filesplugin.js @@ -11,7 +11,7 @@ (function() { _.extend(OC.Files.Client, { - PROPERTY_COMMENTS_UNREAD: '{' + OC.Files.Client.NS_OWNCLOUD + '}comments-unread' + PROPERTY_COMMENTS_UNREAD: '{' + OC.Files.Client.NS_OWNCLOUD + '}comments-unread', }) OCA.Comments = _.extend({}, OCA.Comments) @@ -28,36 +28,36 @@ OCA.Comments.FilesPlugin = { ignoreLists: [ 'trashbin', - 'files.public' + 'files.public', ], _formatCommentCount: function(count) { return OCA.Comments.Templates['filesplugin']({ count: count, countMessage: n('comments', '%n unread comment', '%n unread comments', count), - iconUrl: OC.imagePath('core', 'actions/comment') + iconUrl: OC.imagePath('core', 'actions/comment'), }) }, attach: function(fileList) { - var self = this + const self = this if (this.ignoreLists.indexOf(fileList.id) >= 0) { return } fileList.registerTabView(new OCA.Comments.CommentsTabView('commentsTabView')) - var oldGetWebdavProperties = fileList._getWebdavProperties + const oldGetWebdavProperties = fileList._getWebdavProperties fileList._getWebdavProperties = function() { - var props = oldGetWebdavProperties.apply(this, arguments) + const props = oldGetWebdavProperties.apply(this, arguments) props.push(OC.Files.Client.PROPERTY_COMMENTS_UNREAD) return props } fileList.filesClient.addFileInfoParser(function(response) { - var data = {} - var props = response.propStat[0].properties - var commentsUnread = props[OC.Files.Client.PROPERTY_COMMENTS_UNREAD] + const data = {} + const props = response.propStat[0].properties + const commentsUnread = props[OC.Files.Client.PROPERTY_COMMENTS_UNREAD] if (!_.isUndefined(commentsUnread) && commentsUnread !== '') { data.commentsUnread = parseInt(commentsUnread, 10) } @@ -65,9 +65,9 @@ }) fileList.$el.addClass('has-comments') - var oldCreateRow = fileList._createRow + const oldCreateRow = fileList._createRow fileList._createRow = function(fileData) { - var $tr = oldCreateRow.apply(this, arguments) + const $tr = oldCreateRow.apply(this, arguments) if (fileData.commentsUnread) { $tr.attr('data-comments-unread', fileData.commentsUnread) } @@ -79,7 +79,7 @@ name: 'Comment', displayName: function(context) { if (context && context.$file) { - var unread = parseInt(context.$file.data('comments-unread'), 10) + const unread = parseInt(context.$file.data('comments-unread'), 10) if (unread >= 0) { return n('comments', '1 new comment', '{unread} new comments', unread, { unread: unread }) } @@ -92,10 +92,10 @@ permissions: OC.PERMISSION_READ, type: OCA.Files.FileActions.TYPE_INLINE, render: function(actionSpec, isDefault, context) { - var $file = context.$file - var unreadComments = $file.data('comments-unread') + const $file = context.$file + const unreadComments = $file.data('comments-unread') if (unreadComments) { - var $actionLink = $(self._formatCommentCount(unreadComments)) + const $actionLink = $(self._formatCommentCount(unreadComments)) context.$file.find('a.name>span.fileactions').append($actionLink) return $actionLink } @@ -105,20 +105,20 @@ context.$file.find('.action-comment').tooltip('hide') // open sidebar in comments section context.fileList.showDetailsView(fileName, 'comments') - } + }, }) // add attribute to "elementToFile" - var oldElementToFile = fileList.elementToFile + const oldElementToFile = fileList.elementToFile fileList.elementToFile = function($el) { - var fileInfo = oldElementToFile.apply(this, arguments) - var commentsUnread = $el.data('comments-unread') + const fileInfo = oldElementToFile.apply(this, arguments) + const commentsUnread = $el.data('comments-unread') if (commentsUnread) { fileInfo.commentsUnread = commentsUnread } return fileInfo } - } + }, } })() diff --git a/apps/files/js/dist/personal-settings.js b/apps/files/js/dist/personal-settings.js index 191cfd019720f5bf501e67fb31040e270f365798..27fe68f6459dede0efa8125df6d6d04a45a2e8aa 100644 GIT binary patch delta 96 zcmX@RPW#%~RR_-7-nx%9L>R$+c#$=S6#)M)9}NHi delta 96 zcmX@RPWQFSKKonQqX}$l2~Off0zAfS4JGS+;vjU}eIrm>#%~RR_-7-nx%9L>R$+c#$=S6#y`DACmw8 diff --git a/apps/files/js/dist/personal-settings.js.map b/apps/files/js/dist/personal-settings.js.map index a76f0cfabe9370d5c3f0da68f86ea7d021e3d898..5bcc3d98d18f916b56ec11cbd1166f19eda28421 100644 GIT binary patch delta 435 zcmaETHsJf&fDPMCSS-v8jVBwLIZxgYCA3+-Vb51>GOUF z8*TscL%58YQD=JAAK`0^I@=xo3Kud0>5cz{Zv*M2JtD09Ix%@MB`{d4vwbG3NE1kn zG`q+=5WSN_WGNFnSQSt-5yMi!u9CDSKziHK~sVi##++}MMVB0 kcpx87-zF;Z7%sGZp_s@~b`E2UWP`+H3zO}6aw44^04kxLqW}N^ diff --git a/apps/files/js/dist/sidebar.js b/apps/files/js/dist/sidebar.js index 492fe60d94dcf8babbe381e50377f433616af328..9edd2386295deb235779f7767af7710b4e0b2cb4 100644 GIT binary patch delta 79 zcmaF2QS9ADv4$;-^GZ1^ObiW-j4Tq{mz6RCF%u9oZ(ml*vS$yciHU(psw+um8~hT)aQu#>Y^WvJ{XyET~y{pUiEX)-;kh-s4S#X={p-u!Heg6c;4@Mo{x|BYBrS1 zhVDfgdD$C~6^~}O(!bY;*E2?OBH!4(mG6mqqe>=Jr?iEvyzFjmR^~XTG8j6~OP*-6 zGSC^A2y}LGywBefDf;dnyvfJBeh(83XVYC{=`N08149J^&!Az@(sY+F-o))gGZA)h ztz$tVFz6Wc3@!c_kSWXP}zSk5<|^U5n4-mZX**LMjOn2{933CS)Ta z7DB8Ki7o!S9HT6Djw{Pz3&Jq0=>HcV#_t`rD%^I!rlo-q*duW+dinu0=s6eOn1l{S z3zM*ukz)pq=w0DNI2BF}x#*?GaGPV};ThPB-8mR#!FM_6=Y*nX$c2`_P=#%?unU`> zfCV4rK@?B~F>g>|KB*@!xwhGTgA1!UKC9o0#a&mWOv0b~{R^!Y64M3$I) z1GiM#WVX=@Z(+NRiTg=2;CQb|i|NZI9_K$ndd<{=C#FpTUWr@v*#8lDyjFnr(tRym zE&yM_KE!>7UX}a4K$zD=P9~Bm`s^!Y`I52bqGHjPD();`*j8{t&R eltFBd^kNfd%YTa&Pl?VK};VC9tPMl!Q^ zATbyRdTzpX(?#86SiLY%$8MtX#;a1iC@q2tLk3A~TJKgVb@7AudEWQ;f4_3s;Js{c zOljeL0biTmYCNi6J#NNK+H4)qx18C{t8SmFr-M!Upp#{HQyQxCkMkEql#f*@C+lPnhu7A)L!lcN<=uwd6OMP zV2BJ8V-xKl=Id*sE2>4^N~;^=H((3>IBckMI8bm8D%)&#Qsh4atGY1Dme9|WY zE-k>w?@{Vvjf|s<&|NMa__Y9by6XdctHQVSl7;U41U-hzk@0*|7U-SN(8U|BMH2M= z5@h+ZwDqnon{cWCPC8$JZUgnMz#9Wvi{Qlj&twtZMOfZ=)jcJ6u~C(O3Sku%*IV@G zD)cs**%sTBEAf6U-j7Wy)<*0~OGeB%?6sAtzDueWjU;fYk6rYg!|vd) {}, - required: true - } + required: true, + }, }, computed: { icon() { @@ -64,14 +64,14 @@ export default { // needed because AppSidebarTab also uses $parent.activeTab activeTab() { return this.$parent.activeTab - } + }, }, watch: { activeTab(activeTab) { if (activeTab === this.id && this.fileInfo) { this.setFileInfo(this.fileInfo) } - } + }, }, beforeMount() { this.setFileInfo(this.fileInfo) @@ -86,8 +86,8 @@ export default { methods: { setFileInfo(fileInfo) { this.component.setFileInfo(new OCA.Files.FileInfoModel(fileInfo)) - } - } + }, + }, }