Skip to content

Commit

Permalink
Merge pull request #17705 from nextcloud/dependabot/npm_and_yarn/esli…
Browse files Browse the repository at this point in the history
…nt-config-nextcloud-0.1.0

Bump eslint-config-nextcloud from 0.0.6 to 0.1.0
  • Loading branch information
ChristophWurst authored Dec 19, 2019
2 parents 5a986f0 + ec01e0a commit aa46fc2
Show file tree
Hide file tree
Showing 196 changed files with 1,258 additions and 1,254 deletions.
5 changes: 4 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@ module.exports = {
dayNames: true,
firstDay: true
},
extends: ['nextcloud']
extends: ['nextcloud'],
rules: {
'no-tabs': 'warn',
}
}
2 changes: 1 addition & 1 deletion apps/accessibility/js/accessibility.js.map

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions apps/accessibility/src/Accessibility.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ export default {
props: {
availableConfig: {
type: Object,
required: true
required: true,
},
userConfig: {
type: Object,
required: true
}
required: true,
},
},
computed: {
themes() {
Expand All @@ -55,7 +55,7 @@ export default {
return {
theme: this.userConfig.theme,
highcontrast: this.userConfig.highcontrast,
font: this.userConfig.font
font: this.userConfig.font,
}
},
description() {
Expand Down Expand Up @@ -87,7 +87,7 @@ export default {
},
designteamLink() {
return `<a target="_blank" href="https://nextcloud.com/design" rel="noreferrer nofollow">${t('accessibility', 'our design team')}</a>`
}
},
},
methods: {
// SELECT handlers
Expand Down Expand Up @@ -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)
Expand All @@ -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.'))
}
}
}
},
},
}
</script>
12 changes: 6 additions & 6 deletions apps/accessibility/src/components/ItemPreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ export default {
props: {
preview: {
type: Object,
required: true
required: true,
},
selected: {
type: String,
default: null
}
default: null,
},
},
computed: {
checked: {
Expand All @@ -33,8 +33,8 @@ export default {
},
set(checked) {
this.$emit('select', checked ? this.preview.id : '')
}
}
}
},
},
},
}
</script>
4 changes: 2 additions & 2 deletions apps/accessibility/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const View = Vue.extend(App)
const accessibility = new View({
propsData: {
availableConfig,
userConfig
}
userConfig,
},
})
accessibility.$mount('#accessibility')
2 changes: 1 addition & 1 deletion apps/comments/js/comments.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions apps/comments/src/activitytabviewplugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
$el.addClass('comment')
if (model.get('message') && this._isLong(model.get('message'))) {
$el.addClass('collapsed')
var $overlay = $('<div>').addClass('message-overlay')
const $overlay = $('<div>').addClass('message-overlay')
$el.find('.activitymessage').after($overlay)
$el.on('click', this._onClickCollapsedComment)
}
Expand All @@ -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')
}
Expand All @@ -50,7 +50,7 @@
*/
_isLong: function(message) {
return message.length > 250 || (message.match(/\n/g) || []).length > 1
}
},
}

})()
Expand Down
20 changes: 10 additions & 10 deletions apps/comments/src/commentmodel.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
})

/**
Expand All @@ -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: {
Expand All @@ -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) {
Expand All @@ -63,30 +63,30 @@
objectType: data.objectType,
objectId: data.objectId,
isUnread: (data.isUnread === 'true'),
mentions: this._parseMentions(data.mentions)
mentions: this._parseMentions(data.mentions),
}
},

_parseMentions: function(mentions) {
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
}
result[i][child.localName] = child.textContent
}
}
return result
}
},
})

OCA.Comments.CommentModel = CommentModel
Expand Down
28 changes: 14 additions & 14 deletions apps/comments/src/commentsmodifymenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},

/**
Expand All @@ -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')
}
Expand All @@ -59,7 +59,7 @@
*/
render: function() {
this.$el.html(OCA.Comments.Templates['commentsmodifymenu']({
items: this._scopes
items: this._scopes,
}))
},

Expand All @@ -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
Expand All @@ -100,7 +100,7 @@
this.$el.removeClass('hidden')

OC.showMenu(null, this.$el)
}
},
})

OCA.Comments = OCA.Comments || {}
Expand Down
8 changes: 4 additions & 4 deletions apps/comments/src/commentsummarymodel.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
})

/**
Expand All @@ -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,

Expand All @@ -41,7 +41,7 @@
_objectId: null,

davProperties: {
'readMarker': OC.Files.Client.PROPERTY_READMARKER
'readMarker': OC.Files.Client.PROPERTY_READMARKER,
},

/**
Expand All @@ -63,7 +63,7 @@
return OC.linkToRemote('dav') + '/comments/'
+ encodeURIComponent(this._objectType) + '/'
+ encodeURIComponent(this.id) + '/'
}
},
})

OCA.Comments.CommentSummaryModel = CommentSummaryModel
Expand Down
Loading

0 comments on commit aa46fc2

Please sign in to comment.