').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 191cfd0197..27fe68f645 100644
Binary files a/apps/files/js/dist/personal-settings.js and b/apps/files/js/dist/personal-settings.js differ
diff --git a/apps/files/js/dist/personal-settings.js.map b/apps/files/js/dist/personal-settings.js.map
index a76f0cfabe..5bcc3d98d1 100644
Binary files a/apps/files/js/dist/personal-settings.js.map and b/apps/files/js/dist/personal-settings.js.map differ
diff --git a/apps/files/js/dist/sidebar.js b/apps/files/js/dist/sidebar.js
index 492fe60d94..9edd238629 100644
Binary files a/apps/files/js/dist/sidebar.js and b/apps/files/js/dist/sidebar.js differ
diff --git a/apps/files/js/dist/sidebar.js.map b/apps/files/js/dist/sidebar.js.map
index b45098d82f..10cfbc076e 100644
Binary files a/apps/files/js/dist/sidebar.js.map and b/apps/files/js/dist/sidebar.js.map differ
diff --git a/apps/files/src/components/LegacyTab.vue b/apps/files/src/components/LegacyTab.vue
index 54a24edcdd..2802c9c58f 100644
--- a/apps/files/src/components/LegacyTab.vue
+++ b/apps/files/src/components/LegacyTab.vue
@@ -31,22 +31,22 @@ import AppSidebarTab from 'nextcloud-vue/dist/Components/AppSidebarTab'
export default {
name: 'LegacyTab',
components: {
- AppSidebarTab: AppSidebarTab
+ AppSidebarTab: AppSidebarTab,
},
props: {
component: {
type: Object,
- required: true
+ required: true,
},
name: {
type: String,
- required: true
+ required: true,
},
fileInfo: {
type: Object,
default: () => {},
- 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))
- }
- }
+ },
+ },
}