').addClass('message-overlay');
- $el.find('.activitymessage').after($overlay);
- $el.on('click', this._onClickCollapsedComment);
+ $el.addClass('collapsed')
+ var $overlay = $('
').addClass('message-overlay')
+ $el.find('.activitymessage').after($overlay)
+ $el.on('click', this._onClickCollapsedComment)
}
}
},
@@ -38,22 +38,21 @@
* Copy of CommentsTabView._onClickComment()
*/
_onClickCollapsedComment: function(ev) {
- var $row = $(ev.target);
+ var $row = $(ev.target)
if (!$row.is('.comment')) {
- $row = $row.closest('.comment');
+ $row = $row.closest('.comment')
}
- $row.removeClass('collapsed');
+ $row.removeClass('collapsed')
},
/*
* Copy of CommentsTabView._isLong()
*/
_isLong: function(message) {
- return message.length > 250 || (message.match(/\n/g) || []).length > 1;
+ return message.length > 250 || (message.match(/\n/g) || []).length > 1
}
- };
+ }
+})()
-})();
-
-OC.Plugins.register('OCA.Activity.RenderingPlugins', OCA.Comments.ActivityTabViewPlugin);
+OC.Plugins.register('OCA.Activity.RenderingPlugins', OCA.Comments.ActivityTabViewPlugin)
diff --git a/apps/comments/src/app.js b/apps/comments/src/app.js
index 547059393a..626d7703a3 100644
--- a/apps/comments/src/app.js
+++ b/apps/comments/src/app.js
@@ -13,8 +13,7 @@
/**
* @namespace
*/
- OCA.Comments = {};
+ OCA.Comments = {}
}
-})();
-
+})()
diff --git a/apps/comments/src/commentcollection.js b/apps/comments/src/commentcollection.js
index a15039cf48..8e7f9e37d5 100644
--- a/apps/comments/src/commentcollection.js
+++ b/apps/comments/src/commentcollection.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/*
* Copyright (c) 2016
*
@@ -20,148 +21,147 @@
var CommentCollection = OC.Backbone.Collection.extend(
/** @lends OCA.Comments.CommentCollection.prototype */ {
- sync: OC.Backbone.davSync,
+ sync: OC.Backbone.davSync,
- model: OCA.Comments.CommentModel,
+ model: OCA.Comments.CommentModel,
- /**
+ /**
* Object type
*
* @type string
*/
- _objectType: 'files',
+ _objectType: 'files',
- /**
+ /**
* Object id
*
* @type string
*/
- _objectId: null,
+ _objectId: null,
- /**
+ /**
* True if there are no more page results left to fetch
*
* @type bool
*/
- _endReached: false,
+ _endReached: false,
- /**
+ /**
* Number of comments to fetch per page
*
* @type int
*/
- _limit : 20,
+ _limit: 20,
- /**
+ /**
* Initializes the collection
*
* @param {string} [options.objectType] object type
* @param {string} [options.objectId] object id
*/
- initialize: function(models, options) {
- options = options || {};
- if (options.objectType) {
- this._objectType = options.objectType;
- }
- if (options.objectId) {
- this._objectId = options.objectId;
- }
- },
+ initialize: function(models, options) {
+ options = options || {}
+ if (options.objectType) {
+ this._objectType = options.objectType
+ }
+ if (options.objectId) {
+ this._objectId = options.objectId
+ }
+ },
- url: function() {
- return OC.linkToRemote('dav') + '/comments/' +
- encodeURIComponent(this._objectType) + '/' +
- encodeURIComponent(this._objectId) + '/';
- },
+ url: function() {
+ return OC.linkToRemote('dav') + '/comments/'
+ + encodeURIComponent(this._objectType) + '/'
+ + encodeURIComponent(this._objectId) + '/'
+ },
- setObjectId: function(objectId) {
- this._objectId = objectId;
- },
+ setObjectId: function(objectId) {
+ this._objectId = objectId
+ },
- hasMoreResults: function() {
- return !this._endReached;
- },
+ hasMoreResults: function() {
+ return !this._endReached
+ },
- reset: function() {
- this._endReached = false;
- this._summaryModel = null;
- return OC.Backbone.Collection.prototype.reset.apply(this, arguments);
- },
+ reset: function() {
+ this._endReached = false
+ this._summaryModel = null
+ return OC.Backbone.Collection.prototype.reset.apply(this, arguments)
+ },
- /**
+ /**
* Fetch the next set of results
*/
- fetchNext: function(options) {
- var self = this;
- if (!this.hasMoreResults()) {
- return null;
- }
-
- var body = '\n' +
- '\n' +
- // load one more so we know there is more
- ' ' + (this._limit + 1) + ' \n' +
- ' ' + this.length + ' \n' +
- ' \n';
-
- options = options || {};
- var success = options.success;
- options = _.extend({
- remove: false,
- parse: true,
- data: body,
- davProperties: CommentCollection.prototype.model.prototype.davProperties,
- success: function(resp) {
- if (resp.length <= self._limit) {
- // no new entries, end reached
- self._endReached = true;
- } else {
- // remove last entry, for next page load
- resp = _.initial(resp);
- }
- if (!self.set(resp, options)) {
- return false;
- }
- if (success) {
- success.apply(null, arguments);
- }
- self.trigger('sync', 'REPORT', self, options);
+ fetchNext: function(options) {
+ var self = this
+ if (!this.hasMoreResults()) {
+ return null
}
- }, options);
- return this.sync('REPORT', this, options);
- },
+ var body = '\n'
+ + '\n'
+ // load one more so we know there is more
+ + ' ' + (this._limit + 1) + ' \n'
+ + ' ' + this.length + ' \n'
+ + ' \n'
- /**
+ options = options || {}
+ var success = options.success
+ options = _.extend({
+ remove: false,
+ parse: true,
+ data: body,
+ davProperties: CommentCollection.prototype.model.prototype.davProperties,
+ success: function(resp) {
+ if (resp.length <= self._limit) {
+ // no new entries, end reached
+ self._endReached = true
+ } else {
+ // remove last entry, for next page load
+ resp = _.initial(resp)
+ }
+ if (!self.set(resp, options)) {
+ return false
+ }
+ if (success) {
+ success.apply(null, arguments)
+ }
+ self.trigger('sync', 'REPORT', self, options)
+ }
+ }, options)
+
+ return this.sync('REPORT', this, options)
+ },
+
+ /**
* Returns the matching summary model
*
- * @return {OCA.Comments.CommentSummaryModel} summary model
+ * @returns {OCA.Comments.CommentSummaryModel} summary model
*/
- getSummaryModel: function() {
- if (!this._summaryModel) {
- this._summaryModel = new OCA.Comments.CommentSummaryModel({
- id: this._objectId,
- objectType: this._objectType
- });
- }
- return this._summaryModel;
- },
+ getSummaryModel: function() {
+ if (!this._summaryModel) {
+ this._summaryModel = new OCA.Comments.CommentSummaryModel({
+ id: this._objectId,
+ objectType: this._objectType
+ })
+ }
+ return this._summaryModel
+ },
- /**
+ /**
* Updates the read marker for this comment thread
*
* @param {Date} [date] optional date, defaults to now
* @param {Object} [options] backbone options
*/
- updateReadMarker: function(date, options) {
- options = options || {};
+ updateReadMarker: function(date, options) {
+ options = options || {}
- return this.getSummaryModel().save({
- readMarker: (date || new Date()).toUTCString()
- }, options);
- }
- });
-
- OCA.Comments.CommentCollection = CommentCollection;
-})(OC, OCA);
+ return this.getSummaryModel().save({
+ readMarker: (date || new Date()).toUTCString()
+ }, options)
+ }
+ })
+ OCA.Comments.CommentCollection = CommentCollection
+})(OC, OCA)
diff --git a/apps/comments/src/commentmodel.js b/apps/comments/src/commentmodel.js
index 3711e53c9f..804fbdfd3c 100644
--- a/apps/comments/src/commentmodel.js
+++ b/apps/comments/src/commentmodel.js
@@ -12,7 +12,7 @@
_.extend(OC.Files.Client, {
PROPERTY_FILEID: '{' + OC.Files.Client.NS_OWNCLOUD + '}id',
- PROPERTY_MESSAGE: '{' + OC.Files.Client.NS_OWNCLOUD + '}message',
+ PROPERTY_MESSAGE: '{' + OC.Files.Client.NS_OWNCLOUD + '}message',
PROPERTY_ACTORTYPE: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorType',
PROPERTY_ACTORID: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorId',
PROPERTY_ISUNREAD: '{' + OC.Files.Client.NS_OWNCLOUD + '}isUnread',
@@ -21,7 +21,7 @@
PROPERTY_ACTORDISPLAYNAME: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorDisplayName',
PROPERTY_CREATIONDATETIME: '{' + OC.Files.Client.NS_OWNCLOUD + '}creationDateTime',
PROPERTY_MENTIONS: '{' + OC.Files.Client.NS_OWNCLOUD + '}mentions'
- });
+ })
/**
* @class OCA.Comments.CommentModel
@@ -32,62 +32,62 @@
*/
var CommentModel = OC.Backbone.Model.extend(
/** @lends OCA.Comments.CommentModel.prototype */ {
- sync: OC.Backbone.davSync,
+ sync: OC.Backbone.davSync,
- defaults: {
- actorType: 'users',
- objectType: 'files'
- },
+ defaults: {
+ actorType: 'users',
+ objectType: 'files'
+ },
- davProperties: {
- 'id': OC.Files.Client.PROPERTY_FILEID,
- 'message': OC.Files.Client.PROPERTY_MESSAGE,
- 'actorType': OC.Files.Client.PROPERTY_ACTORTYPE,
- 'actorId': OC.Files.Client.PROPERTY_ACTORID,
- 'actorDisplayName': OC.Files.Client.PROPERTY_ACTORDISPLAYNAME,
- 'creationDateTime': OC.Files.Client.PROPERTY_CREATIONDATETIME,
- 'objectType': OC.Files.Client.PROPERTY_OBJECTTYPE,
- 'objectId': OC.Files.Client.PROPERTY_OBJECTID,
- 'isUnread': OC.Files.Client.PROPERTY_ISUNREAD,
- 'mentions': OC.Files.Client.PROPERTY_MENTIONS
- },
+ davProperties: {
+ 'id': OC.Files.Client.PROPERTY_FILEID,
+ 'message': OC.Files.Client.PROPERTY_MESSAGE,
+ 'actorType': OC.Files.Client.PROPERTY_ACTORTYPE,
+ 'actorId': OC.Files.Client.PROPERTY_ACTORID,
+ 'actorDisplayName': OC.Files.Client.PROPERTY_ACTORDISPLAYNAME,
+ 'creationDateTime': OC.Files.Client.PROPERTY_CREATIONDATETIME,
+ 'objectType': OC.Files.Client.PROPERTY_OBJECTTYPE,
+ 'objectId': OC.Files.Client.PROPERTY_OBJECTID,
+ 'isUnread': OC.Files.Client.PROPERTY_ISUNREAD,
+ 'mentions': OC.Files.Client.PROPERTY_MENTIONS
+ },
- parse: function(data) {
- return {
- id: data.id,
- message: data.message,
- actorType: data.actorType,
- actorId: data.actorId,
- actorDisplayName: data.actorDisplayName,
- creationDateTime: data.creationDateTime,
- objectType: data.objectType,
- objectId: data.objectId,
- isUnread: (data.isUnread === 'true'),
- mentions: this._parseMentions(data.mentions)
- };
- },
-
- _parseMentions: function(mentions) {
- if(_.isUndefined(mentions)) {
- return {};
- }
- var result = {};
- for(var i in mentions) {
- var mention = mentions[i];
- if(_.isUndefined(mention.localName) || mention.localName !== 'mention') {
- continue;
+ parse: function(data) {
+ return {
+ id: data.id,
+ message: data.message,
+ actorType: data.actorType,
+ actorId: data.actorId,
+ actorDisplayName: data.actorDisplayName,
+ creationDateTime: data.creationDateTime,
+ objectType: data.objectType,
+ objectId: data.objectId,
+ isUnread: (data.isUnread === 'true'),
+ mentions: this._parseMentions(data.mentions)
}
- result[i] = {};
- for (var child = mention.firstChild; child; child = child.nextSibling) {
- if(_.isUndefined(child.localName) || !child.localName.startsWith('mention')) {
- continue;
+ },
+
+ _parseMentions: function(mentions) {
+ if (_.isUndefined(mentions)) {
+ return {}
+ }
+ var result = {}
+ for (var i in mentions) {
+ var mention = mentions[i]
+ if (_.isUndefined(mention.localName) || mention.localName !== 'mention') {
+ continue
+ }
+ result[i] = {}
+ for (var child = mention.firstChild; child; child = child.nextSibling) {
+ if (_.isUndefined(child.localName) || !child.localName.startsWith('mention')) {
+ continue
+ }
+ result[i][child.localName] = child.textContent
}
- result[i][child.localName] = child.textContent;
}
+ return result
}
- return result;
- }
- });
+ })
- OCA.Comments.CommentModel = CommentModel;
-})(OC, OCA);
+ OCA.Comments.CommentModel = CommentModel
+})(OC, OCA)
diff --git a/apps/comments/src/comments.js b/apps/comments/src/comments.js
index f0d4433674..e632936c77 100644
--- a/apps/comments/src/comments.js
+++ b/apps/comments/src/comments.js
@@ -15,4 +15,4 @@ import './vendor/At.js/dist/js/jquery.atwho.min'
import './style/autocomplete.scss'
import './style/comments.scss'
-window.OCA.Comments = OCA.Comments;
+window.OCA.Comments = OCA.Comments
diff --git a/apps/comments/src/commentsmodifymenu.js b/apps/comments/src/commentsmodifymenu.js
index 2640dcf420..7c9470f13b 100644
--- a/apps/comments/src/commentsmodifymenu.js
+++ b/apps/comments/src/commentsmodifymenu.js
@@ -8,7 +8,6 @@
*
*/
-/* global Handlebars */
(function() {
/**
@@ -23,7 +22,7 @@
_scopes: [
{
name: 'edit',
- displayName: t('comments', 'Edit comment'),
+ displayName: t('comments', 'Edit comment'),
iconClass: 'icon-rename'
},
{
@@ -45,14 +44,14 @@
* @param {Object} event event object
*/
_onClickAction: function(event) {
- var $target = $(event.currentTarget);
+ var $target = $(event.currentTarget)
if (!$target.hasClass('menuitem')) {
- $target = $target.closest('.menuitem');
+ $target = $target.closest('.menuitem')
}
- OC.hideMenus();
+ OC.hideMenus()
- this.trigger('select:menu-item-clicked', event, $target.data('action'));
+ this.trigger('select:menu-item-clicked', event, $target.data('action'))
},
/**
@@ -61,49 +60,49 @@
render: function() {
this.$el.html(OCA.Comments.Templates['commentsmodifymenu']({
items: this._scopes
- }));
+ }))
},
/**
* Displays the menu
+ * @param {Event} context the click event
*/
show: function(context) {
- this._context = context;
+ this._context = context
- for(var i in this._scopes) {
- this._scopes[i].active = false;
+ for (var i in this._scopes) {
+ this._scopes[i].active = false
}
-
- var $el = $(context.target);
- var offsetIcon = $el.offset();
- var offsetContainer = $el.closest('.authorRow').offset();
+ var $el = $(context.target)
+ var offsetIcon = $el.offset()
+ var offsetContainer = $el.closest('.authorRow').offset()
// adding some extra top offset to push the menu below the button.
var position = {
top: offsetIcon.top - offsetContainer.top + 48,
left: '',
right: ''
- };
+ }
- position.left = offsetIcon.left - offsetContainer.left;
+ position.left = offsetIcon.left - offsetContainer.left
if (position.left > 200) {
// we need to position the menu to the right.
- position.left = '';
- position.right = this.$el.closest('.comment').find('.date').width();
- this.$el.removeClass('menu-left').addClass('menu-right');
+ position.left = ''
+ position.right = this.$el.closest('.comment').find('.date').width()
+ this.$el.removeClass('menu-left').addClass('menu-right')
} else {
- this.$el.removeClass('menu-right').addClass('menu-left');
+ this.$el.removeClass('menu-right').addClass('menu-left')
}
- this.$el.css(position);
- this.render();
- this.$el.removeClass('hidden');
+ this.$el.css(position)
+ this.render()
+ this.$el.removeClass('hidden')
- OC.showMenu(null, this.$el);
+ OC.showMenu(null, this.$el)
}
- });
+ })
- OCA.Comments = OCA.Comments || {};
- OCA.Comments.CommentsModifyMenu = CommentsModifyMenu;
-})(OC, OCA);
+ OCA.Comments = OCA.Comments || {}
+ OCA.Comments.CommentsModifyMenu = CommentsModifyMenu
+})(OC, OCA)
diff --git a/apps/comments/src/commentstabview.js b/apps/comments/src/commentstabview.js
index 8b71fc1f87..a638f46a2c 100644
--- a/apps/comments/src/commentstabview.js
+++ b/apps/comments/src/commentstabview.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/*
* Copyright (c) 2016
*
@@ -17,252 +18,252 @@
*/
var CommentsTabView = OCA.Files.DetailTabView.extend(
/** @lends OCA.Comments.CommentsTabView.prototype */ {
- id: 'commentsTabView',
- className: 'tab commentsTabView',
- _autoCompleteData: undefined,
- _commentsModifyMenu: undefined,
+ id: 'commentsTabView',
+ className: 'tab commentsTabView',
+ _autoCompleteData: undefined,
+ _commentsModifyMenu: undefined,
- events: {
- 'submit .newCommentForm': '_onSubmitComment',
- 'click .showMore': '_onClickShowMore',
- 'click .cancel': '_onClickCloseComment',
- 'click .comment': '_onClickComment',
- 'keyup div.message': '_onTextChange',
- 'change div.message': '_onTextChange',
- 'input div.message': '_onTextChange',
- 'paste div.message': '_onPaste'
- },
+ events: {
+ 'submit .newCommentForm': '_onSubmitComment',
+ 'click .showMore': '_onClickShowMore',
+ 'click .cancel': '_onClickCloseComment',
+ 'click .comment': '_onClickComment',
+ 'keyup div.message': '_onTextChange',
+ 'change div.message': '_onTextChange',
+ 'input div.message': '_onTextChange',
+ 'paste div.message': '_onPaste'
+ },
- _commentMaxLength: 1000,
+ _commentMaxLength: 1000,
- initialize: function() {
- OCA.Files.DetailTabView.prototype.initialize.apply(this, arguments);
- this.collection = new OCA.Comments.CommentCollection();
- this.collection.on('request', this._onRequest, this);
- this.collection.on('sync', this._onEndRequest, this);
- this.collection.on('add', this._onAddModel, this);
- this.collection.on('change:message', this._onChangeModel, this);
+ initialize: function() {
+ OCA.Files.DetailTabView.prototype.initialize.apply(this, arguments)
+ this.collection = new OCA.Comments.CommentCollection()
+ this.collection.on('request', this._onRequest, this)
+ this.collection.on('sync', this._onEndRequest, this)
+ this.collection.on('add', this._onAddModel, this)
+ this.collection.on('change:message', this._onChangeModel, this)
- this._commentMaxThreshold = this._commentMaxLength * 0.9;
+ this._commentMaxThreshold = this._commentMaxLength * 0.9
- // TODO: error handling
- _.bindAll(this, '_onTypeComment', '_initAutoComplete', '_onAutoComplete');
- },
+ // TODO: error handling
+ _.bindAll(this, '_onTypeComment', '_initAutoComplete', '_onAutoComplete')
+ },
- template: function(params) {
- var currentUser = OC.getCurrentUser();
- return OCA.Comments.Templates['view'](_.extend({
- actorId: currentUser.uid,
- actorDisplayName: currentUser.displayName
- }, params));
- },
+ template: function(params) {
+ var currentUser = OC.getCurrentUser()
+ return OCA.Comments.Templates['view'](_.extend({
+ actorId: currentUser.uid,
+ actorDisplayName: currentUser.displayName
+ }, params))
+ },
- editCommentTemplate: function(params) {
- var currentUser = OC.getCurrentUser();
- return OCA.Comments.Templates['edit_comment'](_.extend({
- actorId: currentUser.uid,
- actorDisplayName: currentUser.displayName,
- newMessagePlaceholder: t('comments', 'New comment …'),
- submitText: t('comments', 'Post'),
- cancelText: t('comments', 'Cancel'),
- tag: 'li'
- }, params));
- },
+ editCommentTemplate: function(params) {
+ var currentUser = OC.getCurrentUser()
+ return OCA.Comments.Templates['edit_comment'](_.extend({
+ actorId: currentUser.uid,
+ actorDisplayName: currentUser.displayName,
+ newMessagePlaceholder: t('comments', 'New comment …'),
+ submitText: t('comments', 'Post'),
+ cancelText: t('comments', 'Cancel'),
+ tag: 'li'
+ }, params))
+ },
- commentTemplate: function(params) {
- params = _.extend({
- editTooltip: t('comments', 'Edit comment'),
- isUserAuthor: OC.getCurrentUser().uid === params.actorId,
- isLong: this._isLong(params.message)
- }, params);
+ commentTemplate: function(params) {
+ params = _.extend({
+ editTooltip: t('comments', 'Edit comment'),
+ isUserAuthor: OC.getCurrentUser().uid === params.actorId,
+ isLong: this._isLong(params.message)
+ }, params)
- if (params.actorType === 'deleted_users') {
+ if (params.actorType === 'deleted_users') {
// makes the avatar a X
- params.actorId = null;
- params.actorDisplayName = t('comments', '[Deleted user]');
- }
+ params.actorId = null
+ params.actorDisplayName = t('comments', '[Deleted user]')
+ }
- return OCA.Comments.Templates['comment'](params);
- },
+ return OCA.Comments.Templates['comment'](params)
+ },
- getLabel: function() {
- return t('comments', 'Comments');
- },
+ getLabel: function() {
+ return t('comments', 'Comments')
+ },
- getIcon: function() {
- return 'icon-comment';
- },
+ getIcon: function() {
+ return 'icon-comment'
+ },
- setFileInfo: function(fileInfo) {
- if (fileInfo) {
- this.model = fileInfo;
+ setFileInfo: function(fileInfo) {
+ if (fileInfo) {
+ this.model = fileInfo
- this.render();
- this._initAutoComplete($('#commentsTabView').find('.newCommentForm .message'));
- this.collection.setObjectId(this.model.id);
- // reset to first page
- this.collection.reset([], {silent: true});
- this.nextPage();
- } else {
- this.model = null;
- this.render();
- this.collection.reset();
- }
- },
+ this.render()
+ this._initAutoComplete($('#commentsTabView').find('.newCommentForm .message'))
+ this.collection.setObjectId(this.model.id)
+ // reset to first page
+ this.collection.reset([], { silent: true })
+ this.nextPage()
+ } else {
+ this.model = null
+ this.render()
+ this.collection.reset()
+ }
+ },
- render: function() {
- this.$el.html(this.template({
- emptyResultLabel: t('comments', 'No comments yet, start the conversation!'),
- moreLabel: t('comments', 'More comments …')
- }));
- this.$el.find('.comments').before(this.editCommentTemplate({ tag: 'div'}));
- this.$el.find('.has-tooltip').tooltip();
- this.$container = this.$el.find('ul.comments');
- this.$el.find('.avatar').avatar(OC.getCurrentUser().uid, 32);
- this.delegateEvents();
- this.$el.find('.message').on('keydown input change', this._onTypeComment);
+ render: function() {
+ this.$el.html(this.template({
+ emptyResultLabel: t('comments', 'No comments yet, start the conversation!'),
+ moreLabel: t('comments', 'More comments …')
+ }))
+ this.$el.find('.comments').before(this.editCommentTemplate({ tag: 'div' }))
+ this.$el.find('.has-tooltip').tooltip()
+ this.$container = this.$el.find('ul.comments')
+ this.$el.find('.avatar').avatar(OC.getCurrentUser().uid, 32)
+ this.delegateEvents()
+ this.$el.find('.message').on('keydown input change', this._onTypeComment)
- autosize(this.$el.find('.newCommentRow .message'))
- this.$el.find('.newCommentForm .message').focus();
- },
+ autosize(this.$el.find('.newCommentRow .message'))
+ this.$el.find('.newCommentForm .message').focus()
+ },
- _initAutoComplete: function($target) {
- var s = this;
- var limit = 10;
- if(!_.isUndefined(OC.appConfig.comments)) {
- limit = OC.appConfig.comments.maxAutoCompleteResults;
- }
- $target.atwho({
- at: '@',
- limit: limit,
- callbacks: {
- remoteFilter: s._onAutoComplete,
- highlighter: function (li) {
+ _initAutoComplete: function($target) {
+ var s = this
+ var limit = 10
+ if (!_.isUndefined(OC.appConfig.comments)) {
+ limit = OC.appConfig.comments.maxAutoCompleteResults
+ }
+ $target.atwho({
+ at: '@',
+ limit: limit,
+ callbacks: {
+ remoteFilter: s._onAutoComplete,
+ highlighter: function(li) {
// misuse the highlighter callback to instead of
// highlighting loads the avatars.
- var $li = $(li);
- $li.find('.avatar').avatar(undefined, 32);
- return $li;
+ var $li = $(li)
+ $li.find('.avatar').avatar(undefined, 32)
+ return $li
+ },
+ sorter: function(q, items) { return items }
},
- sorter: function (q, items) { return items; }
- },
- displayTpl: function (item) {
- return '' +
- '' +
- '' +
- '' +
- '' + escapeHTML(item.label) + '' +
- ' ';
- },
- insertTpl: function (item) {
- return '' +
- '' +
- '' +
- '' +
- '' + escapeHTML(item.label) + '' +
- '';
- },
- searchKey: "label"
- });
- $target.on('inserted.atwho', function (je, $el) {
- var editionMode = true;
- s._postRenderItem(
+ displayTpl: function(item) {
+ return ''
+ + ''
+ + ''
+ + ''
+ + '' + escapeHTML(item.label) + ''
+ + ' '
+ },
+ insertTpl: function(item) {
+ return ''
+ + ''
+ + ''
+ + ''
+ + '' + escapeHTML(item.label) + ''
+ + ''
+ },
+ searchKey: 'label'
+ })
+ $target.on('inserted.atwho', function(je, $el) {
+ var editionMode = true
+ s._postRenderItem(
// we need to pass the parent of the inserted element
// passing the whole comments form would re-apply and request
// avatars from the server
- $(je.target).find(
- 'span[data-username="' + $el.find('[data-username]').data('username') + '"]'
- ).parent(),
- editionMode
- );
- });
- },
+ $(je.target).find(
+ 'span[data-username="' + $el.find('[data-username]').data('username') + '"]'
+ ).parent(),
+ editionMode
+ )
+ })
+ },
- _onAutoComplete: function(query, callback) {
- var s = this;
- if(!_.isUndefined(this._autoCompleteRequestTimer)) {
- clearTimeout(this._autoCompleteRequestTimer);
- }
- this._autoCompleteRequestTimer = _.delay(function() {
- if(!_.isUndefined(this._autoCompleteRequestCall)) {
- this._autoCompleteRequestCall.abort();
+ _onAutoComplete: function(query, callback) {
+ var s = this
+ if (!_.isUndefined(this._autoCompleteRequestTimer)) {
+ clearTimeout(this._autoCompleteRequestTimer)
}
- this._autoCompleteRequestCall = $.ajax({
- url: OC.linkToOCS('core', 2) + 'autocomplete/get',
- data: {
- search: query,
- itemType: 'files',
- itemId: s.model.get('id'),
- sorter: 'commenters|share-recipients',
- limit: OC.appConfig.comments.maxAutoCompleteResults
- },
- beforeSend: function (request) {
- request.setRequestHeader('Accept', 'application/json');
- },
- success: function (result) {
- callback(result.ocs.data);
+ this._autoCompleteRequestTimer = _.delay(function() {
+ if (!_.isUndefined(this._autoCompleteRequestCall)) {
+ this._autoCompleteRequestCall.abort()
}
- });
- }, 400);
- },
-
- _formatItem: function(commentModel) {
- var timestamp = new Date(commentModel.get('creationDateTime')).getTime();
- var data = _.extend({
- timestamp: timestamp,
- date: OC.Util.relativeModifiedDate(timestamp),
- altDate: OC.Util.formatDate(timestamp),
- formattedMessage: this._formatMessage(commentModel.get('message'), commentModel.get('mentions'))
- }, commentModel.attributes);
- return data;
- },
-
- _toggleLoading: function(state) {
- this._loading = state;
- this.$el.find('.loading').toggleClass('hidden', !state);
- },
-
- _onRequest: function(type) {
- if (type === 'REPORT') {
- this._toggleLoading(true);
- this.$el.find('.showMore').addClass('hidden');
- }
- },
-
- _onEndRequest: function(type) {
- var fileInfoModel = this.model;
- this._toggleLoading(false);
- this.$el.find('.emptycontent').toggleClass('hidden', !!this.collection.length);
- this.$el.find('.showMore').toggleClass('hidden', !this.collection.hasMoreResults());
-
- if (type !== 'REPORT') {
- return;
- }
-
- // find first unread comment
- var firstUnreadComment = this.collection.findWhere({isUnread: true});
- if (firstUnreadComment) {
- // update read marker
- this.collection.updateReadMarker(
- null,
- {
- success: function() {
- fileInfoModel.set('commentsUnread', 0);
+ this._autoCompleteRequestCall = $.ajax({
+ url: OC.linkToOCS('core', 2) + 'autocomplete/get',
+ data: {
+ search: query,
+ itemType: 'files',
+ itemId: s.model.get('id'),
+ sorter: 'commenters|share-recipients',
+ limit: OC.appConfig.comments.maxAutoCompleteResults
+ },
+ beforeSend: function(request) {
+ request.setRequestHeader('Accept', 'application/json')
+ },
+ success: function(result) {
+ callback(result.ocs.data)
}
- }
- );
- }
- this.$el.find('.newCommentForm .message').focus();
-
- },
+ })
+ }, 400)
+ },
- /**
+ _formatItem: function(commentModel) {
+ var timestamp = new Date(commentModel.get('creationDateTime')).getTime()
+ var data = _.extend({
+ timestamp: timestamp,
+ date: OC.Util.relativeModifiedDate(timestamp),
+ altDate: OC.Util.formatDate(timestamp),
+ formattedMessage: this._formatMessage(commentModel.get('message'), commentModel.get('mentions'))
+ }, commentModel.attributes)
+ return data
+ },
+
+ _toggleLoading: function(state) {
+ this._loading = state
+ this.$el.find('.loading').toggleClass('hidden', !state)
+ },
+
+ _onRequest: function(type) {
+ if (type === 'REPORT') {
+ this._toggleLoading(true)
+ this.$el.find('.showMore').addClass('hidden')
+ }
+ },
+
+ _onEndRequest: function(type) {
+ var fileInfoModel = this.model
+ this._toggleLoading(false)
+ this.$el.find('.emptycontent').toggleClass('hidden', !!this.collection.length)
+ this.$el.find('.showMore').toggleClass('hidden', !this.collection.hasMoreResults())
+
+ if (type !== 'REPORT') {
+ return
+ }
+
+ // find first unread comment
+ var firstUnreadComment = this.collection.findWhere({ isUnread: true })
+ if (firstUnreadComment) {
+ // update read marker
+ this.collection.updateReadMarker(
+ null,
+ {
+ success: function() {
+ fileInfoModel.set('commentsUnread', 0)
+ }
+ }
+ )
+ }
+ this.$el.find('.newCommentForm .message').focus()
+
+ },
+
+ /**
* takes care of post-rendering after a new comment was added to the
* collection
*
@@ -271,322 +272,321 @@
* @param options
* @private
*/
- _onAddModel: function(model, collection, options) {
+ _onAddModel: function(model, collection, options) {
// we need to render it immediately, to ensure that the right
// order of comments is kept on opening comments tab
- var $comment = $(this.commentTemplate(this._formatItem(model)));
- if (!_.isUndefined(options.at) && collection.length > 1) {
- this.$container.find('li').eq(options.at).before($comment);
- } else {
- this.$container.append($comment);
- }
- this._postRenderItem($comment);
- $('#commentsTabView').find('.newCommentForm div.message').text('').prop('contenteditable', true);
-
- // we need to update the model, because it consists of client data
- // only, but the server might add meta data, e.g. about mentions
- var oldMentions = model.get('mentions');
- var self = this;
- model.fetch({
- success: function (model) {
- if(_.isEqual(oldMentions, model.get('mentions'))) {
- // don't attempt to render if unnecessary, avoids flickering
- return;
- }
- var $updated = $(self.commentTemplate(self._formatItem(model)));
- $comment.html($updated.html());
- self._postRenderItem($comment);
+ var $comment = $(this.commentTemplate(this._formatItem(model)))
+ if (!_.isUndefined(options.at) && collection.length > 1) {
+ this.$container.find('li').eq(options.at).before($comment)
+ } else {
+ this.$container.append($comment)
}
- })
+ this._postRenderItem($comment)
+ $('#commentsTabView').find('.newCommentForm div.message').text('').prop('contenteditable', true)
- },
+ // we need to update the model, because it consists of client data
+ // only, but the server might add meta data, e.g. about mentions
+ var oldMentions = model.get('mentions')
+ var self = this
+ model.fetch({
+ success: function(model) {
+ if (_.isEqual(oldMentions, model.get('mentions'))) {
+ // don't attempt to render if unnecessary, avoids flickering
+ return
+ }
+ var $updated = $(self.commentTemplate(self._formatItem(model)))
+ $comment.html($updated.html())
+ self._postRenderItem($comment)
+ }
+ })
- /**
+ },
+
+ /**
* takes care of post-rendering after a new comment was edited
*
* @param model
* @private
*/
- _onChangeModel: function (model) {
- if(model.get('message').trim() === model.previous('message').trim()) {
- return;
- }
+ _onChangeModel: function(model) {
+ if (model.get('message').trim() === model.previous('message').trim()) {
+ return
+ }
- var $form = this.$container.find('.comment[data-id="' + model.id + '"] form');
- var $row = $form.closest('.comment');
- var $target = $row.data('commentEl');
- if(_.isUndefined($target)) {
+ var $form = this.$container.find('.comment[data-id="' + model.id + '"] form')
+ var $row = $form.closest('.comment')
+ var $target = $row.data('commentEl')
+ if (_.isUndefined($target)) {
// ignore noise – this is only set after editing a comment and hitting post
- return;
- }
- var self = this;
-
- // we need to update the model, because it consists of client data
- // only, but the server might add meta data, e.g. about mentions
- model.fetch({
- success: function (model) {
- $target.removeClass('hidden');
- $row.remove();
-
- var $message = $target.find('.message');
- $message
- .html(self._formatMessage(model.get('message'), model.get('mentions')))
- .find('.avatar')
- .each(function () { $(this).avatar(); });
- self._postRenderItem($message);
+ return
}
- });
- },
+ var self = this
- _postRenderItem: function($el, editionMode) {
- $el.find('.has-tooltip').tooltip();
- var inlineAvatars = $el.find('.message .avatar');
- if ($($el.context).hasClass('message')) {
- inlineAvatars = $el.find('.avatar');
- }
- inlineAvatars.each(function () {
- var $this = $(this);
- $this.avatar($this.attr('data-username'), 16);
- });
- $el.find('.authorRow .avatar').each(function () {
- var $this = $(this);
- $this.avatar($this.attr('data-username'), 32);
- });
+ // we need to update the model, because it consists of client data
+ // only, but the server might add meta data, e.g. about mentions
+ model.fetch({
+ success: function(model) {
+ $target.removeClass('hidden')
+ $row.remove()
- var username = $el.find('.avatar').data('username');
- if (username !== OC.getCurrentUser().uid) {
- $el.find('.authorRow .avatar, .authorRow .author').contactsMenu(
- username, 0, $el.find('.authorRow'));
- }
-
- var $message = $el.find('.message');
- if($message.length === 0) {
- // it is the case when writing a comment and mentioning a person
- $message = $el;
- }
-
-
- if (!editionMode) {
- var self = this;
- // add the dropdown menu to display the edit and delete option
- var modifyCommentMenu = new OCA.Comments.CommentsModifyMenu();
- $el.find('.authorRow').append(modifyCommentMenu.$el);
- $el.find('.more').on('click', _.bind(modifyCommentMenu.show, modifyCommentMenu));
-
- self.listenTo(modifyCommentMenu, 'select:menu-item-clicked', function(ev, action) {
- if (action === 'edit') {
- self._onClickEditComment(ev);
- } else if (action === 'delete') {
- self._onClickDeleteComment(ev);
+ var $message = $target.find('.message')
+ $message
+ .html(self._formatMessage(model.get('message'), model.get('mentions')))
+ .find('.avatar')
+ .each(function() { $(this).avatar() })
+ self._postRenderItem($message)
}
- });
- }
+ })
+ },
- this._postRenderMessage($message, editionMode);
- },
-
- _postRenderMessage: function($el, editionMode) {
- if (editionMode) {
- return;
- }
-
- $el.find('.avatar-name-wrapper').each(function() {
- var $this = $(this);
- var $avatar = $this.find('.avatar');
-
- var user = $avatar.data('user');
- if (user !== OC.getCurrentUser().uid) {
- $this.contactsMenu(user, 0, $this);
+ _postRenderItem: function($el, editionMode) {
+ $el.find('.has-tooltip').tooltip()
+ var inlineAvatars = $el.find('.message .avatar')
+ if ($($el.context).hasClass('message')) {
+ inlineAvatars = $el.find('.avatar')
}
- });
- },
+ inlineAvatars.each(function() {
+ var $this = $(this)
+ $this.avatar($this.attr('data-username'), 16)
+ })
+ $el.find('.authorRow .avatar').each(function() {
+ var $this = $(this)
+ $this.avatar($this.attr('data-username'), 32)
+ })
- /**
+ var username = $el.find('.avatar').data('username')
+ if (username !== OC.getCurrentUser().uid) {
+ $el.find('.authorRow .avatar, .authorRow .author').contactsMenu(
+ username, 0, $el.find('.authorRow'))
+ }
+
+ var $message = $el.find('.message')
+ if ($message.length === 0) {
+ // it is the case when writing a comment and mentioning a person
+ $message = $el
+ }
+
+ if (!editionMode) {
+ var self = this
+ // add the dropdown menu to display the edit and delete option
+ var modifyCommentMenu = new OCA.Comments.CommentsModifyMenu()
+ $el.find('.authorRow').append(modifyCommentMenu.$el)
+ $el.find('.more').on('click', _.bind(modifyCommentMenu.show, modifyCommentMenu))
+
+ self.listenTo(modifyCommentMenu, 'select:menu-item-clicked', function(ev, action) {
+ if (action === 'edit') {
+ self._onClickEditComment(ev)
+ } else if (action === 'delete') {
+ self._onClickDeleteComment(ev)
+ }
+ })
+ }
+
+ this._postRenderMessage($message, editionMode)
+ },
+
+ _postRenderMessage: function($el, editionMode) {
+ if (editionMode) {
+ return
+ }
+
+ $el.find('.avatar-name-wrapper').each(function() {
+ var $this = $(this)
+ var $avatar = $this.find('.avatar')
+
+ var user = $avatar.data('user')
+ if (user !== OC.getCurrentUser().uid) {
+ $this.contactsMenu(user, 0, $this)
+ }
+ })
+ },
+
+ /**
* Convert a message to be displayed in HTML,
* converts newlines to
tags. */ - _formatMessage: function(message, mentions, editMode) { - message = escapeHTML(message).replace(/\n/g, '
'); + _formatMessage: function(message, mentions, editMode) { + message = escapeHTML(message).replace(/\n/g, '
') - for(var i in mentions) { - if(!mentions.hasOwnProperty(i)) { - return; - } - var mention = '@' + mentions[i].mentionId; - if (mentions[i].mentionId.indexOf(' ') !== -1) { - mention = _.escape('@"' + mentions[i].mentionId + '"'); - } - - // escape possible regex characters in the name - mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); - var regex = new RegExp("(^|\\s)(" + mention + ")\\b", 'g'); - if (mentions[i].mentionId.indexOf(' ') !== -1) { - regex = new RegExp("(^|\\s)(" + mention + ")", 'g'); - } - - var displayName = this._composeHTMLMention(mentions[i].mentionId, mentions[i].mentionDisplayName); - - // replace every mention either at the start of the input or after a whitespace - // followed by a non-word character. - message = message.replace(regex, - function(match, p1) { - // to get number of whitespaces (0 vs 1) right - return p1+displayName; + for (var i in mentions) { + if (!mentions.hasOwnProperty(i)) { + return + } + var mention = '@' + mentions[i].mentionId + if (mentions[i].mentionId.indexOf(' ') !== -1) { + mention = _.escape('@"' + mentions[i].mentionId + '"') } - ); - } - if(editMode !== true) { - message = OCP.Comments.plainToRich(message); - } - return message; - }, - _composeHTMLMention: function(uid, displayName) { - var avatar = '' + - '' + - ''; + // escape possible regex characters in the name + mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + var regex = new RegExp('(^|\\s)(' + mention + ')\\b', 'g') + if (mentions[i].mentionId.indexOf(' ') !== -1) { + regex = new RegExp('(^|\\s)(' + mention + ')', 'g') + } - var isCurrentUser = (uid === OC.getCurrentUser().uid); + var displayName = this._composeHTMLMention(mentions[i].mentionId, mentions[i].mentionDisplayName) - return '' + - '' + - '' + - avatar + - '' + _.escape(displayName) + '' + - '' + - ''; - }, - - nextPage: function() { - if (this._loading || !this.collection.hasMoreResults()) { - return; - } - - this.collection.fetchNext(); - }, - - _onClickEditComment: function(ev) { - ev.preventDefault(); - var $comment = $(ev.target).closest('.comment'); - var commentId = $comment.data('id'); - var commentToEdit = this.collection.get(commentId); - var $formRow = $(this.editCommentTemplate(_.extend({ - isEditMode: true, - submitText: t('comments', 'Save') - }, commentToEdit.attributes))); - - $comment.addClass('hidden').removeClass('collapsed'); - // spawn form - $comment.after($formRow); - $formRow.data('commentEl', $comment); - $formRow.find('.message').on('keydown input change', this._onTypeComment); - - // copy avatar element from original to avoid flickering - $formRow.find('.avatar:first').replaceWith($comment.find('.avatar:first').clone()); - $formRow.find('.has-tooltip').tooltip(); - - var $message = $formRow.find('.message'); - $message - .html(this._formatMessage(commentToEdit.get('message'), commentToEdit.get('mentions'), true)) - .find('.avatar') - .each(function () { $(this).avatar(); }); - var editionMode = true; - this._postRenderItem($message, editionMode); - - // Enable autosize - autosize($formRow.find('.message')); - - // enable autocomplete - this._initAutoComplete($formRow.find('.message')); - - return false; - }, - - _onTypeComment: function(ev) { - var $field = $(ev.target); - var len = $field.text().length; - var $submitButton = $field.data('submitButtonEl'); - if (!$submitButton) { - $submitButton = $field.closest('form').find('.submit'); - $field.data('submitButtonEl', $submitButton); - } - $field.tooltip('hide'); - if (len > this._commentMaxThreshold) { - $field.attr('data-original-title', t('comments', 'Allowed characters {count} of {max}', {count: len, max: this._commentMaxLength})); - $field.tooltip({trigger: 'manual'}); - $field.tooltip('show'); - $field.addClass('error'); - } - - var limitExceeded = (len > this._commentMaxLength); - $field.toggleClass('error', limitExceeded); - $submitButton.prop('disabled', limitExceeded); - - // Submits form with Enter, but Shift+Enter is a new line. If the - // autocomplete popover is being shown Enter does not submit the - // form either; it will be handled by At.js which will add the - // currently selected item to the message. - if (ev.keyCode === 13 && !ev.shiftKey && !$field.atwho('isSelecting')) { - $submitButton.click(); - ev.preventDefault(); - } - }, - - _onClickComment: function(ev) { - var $row = $(ev.target); - if (!$row.is('.comment')) { - $row = $row.closest('.comment'); - } - $row.removeClass('collapsed'); - }, - - _onClickCloseComment: function(ev) { - ev.preventDefault(); - var $row = $(ev.target).closest('.comment'); - $row.data('commentEl').removeClass('hidden'); - $row.remove(); - return false; - }, - - _onClickDeleteComment: function(ev) { - ev.preventDefault(); - var $comment = $(ev.target).closest('.comment'); - var commentId = $comment.data('id'); - var $loading = $comment.find('.deleteLoading'); - var $moreIcon = $comment.find('.more'); - - $comment.addClass('disabled'); - $loading.removeClass('hidden'); - $moreIcon.addClass('hidden'); - - $comment.data('commentEl', $comment); - - this.collection.get(commentId).destroy({ - success: function() { - $comment.data('commentEl').remove(); - $comment.remove(); - }, - error: function() { - $loading.addClass('hidden'); - $moreIcon.removeClass('hidden'); - $comment.removeClass('disabled'); - - OC.Notification.showTemporary(t('comments', 'Error occurred while retrieving comment with ID {id}', {id: commentId})); + // replace every mention either at the start of the input or after a whitespace + // followed by a non-word character. + message = message.replace(regex, + function(match, p1) { + // to get number of whitespaces (0 vs 1) right + return p1 + displayName + } + ) } - }); + if (editMode !== true) { + message = OCP.Comments.plainToRich(message) + } + return message + }, - return false; - }, + _composeHTMLMention: function(uid, displayName) { + var avatar = '' + + '' + + '' - _onClickShowMore: function(ev) { - ev.preventDefault(); - this.nextPage(); - }, + var isCurrentUser = (uid === OC.getCurrentUser().uid) - /** + return '' + + '' + + '' + + avatar + + '' + _.escape(displayName) + '' + + '' + + '' + }, + + nextPage: function() { + if (this._loading || !this.collection.hasMoreResults()) { + return + } + + this.collection.fetchNext() + }, + + _onClickEditComment: function(ev) { + ev.preventDefault() + var $comment = $(ev.target).closest('.comment') + var commentId = $comment.data('id') + var commentToEdit = this.collection.get(commentId) + var $formRow = $(this.editCommentTemplate(_.extend({ + isEditMode: true, + submitText: t('comments', 'Save') + }, commentToEdit.attributes))) + + $comment.addClass('hidden').removeClass('collapsed') + // spawn form + $comment.after($formRow) + $formRow.data('commentEl', $comment) + $formRow.find('.message').on('keydown input change', this._onTypeComment) + + // copy avatar element from original to avoid flickering + $formRow.find('.avatar:first').replaceWith($comment.find('.avatar:first').clone()) + $formRow.find('.has-tooltip').tooltip() + + var $message = $formRow.find('.message') + $message + .html(this._formatMessage(commentToEdit.get('message'), commentToEdit.get('mentions'), true)) + .find('.avatar') + .each(function() { $(this).avatar() }) + var editionMode = true + this._postRenderItem($message, editionMode) + + // Enable autosize + autosize($formRow.find('.message')) + + // enable autocomplete + this._initAutoComplete($formRow.find('.message')) + + return false + }, + + _onTypeComment: function(ev) { + var $field = $(ev.target) + var len = $field.text().length + var $submitButton = $field.data('submitButtonEl') + if (!$submitButton) { + $submitButton = $field.closest('form').find('.submit') + $field.data('submitButtonEl', $submitButton) + } + $field.tooltip('hide') + if (len > this._commentMaxThreshold) { + $field.attr('data-original-title', t('comments', 'Allowed characters {count} of {max}', { count: len, max: this._commentMaxLength })) + $field.tooltip({ trigger: 'manual' }) + $field.tooltip('show') + $field.addClass('error') + } + + var limitExceeded = (len > this._commentMaxLength) + $field.toggleClass('error', limitExceeded) + $submitButton.prop('disabled', limitExceeded) + + // Submits form with Enter, but Shift+Enter is a new line. If the + // autocomplete popover is being shown Enter does not submit the + // form either; it will be handled by At.js which will add the + // currently selected item to the message. + if (ev.keyCode === 13 && !ev.shiftKey && !$field.atwho('isSelecting')) { + $submitButton.click() + ev.preventDefault() + } + }, + + _onClickComment: function(ev) { + var $row = $(ev.target) + if (!$row.is('.comment')) { + $row = $row.closest('.comment') + } + $row.removeClass('collapsed') + }, + + _onClickCloseComment: function(ev) { + ev.preventDefault() + var $row = $(ev.target).closest('.comment') + $row.data('commentEl').removeClass('hidden') + $row.remove() + return false + }, + + _onClickDeleteComment: function(ev) { + ev.preventDefault() + var $comment = $(ev.target).closest('.comment') + var commentId = $comment.data('id') + var $loading = $comment.find('.deleteLoading') + var $moreIcon = $comment.find('.more') + + $comment.addClass('disabled') + $loading.removeClass('hidden') + $moreIcon.addClass('hidden') + + $comment.data('commentEl', $comment) + + this.collection.get(commentId).destroy({ + success: function() { + $comment.data('commentEl').remove() + $comment.remove() + }, + error: function() { + $loading.addClass('hidden') + $moreIcon.removeClass('hidden') + $comment.removeClass('disabled') + + OC.Notification.showTemporary(t('comments', 'Error occurred while retrieving comment with ID {id}', { id: commentId })) + } + }) + + return false + }, + + _onClickShowMore: function(ev) { + ev.preventDefault() + this.nextPage() + }, + + /** * takes care of updating comment element states after submit (either new * comment or edit). * @@ -594,106 +594,106 @@ * @param {jQuery} $form * @private */ - _onSubmitSuccess: function(model, $form) { - var $submit = $form.find('.submit'); - var $loading = $form.find('.submitLoading'); + _onSubmitSuccess: function(model, $form) { + var $submit = $form.find('.submit') + var $loading = $form.find('.submitLoading') - $submit.removeClass('hidden'); - $loading.addClass('hidden'); - }, + $submit.removeClass('hidden') + $loading.addClass('hidden') + }, - _commentBodyHTML2Plain: function($el) { - var $comment = $el.clone(); + _commentBodyHTML2Plain: function($el) { + var $comment = $el.clone() - $comment.find('.avatar-name-wrapper').each(function () { - var $this = $(this), - $inserted = $this.parent(), - userId = $this.find('.avatar').data('username'); - if (userId.indexOf(' ') !== -1) { - $inserted.html('@"' + userId + '"'); - } else { - $inserted.html('@' + userId); - } - }); + $comment.find('.avatar-name-wrapper').each(function() { + var $this = $(this) + var $inserted = $this.parent() + var userId = $this.find('.avatar').data('username') + if (userId.indexOf(' ') !== -1) { + $inserted.html('@"' + userId + '"') + } else { + $inserted.html('@' + userId) + } + }) - $comment.html(OCP.Comments.richToPlain($comment.html())); + $comment.html(OCP.Comments.richToPlain($comment.html())) - var oldHtml; - var html = $comment.html(); - do { + var oldHtml + var html = $comment.html() + do { // replace works one by one - oldHtml = html; - html = oldHtml.replace("
", "\n"); // preserve line breaks - } while(oldHtml !== html); - $comment.html(html); + oldHtml = html + html = oldHtml.replace('
', '\n') // preserve line breaks + } while (oldHtml !== html) + $comment.html(html) - return $comment.text(); - }, + return $comment.text() + }, - _onSubmitComment: function(e) { - var self = this; - var $form = $(e.target); - var commentId = $form.closest('.comment').data('id'); - var currentUser = OC.getCurrentUser(); - var $submit = $form.find('.submit'); - var $loading = $form.find('.submitLoading'); - var $commentField = $form.find('.message'); - var message = $commentField.text().trim(); - e.preventDefault(); + _onSubmitComment: function(e) { + var self = this + var $form = $(e.target) + var commentId = $form.closest('.comment').data('id') + var currentUser = OC.getCurrentUser() + var $submit = $form.find('.submit') + var $loading = $form.find('.submitLoading') + var $commentField = $form.find('.message') + var message = $commentField.text().trim() + e.preventDefault() - if (!message.length || message.length > this._commentMaxLength) { - return; - } + if (!message.length || message.length > this._commentMaxLength) { + return + } - $commentField.prop('contenteditable', false); - $submit.addClass('hidden'); - $loading.removeClass('hidden'); + $commentField.prop('contenteditable', false) + $submit.addClass('hidden') + $loading.removeClass('hidden') - message = this._commentBodyHTML2Plain($commentField); - if (commentId) { + message = this._commentBodyHTML2Plain($commentField) + if (commentId) { // edit mode - var comment = this.collection.get(commentId); - comment.save({ - message: message - }, { - success: function(model) { - self._onSubmitSuccess(model, $form); - if(model.get('message').trim() === model.previous('message').trim()) { + var comment = this.collection.get(commentId) + comment.save({ + message: message + }, { + success: function(model) { + self._onSubmitSuccess(model, $form) + if (model.get('message').trim() === model.previous('message').trim()) { // model change event doesn't trigger, manually remove the row. - var $row = $form.closest('.comment'); - $row.data('commentEl').removeClass('hidden'); - $row.remove(); + var $row = $form.closest('.comment') + $row.data('commentEl').removeClass('hidden') + $row.remove() + } + }, + error: function() { + self._onSubmitError($form, commentId) } - }, - error: function() { - self._onSubmitError($form, commentId); - } - }); - } else { - this.collection.create({ - actorId: currentUser.uid, - actorDisplayName: currentUser.displayName, - actorType: 'users', - verb: 'comment', - message: message, - creationDateTime: (new Date()).toUTCString() - }, { - at: 0, - // wait for real creation before adding - wait: true, - success: function(model) { - self._onSubmitSuccess(model, $form); - }, - error: function() { - self._onSubmitError($form, undefined); - } - }); - } + }) + } else { + this.collection.create({ + actorId: currentUser.uid, + actorDisplayName: currentUser.displayName, + actorType: 'users', + verb: 'comment', + message: message, + creationDateTime: (new Date()).toUTCString() + }, { + at: 0, + // wait for real creation before adding + wait: true, + success: function(model) { + self._onSubmitSuccess(model, $form) + }, + error: function() { + self._onSubmitError($form, undefined) + } + }) + } - return false; - }, + return false + }, - /** + /** * takes care of updating the UI after an error on submit (either new * comment or edit). * @@ -701,51 +701,51 @@ * @param {string|undefined} commentId * @private */ - _onSubmitError: function($form, commentId) { - $form.find('.submit').removeClass('hidden'); - $form.find('.submitLoading').addClass('hidden'); - $form.find('.message').prop('contenteditable', true); + _onSubmitError: function($form, commentId) { + $form.find('.submit').removeClass('hidden') + $form.find('.submitLoading').addClass('hidden') + $form.find('.message').prop('contenteditable', true) - if(!_.isUndefined(commentId)) { - OC.Notification.show(t('comments', 'Error occurred while updating comment with id {id}', {id: commentId}), {type: 'error'}); - } else { - OC.Notification.show(t('comments', 'Error occurred while posting comment'), {type: 'error'}); - } - }, + if (!_.isUndefined(commentId)) { + OC.Notification.show(t('comments', 'Error occurred while updating comment with id {id}', { id: commentId }), { type: 'error' }) + } else { + OC.Notification.show(t('comments', 'Error occurred while posting comment'), { type: 'error' }) + } + }, - /** + /** * ensures the contenteditable div is really empty, when user removed * all input, so that the placeholder will be shown again * * @private */ - _onTextChange: function() { - var $message = $('#commentsTabView').find('.newCommentForm div.message'); - if(!$message.text().trim().length) { - $message.empty(); - } - }, + _onTextChange: function() { + var $message = $('#commentsTabView').find('.newCommentForm div.message') + if (!$message.text().trim().length) { + $message.empty() + } + }, - /** + /** * Limit pasting to plain text * * @param e * @private */ - _onPaste: function (e) { - e.preventDefault(); - var text = e.originalEvent.clipboardData.getData("text/plain"); - document.execCommand('insertText', false, text); - }, + _onPaste: function(e) { + e.preventDefault() + var text = e.originalEvent.clipboardData.getData('text/plain') + document.execCommand('insertText', false, text) + }, - /** + /** * Returns whether the given message is long and needs * collapsing */ - _isLong: function(message) { - return message.length > 250 || (message.match(/\n/g) || []).length > 1; - } - }); + _isLong: function(message) { + return message.length > 250 || (message.match(/\n/g) || []).length > 1 + } + }) - OCA.Comments.CommentsTabView = CommentsTabView; -})(OC, OCA); + OCA.Comments.CommentsTabView = CommentsTabView +})(OC, OCA) diff --git a/apps/comments/src/commentsummarymodel.js b/apps/comments/src/commentsummarymodel.js index ffabbc30fb..1a3002a9f7 100644 --- a/apps/comments/src/commentsummarymodel.js +++ b/apps/comments/src/commentsummarymodel.js @@ -12,7 +12,7 @@ _.extend(OC.Files.Client, { PROPERTY_READMARKER: '{' + OC.Files.Client.NS_OWNCLOUD + '}readMarker' - }); + }) /** * @class OCA.Comments.CommentSummaryModel @@ -24,45 +24,47 @@ */ var CommentSummaryModel = OC.Backbone.Model.extend( /** @lends OCA.Comments.CommentSummaryModel.prototype */ { - sync: OC.Backbone.davSync, + sync: OC.Backbone.davSync, - /** + /** * Object type * * @type string */ - _objectType: 'files', + _objectType: 'files', - /** + /** * Object id * * @type string */ - _objectId: null, + _objectId: null, - davProperties: { - 'readMarker': OC.Files.Client.PROPERTY_READMARKER - }, + davProperties: { + 'readMarker': OC.Files.Client.PROPERTY_READMARKER + }, - /** - * Initializes the summary model - * - * @param {string} [options.objectType] object type - * @param {string} [options.objectId] object id - */ - initialize: function(attrs, options) { - options = options || {}; - if (options.objectType) { - this._objectType = options.objectType; + /** + * Initializes the summary model + * + * @param {any} [attrs] ignored + * @param {Object} [options] destructuring object + * @param {string} [options.objectType] object type + * @param {string} [options.objectId] object id + */ + initialize: function(attrs, options) { + options = options || {} + if (options.objectType) { + this._objectType = options.objectType + } + }, + + url: function() { + return OC.linkToRemote('dav') + '/comments/' + + encodeURIComponent(this._objectType) + '/' + + encodeURIComponent(this.id) + '/' } - }, + }) - url: function() { - return OC.linkToRemote('dav') + '/comments/' + - encodeURIComponent(this._objectType) + '/' + - encodeURIComponent(this.id) + '/'; - } - }); - - OCA.Comments.CommentSummaryModel = CommentSummaryModel; -})(OC, OCA); + OCA.Comments.CommentSummaryModel = CommentSummaryModel +})(OC, OCA) diff --git a/apps/comments/src/filesplugin.js b/apps/comments/src/filesplugin.js index 2073be09b6..e315dd2fef 100644 --- a/apps/comments/src/filesplugin.js +++ b/apps/comments/src/filesplugin.js @@ -8,20 +8,18 @@ * */ -/* global Handlebars */ - (function() { _.extend(OC.Files.Client, { PROPERTY_COMMENTS_UNREAD: '{' + OC.Files.Client.NS_OWNCLOUD + '}comments-unread' - }); + }) - OCA.Comments = _.extend({}, OCA.Comments); + OCA.Comments = _.extend({}, OCA.Comments) if (!OCA.Comments) { /** * @namespace */ - OCA.Comments = {}; + OCA.Comments = {} } /** @@ -38,43 +36,43 @@ count: count, countMessage: n('comments', '%n unread comment', '%n unread comments', count), iconUrl: OC.imagePath('core', 'actions/comment') - }); + }) }, attach: function(fileList) { - var self = this; + var self = this if (this.ignoreLists.indexOf(fileList.id) >= 0) { - return; + return } - fileList.registerTabView(new OCA.Comments.CommentsTabView('commentsTabView')); + fileList.registerTabView(new OCA.Comments.CommentsTabView('commentsTabView')) - var oldGetWebdavProperties = fileList._getWebdavProperties; + var oldGetWebdavProperties = fileList._getWebdavProperties fileList._getWebdavProperties = function() { - var props = oldGetWebdavProperties.apply(this, arguments); - props.push(OC.Files.Client.PROPERTY_COMMENTS_UNREAD); - return props; - }; + var 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]; + var data = {} + var props = response.propStat[0].properties + var commentsUnread = props[OC.Files.Client.PROPERTY_COMMENTS_UNREAD] if (!_.isUndefined(commentsUnread) && commentsUnread !== '') { - data.commentsUnread = parseInt(commentsUnread, 10); + data.commentsUnread = parseInt(commentsUnread, 10) } - return data; - }); + return data + }) - fileList.$el.addClass('has-comments'); - var oldCreateRow = fileList._createRow; + fileList.$el.addClass('has-comments') + var oldCreateRow = fileList._createRow fileList._createRow = function(fileData) { - var $tr = oldCreateRow.apply(this, arguments); + var $tr = oldCreateRow.apply(this, arguments) if (fileData.commentsUnread) { - $tr.attr('data-comments-unread', fileData.commentsUnread); + $tr.attr('data-comments-unread', fileData.commentsUnread) } - return $tr; - }; + return $tr + } // register "comment" action for reading comments fileList.fileActions.registerAction({ @@ -94,35 +92,35 @@ 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'); + var $file = context.$file + var unreadComments = $file.data('comments-unread') if (unreadComments) { - var $actionLink = $(self._formatCommentCount(unreadComments)); - context.$file.find('a.name>span.fileactions').append($actionLink); - return $actionLink; + var $actionLink = $(self._formatCommentCount(unreadComments)) + context.$file.find('a.name>span.fileactions').append($actionLink) + return $actionLink } - return ''; + return '' }, actionHandler: function(fileName, context) { - context.$file.find('.action-comment').tooltip('hide'); + context.$file.find('.action-comment').tooltip('hide') // open sidebar in comments section - context.fileList.showDetailsView(fileName, 'commentsTabView'); + context.fileList.showDetailsView(fileName, 'commentsTabView') } - }); + }) // add attribute to "elementToFile" - var oldElementToFile = fileList.elementToFile; + var oldElementToFile = fileList.elementToFile fileList.elementToFile = function($el) { - var fileInfo = oldElementToFile.apply(this, arguments); - var commentsUnread = $el.data('comments-unread'); + var fileInfo = oldElementToFile.apply(this, arguments) + var commentsUnread = $el.data('comments-unread') if (commentsUnread) { - fileInfo.commentsUnread = commentsUnread; + fileInfo.commentsUnread = commentsUnread } - return fileInfo; - }; + return fileInfo + } } - }; + } -})(); +})() -OC.Plugins.register('OCA.Files.FileList', OCA.Comments.FilesPlugin); +OC.Plugins.register('OCA.Files.FileList', OCA.Comments.FilesPlugin) diff --git a/apps/comments/src/search.js b/apps/comments/src/search.js index 8e0a35ff6e..c62726d908 100644 --- a/apps/comments/src/search.js +++ b/apps/comments/src/search.js @@ -1,3 +1,4 @@ +/* eslint-disable */ /* * Copyright (c) 2014 * @@ -8,15 +9,15 @@ * */ (function(OC, OCA, $) { - "use strict"; + 'use strict' /** * Construct a new FileActions instance * @constructs Files */ var Comment = function() { - this.initialize(); - }; + this.initialize() + } Comment.prototype = { @@ -27,25 +28,25 @@ */ initialize: function() { - var self = this; + var self = this this.fileAppLoaded = function() { - return !!OCA.Files && !!OCA.Files.App; - }; + return !!OCA.Files && !!OCA.Files.App + } function inFileList($row, result) { - return false; + return false - if (! self.fileAppLoaded()) { - return false; + if (!self.fileAppLoaded()) { + return false } - var dir = self.fileList.getCurrentDirectory().replace(/\/+$/,''); - var resultDir = OC.dirname(result.path); - return dir === resultDir && self.fileList.inList(result.name); + var dir = self.fileList.getCurrentDirectory().replace(/\/+$/, '') + var resultDir = OC.dirname(result.path) + return dir === resultDir && self.fileList.inList(result.name) } function hideNoFilterResults() { - var $nofilterresults = $('.nofilterresults'); - if ( ! $nofilterresults.hasClass('hidden') ) { - $nofilterresults.addClass('hidden'); + var $nofilterresults = $('.nofilterresults') + if (!$nofilterresults.hasClass('hidden')) { + $nofilterresults.addClass('hidden') } } @@ -64,73 +65,73 @@ */ this.renderCommentResult = function($row, result) { if (inFileList($row, result)) { - return null; + return null } - hideNoFilterResults(); - /*render preview icon, show path beneath filename, + hideNoFilterResults() + /* render preview icon, show path beneath filename, show size and last modified date on the right */ - this.updateLegacyMimetype(result); + this.updateLegacyMimetype(result) - var $pathDiv = $('
tags. */ - _formatMessage: function(message, mentions, editMode) { - message = escapeHTML(message).replace(/\n/g, '
'); + _formatMessage: function(message, mentions, editMode) { + message = escapeHTML(message).replace(/\n/g, '
') - for(var i in mentions) { - if(!mentions.hasOwnProperty(i)) { - return; - } - var mention = '@' + mentions[i].mentionId; - if (mentions[i].mentionId.indexOf(' ') !== -1) { - mention = _.escape('@"' + mentions[i].mentionId + '"'); - } - - // escape possible regex characters in the name - mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); - var regex = new RegExp("(^|\\s)(" + mention + ")\\b", 'g'); - if (mentions[i].mentionId.indexOf(' ') !== -1) { - regex = new RegExp("(^|\\s)(" + mention + ")", 'g'); - } - - var displayName = this._composeHTMLMention(mentions[i].mentionId, mentions[i].mentionDisplayName); - - // replace every mention either at the start of the input or after a whitespace - // followed by a non-word character. - message = message.replace(regex, - function(match, p1) { - // to get number of whitespaces (0 vs 1) right - return p1+displayName; + for (var i in mentions) { + if (!mentions.hasOwnProperty(i)) { + return + } + var mention = '@' + mentions[i].mentionId + if (mentions[i].mentionId.indexOf(' ') !== -1) { + mention = _.escape('@"' + mentions[i].mentionId + '"') } - ); - } - if(editMode !== true) { - message = OCP.Comments.plainToRich(message); - } - return message; - }, - _composeHTMLMention: function(uid, displayName) { - var avatar = '' + - '' + - ''; + // escape possible regex characters in the name + mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + var regex = new RegExp('(^|\\s)(' + mention + ')\\b', 'g') + if (mentions[i].mentionId.indexOf(' ') !== -1) { + regex = new RegExp('(^|\\s)(' + mention + ')', 'g') + } - var isCurrentUser = (uid === OC.getCurrentUser().uid); + var displayName = this._composeHTMLMention(mentions[i].mentionId, mentions[i].mentionDisplayName) - return '' + - '' + - '' + - avatar + - '' + _.escape(displayName) + '' + - '' + - ''; - }, - - nextPage: function() { - if (this._loading || !this.collection.hasMoreResults()) { - return; - } - - this.collection.fetchNext(); - }, - - _onClickEditComment: function(ev) { - ev.preventDefault(); - var $comment = $(ev.target).closest('.comment'); - var commentId = $comment.data('id'); - var commentToEdit = this.collection.get(commentId); - var $formRow = $(this.editCommentTemplate(_.extend({ - isEditMode: true, - submitText: t('comments', 'Save') - }, commentToEdit.attributes))); - - $comment.addClass('hidden').removeClass('collapsed'); - // spawn form - $comment.after($formRow); - $formRow.data('commentEl', $comment); - $formRow.find('.message').on('keydown input change', this._onTypeComment); - - // copy avatar element from original to avoid flickering - $formRow.find('.avatar:first').replaceWith($comment.find('.avatar:first').clone()); - $formRow.find('.has-tooltip').tooltip(); - - var $message = $formRow.find('.message'); - $message - .html(this._formatMessage(commentToEdit.get('message'), commentToEdit.get('mentions'), true)) - .find('.avatar') - .each(function () { $(this).avatar(); }); - var editionMode = true; - this._postRenderItem($message, editionMode); - - // Enable autosize - autosize($formRow.find('.message')); - - // enable autocomplete - this._initAutoComplete($formRow.find('.message')); - - return false; - }, - - _onTypeComment: function(ev) { - var $field = $(ev.target); - var len = $field.text().length; - var $submitButton = $field.data('submitButtonEl'); - if (!$submitButton) { - $submitButton = $field.closest('form').find('.submit'); - $field.data('submitButtonEl', $submitButton); - } - $field.tooltip('hide'); - if (len > this._commentMaxThreshold) { - $field.attr('data-original-title', t('comments', 'Allowed characters {count} of {max}', {count: len, max: this._commentMaxLength})); - $field.tooltip({trigger: 'manual'}); - $field.tooltip('show'); - $field.addClass('error'); - } - - var limitExceeded = (len > this._commentMaxLength); - $field.toggleClass('error', limitExceeded); - $submitButton.prop('disabled', limitExceeded); - - // Submits form with Enter, but Shift+Enter is a new line. If the - // autocomplete popover is being shown Enter does not submit the - // form either; it will be handled by At.js which will add the - // currently selected item to the message. - if (ev.keyCode === 13 && !ev.shiftKey && !$field.atwho('isSelecting')) { - $submitButton.click(); - ev.preventDefault(); - } - }, - - _onClickComment: function(ev) { - var $row = $(ev.target); - if (!$row.is('.comment')) { - $row = $row.closest('.comment'); - } - $row.removeClass('collapsed'); - }, - - _onClickCloseComment: function(ev) { - ev.preventDefault(); - var $row = $(ev.target).closest('.comment'); - $row.data('commentEl').removeClass('hidden'); - $row.remove(); - return false; - }, - - _onClickDeleteComment: function(ev) { - ev.preventDefault(); - var $comment = $(ev.target).closest('.comment'); - var commentId = $comment.data('id'); - var $loading = $comment.find('.deleteLoading'); - var $moreIcon = $comment.find('.more'); - - $comment.addClass('disabled'); - $loading.removeClass('hidden'); - $moreIcon.addClass('hidden'); - - $comment.data('commentEl', $comment); - - this.collection.get(commentId).destroy({ - success: function() { - $comment.data('commentEl').remove(); - $comment.remove(); - }, - error: function() { - $loading.addClass('hidden'); - $moreIcon.removeClass('hidden'); - $comment.removeClass('disabled'); - - OC.Notification.showTemporary(t('comments', 'Error occurred while retrieving comment with ID {id}', {id: commentId})); + // replace every mention either at the start of the input or after a whitespace + // followed by a non-word character. + message = message.replace(regex, + function(match, p1) { + // to get number of whitespaces (0 vs 1) right + return p1 + displayName + } + ) } - }); + if (editMode !== true) { + message = OCP.Comments.plainToRich(message) + } + return message + }, - return false; - }, + _composeHTMLMention: function(uid, displayName) { + var avatar = '' + + '' + + '' - _onClickShowMore: function(ev) { - ev.preventDefault(); - this.nextPage(); - }, + var isCurrentUser = (uid === OC.getCurrentUser().uid) - /** + return '' + + '' + + '' + + avatar + + '' + _.escape(displayName) + '' + + '' + + '' + }, + + nextPage: function() { + if (this._loading || !this.collection.hasMoreResults()) { + return + } + + this.collection.fetchNext() + }, + + _onClickEditComment: function(ev) { + ev.preventDefault() + var $comment = $(ev.target).closest('.comment') + var commentId = $comment.data('id') + var commentToEdit = this.collection.get(commentId) + var $formRow = $(this.editCommentTemplate(_.extend({ + isEditMode: true, + submitText: t('comments', 'Save') + }, commentToEdit.attributes))) + + $comment.addClass('hidden').removeClass('collapsed') + // spawn form + $comment.after($formRow) + $formRow.data('commentEl', $comment) + $formRow.find('.message').on('keydown input change', this._onTypeComment) + + // copy avatar element from original to avoid flickering + $formRow.find('.avatar:first').replaceWith($comment.find('.avatar:first').clone()) + $formRow.find('.has-tooltip').tooltip() + + var $message = $formRow.find('.message') + $message + .html(this._formatMessage(commentToEdit.get('message'), commentToEdit.get('mentions'), true)) + .find('.avatar') + .each(function() { $(this).avatar() }) + var editionMode = true + this._postRenderItem($message, editionMode) + + // Enable autosize + autosize($formRow.find('.message')) + + // enable autocomplete + this._initAutoComplete($formRow.find('.message')) + + return false + }, + + _onTypeComment: function(ev) { + var $field = $(ev.target) + var len = $field.text().length + var $submitButton = $field.data('submitButtonEl') + if (!$submitButton) { + $submitButton = $field.closest('form').find('.submit') + $field.data('submitButtonEl', $submitButton) + } + $field.tooltip('hide') + if (len > this._commentMaxThreshold) { + $field.attr('data-original-title', t('comments', 'Allowed characters {count} of {max}', { count: len, max: this._commentMaxLength })) + $field.tooltip({ trigger: 'manual' }) + $field.tooltip('show') + $field.addClass('error') + } + + var limitExceeded = (len > this._commentMaxLength) + $field.toggleClass('error', limitExceeded) + $submitButton.prop('disabled', limitExceeded) + + // Submits form with Enter, but Shift+Enter is a new line. If the + // autocomplete popover is being shown Enter does not submit the + // form either; it will be handled by At.js which will add the + // currently selected item to the message. + if (ev.keyCode === 13 && !ev.shiftKey && !$field.atwho('isSelecting')) { + $submitButton.click() + ev.preventDefault() + } + }, + + _onClickComment: function(ev) { + var $row = $(ev.target) + if (!$row.is('.comment')) { + $row = $row.closest('.comment') + } + $row.removeClass('collapsed') + }, + + _onClickCloseComment: function(ev) { + ev.preventDefault() + var $row = $(ev.target).closest('.comment') + $row.data('commentEl').removeClass('hidden') + $row.remove() + return false + }, + + _onClickDeleteComment: function(ev) { + ev.preventDefault() + var $comment = $(ev.target).closest('.comment') + var commentId = $comment.data('id') + var $loading = $comment.find('.deleteLoading') + var $moreIcon = $comment.find('.more') + + $comment.addClass('disabled') + $loading.removeClass('hidden') + $moreIcon.addClass('hidden') + + $comment.data('commentEl', $comment) + + this.collection.get(commentId).destroy({ + success: function() { + $comment.data('commentEl').remove() + $comment.remove() + }, + error: function() { + $loading.addClass('hidden') + $moreIcon.removeClass('hidden') + $comment.removeClass('disabled') + + OC.Notification.showTemporary(t('comments', 'Error occurred while retrieving comment with ID {id}', { id: commentId })) + } + }) + + return false + }, + + _onClickShowMore: function(ev) { + ev.preventDefault() + this.nextPage() + }, + + /** * takes care of updating comment element states after submit (either new * comment or edit). * @@ -594,106 +594,106 @@ * @param {jQuery} $form * @private */ - _onSubmitSuccess: function(model, $form) { - var $submit = $form.find('.submit'); - var $loading = $form.find('.submitLoading'); + _onSubmitSuccess: function(model, $form) { + var $submit = $form.find('.submit') + var $loading = $form.find('.submitLoading') - $submit.removeClass('hidden'); - $loading.addClass('hidden'); - }, + $submit.removeClass('hidden') + $loading.addClass('hidden') + }, - _commentBodyHTML2Plain: function($el) { - var $comment = $el.clone(); + _commentBodyHTML2Plain: function($el) { + var $comment = $el.clone() - $comment.find('.avatar-name-wrapper').each(function () { - var $this = $(this), - $inserted = $this.parent(), - userId = $this.find('.avatar').data('username'); - if (userId.indexOf(' ') !== -1) { - $inserted.html('@"' + userId + '"'); - } else { - $inserted.html('@' + userId); - } - }); + $comment.find('.avatar-name-wrapper').each(function() { + var $this = $(this) + var $inserted = $this.parent() + var userId = $this.find('.avatar').data('username') + if (userId.indexOf(' ') !== -1) { + $inserted.html('@"' + userId + '"') + } else { + $inserted.html('@' + userId) + } + }) - $comment.html(OCP.Comments.richToPlain($comment.html())); + $comment.html(OCP.Comments.richToPlain($comment.html())) - var oldHtml; - var html = $comment.html(); - do { + var oldHtml + var html = $comment.html() + do { // replace works one by one - oldHtml = html; - html = oldHtml.replace("
", "\n"); // preserve line breaks - } while(oldHtml !== html); - $comment.html(html); + oldHtml = html + html = oldHtml.replace('
', '\n') // preserve line breaks + } while (oldHtml !== html) + $comment.html(html) - return $comment.text(); - }, + return $comment.text() + }, - _onSubmitComment: function(e) { - var self = this; - var $form = $(e.target); - var commentId = $form.closest('.comment').data('id'); - var currentUser = OC.getCurrentUser(); - var $submit = $form.find('.submit'); - var $loading = $form.find('.submitLoading'); - var $commentField = $form.find('.message'); - var message = $commentField.text().trim(); - e.preventDefault(); + _onSubmitComment: function(e) { + var self = this + var $form = $(e.target) + var commentId = $form.closest('.comment').data('id') + var currentUser = OC.getCurrentUser() + var $submit = $form.find('.submit') + var $loading = $form.find('.submitLoading') + var $commentField = $form.find('.message') + var message = $commentField.text().trim() + e.preventDefault() - if (!message.length || message.length > this._commentMaxLength) { - return; - } + if (!message.length || message.length > this._commentMaxLength) { + return + } - $commentField.prop('contenteditable', false); - $submit.addClass('hidden'); - $loading.removeClass('hidden'); + $commentField.prop('contenteditable', false) + $submit.addClass('hidden') + $loading.removeClass('hidden') - message = this._commentBodyHTML2Plain($commentField); - if (commentId) { + message = this._commentBodyHTML2Plain($commentField) + if (commentId) { // edit mode - var comment = this.collection.get(commentId); - comment.save({ - message: message - }, { - success: function(model) { - self._onSubmitSuccess(model, $form); - if(model.get('message').trim() === model.previous('message').trim()) { + var comment = this.collection.get(commentId) + comment.save({ + message: message + }, { + success: function(model) { + self._onSubmitSuccess(model, $form) + if (model.get('message').trim() === model.previous('message').trim()) { // model change event doesn't trigger, manually remove the row. - var $row = $form.closest('.comment'); - $row.data('commentEl').removeClass('hidden'); - $row.remove(); + var $row = $form.closest('.comment') + $row.data('commentEl').removeClass('hidden') + $row.remove() + } + }, + error: function() { + self._onSubmitError($form, commentId) } - }, - error: function() { - self._onSubmitError($form, commentId); - } - }); - } else { - this.collection.create({ - actorId: currentUser.uid, - actorDisplayName: currentUser.displayName, - actorType: 'users', - verb: 'comment', - message: message, - creationDateTime: (new Date()).toUTCString() - }, { - at: 0, - // wait for real creation before adding - wait: true, - success: function(model) { - self._onSubmitSuccess(model, $form); - }, - error: function() { - self._onSubmitError($form, undefined); - } - }); - } + }) + } else { + this.collection.create({ + actorId: currentUser.uid, + actorDisplayName: currentUser.displayName, + actorType: 'users', + verb: 'comment', + message: message, + creationDateTime: (new Date()).toUTCString() + }, { + at: 0, + // wait for real creation before adding + wait: true, + success: function(model) { + self._onSubmitSuccess(model, $form) + }, + error: function() { + self._onSubmitError($form, undefined) + } + }) + } - return false; - }, + return false + }, - /** + /** * takes care of updating the UI after an error on submit (either new * comment or edit). * @@ -701,51 +701,51 @@ * @param {string|undefined} commentId * @private */ - _onSubmitError: function($form, commentId) { - $form.find('.submit').removeClass('hidden'); - $form.find('.submitLoading').addClass('hidden'); - $form.find('.message').prop('contenteditable', true); + _onSubmitError: function($form, commentId) { + $form.find('.submit').removeClass('hidden') + $form.find('.submitLoading').addClass('hidden') + $form.find('.message').prop('contenteditable', true) - if(!_.isUndefined(commentId)) { - OC.Notification.show(t('comments', 'Error occurred while updating comment with id {id}', {id: commentId}), {type: 'error'}); - } else { - OC.Notification.show(t('comments', 'Error occurred while posting comment'), {type: 'error'}); - } - }, + if (!_.isUndefined(commentId)) { + OC.Notification.show(t('comments', 'Error occurred while updating comment with id {id}', { id: commentId }), { type: 'error' }) + } else { + OC.Notification.show(t('comments', 'Error occurred while posting comment'), { type: 'error' }) + } + }, - /** + /** * ensures the contenteditable div is really empty, when user removed * all input, so that the placeholder will be shown again * * @private */ - _onTextChange: function() { - var $message = $('#commentsTabView').find('.newCommentForm div.message'); - if(!$message.text().trim().length) { - $message.empty(); - } - }, + _onTextChange: function() { + var $message = $('#commentsTabView').find('.newCommentForm div.message') + if (!$message.text().trim().length) { + $message.empty() + } + }, - /** + /** * Limit pasting to plain text * * @param e * @private */ - _onPaste: function (e) { - e.preventDefault(); - var text = e.originalEvent.clipboardData.getData("text/plain"); - document.execCommand('insertText', false, text); - }, + _onPaste: function(e) { + e.preventDefault() + var text = e.originalEvent.clipboardData.getData('text/plain') + document.execCommand('insertText', false, text) + }, - /** + /** * Returns whether the given message is long and needs * collapsing */ - _isLong: function(message) { - return message.length > 250 || (message.match(/\n/g) || []).length > 1; - } - }); + _isLong: function(message) { + return message.length > 250 || (message.match(/\n/g) || []).length > 1 + } + }) - OCA.Comments.CommentsTabView = CommentsTabView; -})(OC, OCA); + OCA.Comments.CommentsTabView = CommentsTabView +})(OC, OCA) diff --git a/apps/comments/src/commentsummarymodel.js b/apps/comments/src/commentsummarymodel.js index ffabbc30fb..1a3002a9f7 100644 --- a/apps/comments/src/commentsummarymodel.js +++ b/apps/comments/src/commentsummarymodel.js @@ -12,7 +12,7 @@ _.extend(OC.Files.Client, { PROPERTY_READMARKER: '{' + OC.Files.Client.NS_OWNCLOUD + '}readMarker' - }); + }) /** * @class OCA.Comments.CommentSummaryModel @@ -24,45 +24,47 @@ */ var CommentSummaryModel = OC.Backbone.Model.extend( /** @lends OCA.Comments.CommentSummaryModel.prototype */ { - sync: OC.Backbone.davSync, + sync: OC.Backbone.davSync, - /** + /** * Object type * * @type string */ - _objectType: 'files', + _objectType: 'files', - /** + /** * Object id * * @type string */ - _objectId: null, + _objectId: null, - davProperties: { - 'readMarker': OC.Files.Client.PROPERTY_READMARKER - }, + davProperties: { + 'readMarker': OC.Files.Client.PROPERTY_READMARKER + }, - /** - * Initializes the summary model - * - * @param {string} [options.objectType] object type - * @param {string} [options.objectId] object id - */ - initialize: function(attrs, options) { - options = options || {}; - if (options.objectType) { - this._objectType = options.objectType; + /** + * Initializes the summary model + * + * @param {any} [attrs] ignored + * @param {Object} [options] destructuring object + * @param {string} [options.objectType] object type + * @param {string} [options.objectId] object id + */ + initialize: function(attrs, options) { + options = options || {} + if (options.objectType) { + this._objectType = options.objectType + } + }, + + url: function() { + return OC.linkToRemote('dav') + '/comments/' + + encodeURIComponent(this._objectType) + '/' + + encodeURIComponent(this.id) + '/' } - }, + }) - url: function() { - return OC.linkToRemote('dav') + '/comments/' + - encodeURIComponent(this._objectType) + '/' + - encodeURIComponent(this.id) + '/'; - } - }); - - OCA.Comments.CommentSummaryModel = CommentSummaryModel; -})(OC, OCA); + OCA.Comments.CommentSummaryModel = CommentSummaryModel +})(OC, OCA) diff --git a/apps/comments/src/filesplugin.js b/apps/comments/src/filesplugin.js index 2073be09b6..e315dd2fef 100644 --- a/apps/comments/src/filesplugin.js +++ b/apps/comments/src/filesplugin.js @@ -8,20 +8,18 @@ * */ -/* global Handlebars */ - (function() { _.extend(OC.Files.Client, { PROPERTY_COMMENTS_UNREAD: '{' + OC.Files.Client.NS_OWNCLOUD + '}comments-unread' - }); + }) - OCA.Comments = _.extend({}, OCA.Comments); + OCA.Comments = _.extend({}, OCA.Comments) if (!OCA.Comments) { /** * @namespace */ - OCA.Comments = {}; + OCA.Comments = {} } /** @@ -38,43 +36,43 @@ count: count, countMessage: n('comments', '%n unread comment', '%n unread comments', count), iconUrl: OC.imagePath('core', 'actions/comment') - }); + }) }, attach: function(fileList) { - var self = this; + var self = this if (this.ignoreLists.indexOf(fileList.id) >= 0) { - return; + return } - fileList.registerTabView(new OCA.Comments.CommentsTabView('commentsTabView')); + fileList.registerTabView(new OCA.Comments.CommentsTabView('commentsTabView')) - var oldGetWebdavProperties = fileList._getWebdavProperties; + var oldGetWebdavProperties = fileList._getWebdavProperties fileList._getWebdavProperties = function() { - var props = oldGetWebdavProperties.apply(this, arguments); - props.push(OC.Files.Client.PROPERTY_COMMENTS_UNREAD); - return props; - }; + var 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]; + var data = {} + var props = response.propStat[0].properties + var commentsUnread = props[OC.Files.Client.PROPERTY_COMMENTS_UNREAD] if (!_.isUndefined(commentsUnread) && commentsUnread !== '') { - data.commentsUnread = parseInt(commentsUnread, 10); + data.commentsUnread = parseInt(commentsUnread, 10) } - return data; - }); + return data + }) - fileList.$el.addClass('has-comments'); - var oldCreateRow = fileList._createRow; + fileList.$el.addClass('has-comments') + var oldCreateRow = fileList._createRow fileList._createRow = function(fileData) { - var $tr = oldCreateRow.apply(this, arguments); + var $tr = oldCreateRow.apply(this, arguments) if (fileData.commentsUnread) { - $tr.attr('data-comments-unread', fileData.commentsUnread); + $tr.attr('data-comments-unread', fileData.commentsUnread) } - return $tr; - }; + return $tr + } // register "comment" action for reading comments fileList.fileActions.registerAction({ @@ -94,35 +92,35 @@ 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'); + var $file = context.$file + var unreadComments = $file.data('comments-unread') if (unreadComments) { - var $actionLink = $(self._formatCommentCount(unreadComments)); - context.$file.find('a.name>span.fileactions').append($actionLink); - return $actionLink; + var $actionLink = $(self._formatCommentCount(unreadComments)) + context.$file.find('a.name>span.fileactions').append($actionLink) + return $actionLink } - return ''; + return '' }, actionHandler: function(fileName, context) { - context.$file.find('.action-comment').tooltip('hide'); + context.$file.find('.action-comment').tooltip('hide') // open sidebar in comments section - context.fileList.showDetailsView(fileName, 'commentsTabView'); + context.fileList.showDetailsView(fileName, 'commentsTabView') } - }); + }) // add attribute to "elementToFile" - var oldElementToFile = fileList.elementToFile; + var oldElementToFile = fileList.elementToFile fileList.elementToFile = function($el) { - var fileInfo = oldElementToFile.apply(this, arguments); - var commentsUnread = $el.data('comments-unread'); + var fileInfo = oldElementToFile.apply(this, arguments) + var commentsUnread = $el.data('comments-unread') if (commentsUnread) { - fileInfo.commentsUnread = commentsUnread; + fileInfo.commentsUnread = commentsUnread } - return fileInfo; - }; + return fileInfo + } } - }; + } -})(); +})() -OC.Plugins.register('OCA.Files.FileList', OCA.Comments.FilesPlugin); +OC.Plugins.register('OCA.Files.FileList', OCA.Comments.FilesPlugin) diff --git a/apps/comments/src/search.js b/apps/comments/src/search.js index 8e0a35ff6e..c62726d908 100644 --- a/apps/comments/src/search.js +++ b/apps/comments/src/search.js @@ -1,3 +1,4 @@ +/* eslint-disable */ /* * Copyright (c) 2014 * @@ -8,15 +9,15 @@ * */ (function(OC, OCA, $) { - "use strict"; + 'use strict' /** * Construct a new FileActions instance * @constructs Files */ var Comment = function() { - this.initialize(); - }; + this.initialize() + } Comment.prototype = { @@ -27,25 +28,25 @@ */ initialize: function() { - var self = this; + var self = this this.fileAppLoaded = function() { - return !!OCA.Files && !!OCA.Files.App; - }; + return !!OCA.Files && !!OCA.Files.App + } function inFileList($row, result) { - return false; + return false - if (! self.fileAppLoaded()) { - return false; + if (!self.fileAppLoaded()) { + return false } - var dir = self.fileList.getCurrentDirectory().replace(/\/+$/,''); - var resultDir = OC.dirname(result.path); - return dir === resultDir && self.fileList.inList(result.name); + var dir = self.fileList.getCurrentDirectory().replace(/\/+$/, '') + var resultDir = OC.dirname(result.path) + return dir === resultDir && self.fileList.inList(result.name) } function hideNoFilterResults() { - var $nofilterresults = $('.nofilterresults'); - if ( ! $nofilterresults.hasClass('hidden') ) { - $nofilterresults.addClass('hidden'); + var $nofilterresults = $('.nofilterresults') + if (!$nofilterresults.hasClass('hidden')) { + $nofilterresults.addClass('hidden') } } @@ -64,73 +65,73 @@ */ this.renderCommentResult = function($row, result) { if (inFileList($row, result)) { - return null; + return null } - hideNoFilterResults(); - /*render preview icon, show path beneath filename, + hideNoFilterResults() + /* render preview icon, show path beneath filename, show size and last modified date on the right */ - this.updateLegacyMimetype(result); + this.updateLegacyMimetype(result) - var $pathDiv = $('
').addClass('path').text(result.path);
+ var $pathDiv = $('
').addClass('path').text(result.path)
- var $avatar = $('
');
+ var $avatar = $('
')
$avatar.addClass('avatar')
.css('display', 'inline-block')
.css('vertical-align', 'middle')
- .css('margin', '0 5px 2px 3px');
+ .css('margin', '0 5px 2px 3px')
if (result.authorName) {
- $avatar.avatar(result.authorId, 21, undefined, false, undefined, result.authorName);
+ $avatar.avatar(result.authorId, 21, undefined, false, undefined, result.authorName)
} else {
- $avatar.avatar(result.authorId, 21);
+ $avatar.avatar(result.authorId, 21)
}
- $row.find('td.info div.name').after($pathDiv).text(result.comment).prepend($('').addClass('path').css('margin-right', '5px').text(result.authorName)).prepend($avatar);
- $row.find('td.result a').attr('href', result.link);
+ $row.find('td.info div.name').after($pathDiv).text(result.comment).prepend($('').addClass('path').css('margin-right', '5px').text(result.authorName)).prepend($avatar)
+ $row.find('td.result a').attr('href', result.link)
$row.find('td.icon')
.css('background-image', 'url(' + OC.imagePath('core', 'actions/comment') + ')')
- .css('opacity', '.4');
- var dir = OC.dirname(result.path);
+ .css('opacity', '.4')
+ var dir = OC.dirname(result.path)
// "result.path" does not include a leading "/", so "OC.dirname"
// returns the path itself for files or folders in the root.
if (dir === result.path) {
- dir = '/';
+ dir = '/'
}
$row.find('td.info a').attr('href',
- OC.generateUrl('/apps/files/?dir={dir}&scrollto={scrollto}', {dir: dir, scrollto: result.fileName})
- );
+ OC.generateUrl('/apps/files/?dir={dir}&scrollto={scrollto}', { dir: dir, scrollto: result.fileName })
+ )
- return $row;
- };
+ return $row
+ }
this.handleCommentClick = function($row, result, event) {
if (self.fileAppLoaded() && self.fileList.id === 'files') {
- self.fileList.changeDirectory(OC.dirname(result.path));
- self.fileList.scrollTo(result.name);
- return false;
+ self.fileList.changeDirectory(OC.dirname(result.path))
+ self.fileList.scrollTo(result.name)
+ return false
} else {
- return true;
+ return true
}
- };
+ }
- this.updateLegacyMimetype = function (result) {
+ this.updateLegacyMimetype = function(result) {
// backward compatibility:
if (!result.mime && result.mime_type) {
- result.mime = result.mime_type;
+ result.mime = result.mime_type
}
- };
- this.setFileList = function (fileList) {
- this.fileList = fileList;
- };
+ }
+ this.setFileList = function(fileList) {
+ this.fileList = fileList
+ }
- OC.Plugins.register('OCA.Search.Core', this);
+ OC.Plugins.register('OCA.Search.Core', this)
},
attach: function(search) {
- search.setRenderer('comment', this.renderCommentResult.bind(this));
- search.setHandler('comment', this.handleCommentClick.bind(this));
+ search.setRenderer('comment', this.renderCommentResult.bind(this))
+ search.setHandler('comment', this.handleCommentClick.bind(this))
}
- };
+ }
- OCA.Search.comment = new Comment();
-})(OC, OCA, $);
+ OCA.Search.comment = new Comment()
+})(OC, OCA, $)
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 8db23fca3b..c63c1e3152 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -727,11 +727,11 @@ OC.Uploader.prototype = _.extend({
*
* @param {array} selection of files to upload
* @param {object} callbacks - object with several callback methods
- * @param {function} callbacks.onNoConflicts
- * @param {function} callbacks.onSkipConflicts
- * @param {function} callbacks.onReplaceConflicts
- * @param {function} callbacks.onChooseConflicts
- * @param {function} callbacks.onCancel
+ * @param {Function} callbacks.onNoConflicts
+ * @param {Function} callbacks.onSkipConflicts
+ * @param {Function} callbacks.onReplaceConflicts
+ * @param {Function} callbacks.onChooseConflicts
+ * @param {Function} callbacks.onCancel
*/
checkExistingFiles: function (selection, callbacks) {
var fileList = this.fileList;
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index b46aeb26ee..395b2a53c1 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -336,7 +336,7 @@
* - JS periodically checks for this cookie and then knows when the download has started to call the callback
*
* @param {string} url download URL
- * @param {function} callback function to call once the download has started
+ * @param {Function} callback function to call once the download has started
*/
handleDownload: function(url, callback) {
var randomToken = Math.random().toString(36).substring(2),
diff --git a/apps/files_external/js/statusmanager.js b/apps/files_external/js/statusmanager.js
index 0c0c8b36c7..ebedd91f2a 100644
--- a/apps/files_external/js/statusmanager.js
+++ b/apps/files_external/js/statusmanager.js
@@ -125,7 +125,7 @@ OCA.Files_External.StatusManager = {
/**
* Function to get external mount point list from the files_external API
- * @param {function} afterCallback function to be executed
+ * @param {Function} afterCallback function to be executed
*/
getMountPointList: function (afterCallback) {
diff --git a/apps/files_sharing/.eslintrc.js b/apps/files_sharing/.eslintrc.js
deleted file mode 100644
index 214cccecd8..0000000000
--- a/apps/files_sharing/.eslintrc.js
+++ /dev/null
@@ -1,22 +0,0 @@
-module.exports = {
- env: {
- browser: true,
- es6: true
- },
- globals: {
- t: true,
- n: true,
- OC: true,
- OCA: true
- },
- extends: 'eslint:recommended',
- parserOptions: {
- sourceType: 'module'
- },
- rules: {
- indent: ['error', 'tab'],
- 'linebreak-style': ['error', 'unix'],
- quotes: ['error', 'single'],
- semi: ['error', 'always']
- }
-};
diff --git a/apps/files_sharing/js/app.js b/apps/files_sharing/js/app.js
index b6ca71e15d..29cd3385c3 100644
--- a/apps/files_sharing/js/app.js
+++ b/apps/files_sharing/js/app.js
@@ -12,7 +12,7 @@ if (!OCA.Sharing) {
/**
* @namespace OCA.Sharing
*/
- OCA.Sharing = {};
+ OCA.Sharing = {}
}
/**
* @namespace
@@ -25,7 +25,7 @@ OCA.Sharing.App = {
initSharingIn: function($el) {
if (this._inFileList) {
- return this._inFileList;
+ return this._inFileList
}
this._inFileList = new OCA.Sharing.FileList(
@@ -40,19 +40,19 @@ OCA.Sharing.App = {
// if handling the event with the file list already created.
shown: true
}
- );
+ )
- this._extendFileList(this._inFileList);
- this._inFileList.appName = t('files_sharing', 'Shared with you');
- this._inFileList.$el.find('#emptycontent').html('' +
- '
*
@@ -25,428 +26,423 @@
* @param {boolean} [options.linksOnly] true to return only link shares
*/
var FileList = function($el, options) {
- this.initialize($el, options);
- };
+ this.initialize($el, options)
+ }
FileList.prototype = _.extend({}, OCA.Files.FileList.prototype,
/** @lends OCA.Sharing.FileList.prototype */ {
- appName: 'Shares',
+ appName: 'Shares',
- /**
+ /**
* Whether the list shows the files shared with the user (true) or
* the files that the user shared with others (false).
*/
- _sharedWithUser: false,
- _linksOnly: false,
- _showDeleted: false,
- _clientSideSort: true,
- _allowSelection: false,
- _isOverview: false,
+ _sharedWithUser: false,
+ _linksOnly: false,
+ _showDeleted: false,
+ _clientSideSort: true,
+ _allowSelection: false,
+ _isOverview: false,
- /**
+ /**
* @private
*/
- initialize: function($el, options) {
- OCA.Files.FileList.prototype.initialize.apply(this, arguments);
- if (this.initialized) {
- return;
- }
+ initialize: function($el, options) {
+ OCA.Files.FileList.prototype.initialize.apply(this, arguments)
+ if (this.initialized) {
+ return
+ }
- // TODO: consolidate both options
- if (options && options.sharedWithUser) {
- this._sharedWithUser = true;
- }
- if (options && options.linksOnly) {
- this._linksOnly = true;
- }
- if (options && options.showDeleted) {
- this._showDeleted = true;
- }
- if (options && options.isOverview) {
- this._isOverview = true;
- }
- },
+ // TODO: consolidate both options
+ if (options && options.sharedWithUser) {
+ this._sharedWithUser = true
+ }
+ if (options && options.linksOnly) {
+ this._linksOnly = true
+ }
+ if (options && options.showDeleted) {
+ this._showDeleted = true
+ }
+ if (options && options.isOverview) {
+ this._isOverview = true
+ }
+ },
- _renderRow: function() {
+ _renderRow: function() {
// HACK: needed to call the overridden _renderRow
// this is because at the time this class is created
// the overriding hasn't been done yet...
- return OCA.Files.FileList.prototype._renderRow.apply(this, arguments);
- },
+ return OCA.Files.FileList.prototype._renderRow.apply(this, arguments)
+ },
- _createRow: function(fileData) {
+ _createRow: function(fileData) {
// TODO: hook earlier and render the whole row here
- var $tr = OCA.Files.FileList.prototype._createRow.apply(this, arguments);
- $tr.find('.filesize').remove();
- $tr.find('td.date').before($tr.children('td:first'));
- $tr.find('td.filename input:checkbox').remove();
- $tr.attr('data-share-id', _.pluck(fileData.shares, 'id').join(','));
- if (this._sharedWithUser) {
- $tr.attr('data-share-owner', fileData.shareOwner);
- $tr.attr('data-mounttype', 'shared-root');
- var permission = parseInt($tr.attr('data-permissions')) | OC.PERMISSION_DELETE;
- $tr.attr('data-permissions', permission);
- }
- if (this._showDeleted) {
- var permission = fileData.permissions;
- $tr.attr('data-share-permissions', permission);
- }
-
- // add row with expiration date for link only shares - influenced by _createRow of filelist
- if (this._linksOnly) {
- var expirationTimestamp = 0;
- if(fileData.shares && fileData.shares[0].expiration !== null) {
- expirationTimestamp = moment(fileData.shares[0].expiration).valueOf();
+ var $tr = OCA.Files.FileList.prototype._createRow.apply(this, arguments)
+ $tr.find('.filesize').remove()
+ $tr.find('td.date').before($tr.children('td:first'))
+ $tr.find('td.filename input:checkbox').remove()
+ $tr.attr('data-share-id', _.pluck(fileData.shares, 'id').join(','))
+ if (this._sharedWithUser) {
+ $tr.attr('data-share-owner', fileData.shareOwner)
+ $tr.attr('data-mounttype', 'shared-root')
+ var permission = parseInt($tr.attr('data-permissions')) | OC.PERMISSION_DELETE
+ $tr.attr('data-permissions', permission)
}
- $tr.attr('data-expiration', expirationTimestamp);
-
- // date column (1000 milliseconds to seconds, 60 seconds, 60 minutes, 24 hours)
- // difference in days multiplied by 5 - brightest shade for expiry dates in more than 32 days (160/5)
- var modifiedColor = Math.round((expirationTimestamp - (new Date()).getTime()) / 1000 / 60 / 60 / 24 * 5);
- // ensure that the brightest color is still readable
- if (modifiedColor >= 160) {
- modifiedColor = 160;
+ if (this._showDeleted) {
+ var permission = fileData.permissions
+ $tr.attr('data-share-permissions', permission)
}
- var formatted;
- var text;
- if (expirationTimestamp > 0) {
- formatted = OC.Util.formatDate(expirationTimestamp);
- text = OC.Util.relativeModifiedDate(expirationTimestamp);
- } else {
- formatted = t('files_sharing', 'No expiration date set');
- text = '';
- modifiedColor = 160;
- }
- td = $('} array of shared file info
+ * @returns {Array.} array of shared file info
*/
- _makeFilesFromShares: function(data, sharedWithUser) {
+ _makeFilesFromShares: function(data, sharedWithUser) {
/* jshint camelcase: false */
- var files = data;
+ var files = data
- if (this._linksOnly) {
- files = _.filter(data, function(share) {
- return share.share_type === OC.Share.SHARE_TYPE_LINK;
- });
- }
+ if (this._linksOnly) {
+ files = _.filter(data, function(share) {
+ return share.share_type === OC.Share.SHARE_TYPE_LINK
+ })
+ }
- // OCS API uses non-camelcased names
- files = _.chain(files)
+ // OCS API uses non-camelcased names
+ files = _.chain(files)
// convert share data to file data
- .map(function(share) {
+ .map(function(share) {
// TODO: use OC.Files.FileInfo
- var file = {
- id: share.file_source,
- icon: OC.MimeType.getIconUrl(share.mimetype),
- mimetype: share.mimetype,
- tags: share.tags || []
- };
- if (share.item_type === 'folder') {
- file.type = 'dir';
- file.mimetype = 'httpd/unix-directory';
- }
- else {
- file.type = 'file';
- }
- file.share = {
- id: share.id,
- type: share.share_type,
- target: share.share_with,
- stime: share.stime * 1000,
- expiration: share.expiration,
- };
- if (sharedWithUser) {
- file.shareOwner = share.displayname_owner;
- file.shareOwnerId = share.uid_owner;
- file.name = OC.basename(share.file_target);
- file.path = OC.dirname(share.file_target);
- file.permissions = share.permissions;
- if (file.path) {
- file.extraData = share.file_target;
+ var file = {
+ id: share.file_source,
+ icon: OC.MimeType.getIconUrl(share.mimetype),
+ mimetype: share.mimetype,
+ tags: share.tags || []
}
- }
- else {
- if (share.share_type !== OC.Share.SHARE_TYPE_LINK) {
- file.share.targetDisplayName = share.share_with_displayname;
- file.share.targetShareWithId = share.share_with;
+ if (share.item_type === 'folder') {
+ file.type = 'dir'
+ file.mimetype = 'httpd/unix-directory'
+ } else {
+ file.type = 'file'
}
- file.name = OC.basename(share.path);
- file.path = OC.dirname(share.path);
- file.permissions = OC.PERMISSION_ALL;
- if (file.path) {
- file.extraData = share.path;
+ file.share = {
+ id: share.id,
+ type: share.share_type,
+ target: share.share_with,
+ stime: share.stime * 1000,
+ expiration: share.expiration
}
- }
- return file;
- })
+ if (sharedWithUser) {
+ file.shareOwner = share.displayname_owner
+ file.shareOwnerId = share.uid_owner
+ file.name = OC.basename(share.file_target)
+ file.path = OC.dirname(share.file_target)
+ file.permissions = share.permissions
+ if (file.path) {
+ file.extraData = share.file_target
+ }
+ } else {
+ if (share.share_type !== OC.Share.SHARE_TYPE_LINK) {
+ file.share.targetDisplayName = share.share_with_displayname
+ file.share.targetShareWithId = share.share_with
+ }
+ file.name = OC.basename(share.path)
+ file.path = OC.dirname(share.path)
+ file.permissions = OC.PERMISSION_ALL
+ if (file.path) {
+ file.extraData = share.path
+ }
+ }
+ return file
+ })
// Group all files and have a "shares" array with
// the share info for each file.
//
// This uses a hash memo to cumulate share information
// inside the same file object (by file id).
- .reduce(function(memo, file) {
- var data = memo[file.id];
- var recipient = file.share.targetDisplayName;
- var recipientId = file.share.targetShareWithId;
- if (!data) {
- data = memo[file.id] = file;
- data.shares = [file.share];
- // using a hash to make them unique,
- // this is only a list to be displayed
- data.recipients = {};
- data.recipientData = {};
- // share types
- data.shareTypes = {};
- // counter is cheaper than calling _.keys().length
- data.recipientsCount = 0;
- data.mtime = file.share.stime;
- }
- else {
+ .reduce(function(memo, file) {
+ var data = memo[file.id]
+ var recipient = file.share.targetDisplayName
+ var recipientId = file.share.targetShareWithId
+ if (!data) {
+ data = memo[file.id] = file
+ data.shares = [file.share]
+ // using a hash to make them unique,
+ // this is only a list to be displayed
+ data.recipients = {}
+ data.recipientData = {}
+ // share types
+ data.shareTypes = {}
+ // counter is cheaper than calling _.keys().length
+ data.recipientsCount = 0
+ data.mtime = file.share.stime
+ } else {
// always take the most recent stime
- if (file.share.stime > data.mtime) {
- data.mtime = file.share.stime;
+ if (file.share.stime > data.mtime) {
+ data.mtime = file.share.stime
+ }
+ data.shares.push(file.share)
}
- data.shares.push(file.share);
- }
- if (recipient) {
+ if (recipient) {
// limit counterparts for output
- if (data.recipientsCount < 4) {
+ if (data.recipientsCount < 4) {
// only store the first ones, they will be the only ones
// displayed
- data.recipients[recipient] = true;
- data.recipientData[data.recipientsCount] = {
- 'shareWith': recipientId,
- 'shareWithDisplayName': recipient
- };
+ data.recipients[recipient] = true
+ data.recipientData[data.recipientsCount] = {
+ 'shareWith': recipientId,
+ 'shareWithDisplayName': recipient
+ }
+ }
+ data.recipientsCount++
}
- data.recipientsCount++;
- }
- data.shareTypes[file.share.type] = true;
+ data.shareTypes[file.share.type] = true
- delete file.share;
- return memo;
- }, {})
+ delete file.share
+ return memo
+ }, {})
// Retrieve only the values of the returned hash
- .values()
+ .values()
// Clean up
- .each(function(data) {
+ .each(function(data) {
// convert the recipients map to a flat
// array of sorted names
- data.mountType = 'shared';
- delete data.recipientsCount;
- if (sharedWithUser) {
+ data.mountType = 'shared'
+ delete data.recipientsCount
+ if (sharedWithUser) {
// only for outgoing shares
- delete data.shareTypes;
- } else {
- data.shareTypes = _.keys(data.shareTypes);
- }
- })
+ delete data.shareTypes
+ } else {
+ data.shareTypes = _.keys(data.shareTypes)
+ }
+ })
// Finish the chain by getting the result
- .value();
+ .value()
- // Sort by expected sort comparator
- return files.sort(this._sortComparator);
- },
- });
+ // Sort by expected sort comparator
+ return files.sort(this._sortComparator)
+ }
+ })
/**
* Share info attributes.
@@ -486,5 +482,5 @@
* passing to HTML data attributes with jQuery)
*/
- OCA.Sharing.FileList = FileList;
-})();
+ OCA.Sharing.FileList = FileList
+})()
diff --git a/apps/files_sharing/src/additionalScripts.js b/apps/files_sharing/src/additionalScripts.js
index b0525a64a1..db65a2d208 100644
--- a/apps/files_sharing/src/additionalScripts.js
+++ b/apps/files_sharing/src/additionalScripts.js
@@ -1,6 +1,3 @@
-__webpack_public_path__ = OC.linkTo('files_sharing', 'js/dist/');
-__webpack_nonce__ = btoa(OC.requestToken);
-
import './share'
import './sharetabview'
import './sharebreadcrumbview'
@@ -10,4 +7,9 @@ import './style/sharebreadcrumb.scss'
import './collaborationresourceshandler.js'
-window.OCA.Sharing = OCA.Sharing;
+// eslint-disable-next-line camelcase
+__webpack_public_path__ = OC.linkTo('files_sharing', 'js/dist/')
+// eslint-disable-next-line camelcase
+__webpack_nonce__ = btoa(OC.requestToken)
+
+window.OCA.Sharing = OCA.Sharing
diff --git a/apps/files_sharing/src/collaborationresources.js b/apps/files_sharing/src/collaborationresources.js
index 27f268be85..9c31f21bee 100644
--- a/apps/files_sharing/src/collaborationresources.js
+++ b/apps/files_sharing/src/collaborationresources.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright Copyright (c) 2019 Julius Härtl
*
* @author Julius Härtl
@@ -20,21 +20,23 @@
*
*/
-import Vue from 'vue';
-import Vuex from 'vuex';
-import { Tooltip, PopoverMenu } from 'nextcloud-vue';
-import ClickOutside from 'vue-click-outside';
+import Vue from 'vue'
+import Vuex from 'vuex'
+import { Tooltip, PopoverMenu } from 'nextcloud-vue'
+import ClickOutside from 'vue-click-outside'
-Vue.prototype.t = t;
-Vue.component('PopoverMenu', PopoverMenu);
-Vue.directive('ClickOutside', ClickOutside);
+import View from './views/CollaborationView'
+
+Vue.prototype.t = t
Tooltip.options.defaultHtml = false
-Vue.directive('Tooltip', Tooltip);
-Vue.use(Vuex);
-import View from './views/CollaborationView';
+// eslint-disable-next-line vue/match-component-file-name
+Vue.component('PopoverMenu', PopoverMenu)
+Vue.directive('ClickOutside', ClickOutside)
+Vue.directive('Tooltip', Tooltip)
+Vue.use(Vuex)
export {
Vue,
View
-};
+}
diff --git a/apps/files_sharing/src/collaborationresourceshandler.js b/apps/files_sharing/src/collaborationresourceshandler.js
index 32e9f17ad7..1e1ebe5b54 100644
--- a/apps/files_sharing/src/collaborationresourceshandler.js
+++ b/apps/files_sharing/src/collaborationresourceshandler.js
@@ -1,19 +1,21 @@
-__webpack_public_path__ = OC.linkTo('files_sharing', 'js/dist/');
-__webpack_nonce__ = btoa(OC.requestToken);
+// eslint-disable-next-line camelcase
+__webpack_public_path__ = OC.linkTo('files_sharing', 'js/dist/')
+// eslint-disable-next-line camelcase
+__webpack_nonce__ = btoa(OC.requestToken)
window.OCP.Collaboration.registerType('file', {
action: () => {
return new Promise((resolve, reject) => {
- OC.dialogs.filepicker(t('files_sharing', 'Link to a file'), function (f) {
- const client = OC.Files.getClient();
+ OC.dialogs.filepicker(t('files_sharing', 'Link to a file'), function(f) {
+ const client = OC.Files.getClient()
client.getFileInfo(f).then((status, fileInfo) => {
- resolve(fileInfo.id);
+ resolve(fileInfo.id)
}).fail(() => {
- reject();
- });
- }, false, null, false, OC.dialogs.FILEPICKER_TYPE_CHOOSE, '', { allowDirectoryChooser: true });
- });
+ reject(new Error('Cannot get fileinfo'))
+ })
+ }, false, null, false, OC.dialogs.FILEPICKER_TYPE_CHOOSE, '', { allowDirectoryChooser: true })
+ })
},
typeString: t('files_sharing', 'Link to a file'),
typeIconClass: 'icon-files-dark'
-});
+})
diff --git a/apps/files_sharing/src/files_sharing.js b/apps/files_sharing/src/files_sharing.js
index 0bf695a72c..c521bb1141 100644
--- a/apps/files_sharing/src/files_sharing.js
+++ b/apps/files_sharing/src/files_sharing.js
@@ -1,5 +1,7 @@
-__webpack_nonce__ = btoa(OC.requestToken);
-__webpack_public_path__ = OC.linkTo('files_sharing', 'js/dist/');
+import '../js/app'
+import '../js/sharedfilelist'
-import '../js/app';
-import '../js/sharedfilelist';
+// eslint-disable-next-line camelcase
+__webpack_nonce__ = btoa(OC.requestToken)
+// eslint-disable-next-line camelcase
+__webpack_public_path__ = OC.linkTo('files_sharing', 'js/dist/')
diff --git a/apps/files_sharing/src/share.js b/apps/files_sharing/src/share.js
index 32ca20f3e6..a66f166759 100644
--- a/apps/files_sharing/src/share.js
+++ b/apps/files_sharing/src/share.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/*
* Copyright (c) 2014
*
@@ -14,10 +15,10 @@
PROPERTY_SHARE_TYPES: '{' + OC.Files.Client.NS_OWNCLOUD + '}share-types',
PROPERTY_OWNER_ID: '{' + OC.Files.Client.NS_OWNCLOUD + '}owner-id',
PROPERTY_OWNER_DISPLAY_NAME: '{' + OC.Files.Client.NS_OWNCLOUD + '}owner-display-name'
- });
+ })
if (!OCA.Sharing) {
- OCA.Sharing = {};
+ OCA.Sharing = {}
}
/**
* @namespace
@@ -34,131 +35,130 @@
attach: function(fileList) {
// core sharing is disabled/not loaded
if (!OC.Share) {
- return;
+ return
}
if (fileList.id === 'trashbin' || fileList.id === 'files.public') {
- return;
+ return
}
- var fileActions = fileList.fileActions;
- var oldCreateRow = fileList._createRow;
+ var fileActions = fileList.fileActions
+ var oldCreateRow = fileList._createRow
fileList._createRow = function(fileData) {
- var tr = oldCreateRow.apply(this, arguments);
- var sharePermissions = OCA.Sharing.Util.getSharePermissions(fileData);
-
+ var tr = oldCreateRow.apply(this, arguments)
+ var sharePermissions = OCA.Sharing.Util.getSharePermissions(fileData)
+
if (fileData.permissions === 0) {
// no permission, disabling sidebar
- delete fileActions.actions.all.Comment;
- delete fileActions.actions.all.Details;
- delete fileActions.actions.all.Goto;
+ delete fileActions.actions.all.Comment
+ delete fileActions.actions.all.Details
+ delete fileActions.actions.all.Goto
}
- tr.attr('data-share-permissions', sharePermissions);
+ tr.attr('data-share-permissions', sharePermissions)
if (fileData.shareOwner) {
- tr.attr('data-share-owner', fileData.shareOwner);
- tr.attr('data-share-owner-id', fileData.shareOwnerId);
+ tr.attr('data-share-owner', fileData.shareOwner)
+ tr.attr('data-share-owner-id', fileData.shareOwnerId)
// user should always be able to rename a mount point
if (fileData.mountType === 'shared-root') {
- tr.attr('data-permissions', fileData.permissions | OC.PERMISSION_UPDATE);
+ tr.attr('data-permissions', fileData.permissions | OC.PERMISSION_UPDATE)
}
}
if (fileData.recipientData && !_.isEmpty(fileData.recipientData)) {
- tr.attr('data-share-recipient-data', JSON.stringify(fileData.recipientData));
+ tr.attr('data-share-recipient-data', JSON.stringify(fileData.recipientData))
}
if (fileData.shareTypes) {
- tr.attr('data-share-types', fileData.shareTypes.join(','));
+ tr.attr('data-share-types', fileData.shareTypes.join(','))
}
- return tr;
- };
+ return tr
+ }
- var oldElementToFile = fileList.elementToFile;
+ var oldElementToFile = fileList.elementToFile
fileList.elementToFile = function($el) {
- var fileInfo = oldElementToFile.apply(this, arguments);
- fileInfo.sharePermissions = $el.attr('data-share-permissions') || undefined;
- fileInfo.shareOwner = $el.attr('data-share-owner') || undefined;
- fileInfo.shareOwnerId = $el.attr('data-share-owner-id') || undefined;
+ var fileInfo = oldElementToFile.apply(this, arguments)
+ fileInfo.sharePermissions = $el.attr('data-share-permissions') || undefined
+ fileInfo.shareOwner = $el.attr('data-share-owner') || undefined
+ fileInfo.shareOwnerId = $el.attr('data-share-owner-id') || undefined
- if( $el.attr('data-share-types')){
- fileInfo.shareTypes = $el.attr('data-share-types').split(',');
+ if ($el.attr('data-share-types')) {
+ fileInfo.shareTypes = $el.attr('data-share-types').split(',')
}
- if( $el.attr('data-expiration')){
- var expirationTimestamp = parseInt($el.attr('data-expiration'));
- fileInfo.shares = [];
- fileInfo.shares.push({expiration: expirationTimestamp});
+ if ($el.attr('data-expiration')) {
+ var expirationTimestamp = parseInt($el.attr('data-expiration'))
+ fileInfo.shares = []
+ fileInfo.shares.push({ expiration: expirationTimestamp })
}
- return fileInfo;
- };
+ return fileInfo
+ }
- var oldGetWebdavProperties = fileList._getWebdavProperties;
+ var oldGetWebdavProperties = fileList._getWebdavProperties
fileList._getWebdavProperties = function() {
- var props = oldGetWebdavProperties.apply(this, arguments);
- props.push(OC.Files.Client.PROPERTY_OWNER_ID);
- props.push(OC.Files.Client.PROPERTY_OWNER_DISPLAY_NAME);
- props.push(OC.Files.Client.PROPERTY_SHARE_TYPES);
- return props;
- };
+ var props = oldGetWebdavProperties.apply(this, arguments)
+ props.push(OC.Files.Client.PROPERTY_OWNER_ID)
+ props.push(OC.Files.Client.PROPERTY_OWNER_DISPLAY_NAME)
+ props.push(OC.Files.Client.PROPERTY_SHARE_TYPES)
+ return props
+ }
fileList.filesClient.addFileInfoParser(function(response) {
- var data = {};
- var props = response.propStat[0].properties;
- var permissionsProp = props[OC.Files.Client.PROPERTY_PERMISSIONS];
+ var data = {}
+ var props = response.propStat[0].properties
+ var permissionsProp = props[OC.Files.Client.PROPERTY_PERMISSIONS]
if (permissionsProp && permissionsProp.indexOf('S') >= 0) {
- data.shareOwner = props[OC.Files.Client.PROPERTY_OWNER_DISPLAY_NAME];
- data.shareOwnerId = props[OC.Files.Client.PROPERTY_OWNER_ID];
+ data.shareOwner = props[OC.Files.Client.PROPERTY_OWNER_DISPLAY_NAME]
+ data.shareOwnerId = props[OC.Files.Client.PROPERTY_OWNER_ID]
}
- var shareTypesProp = props[OC.Files.Client.PROPERTY_SHARE_TYPES];
+ var shareTypesProp = props[OC.Files.Client.PROPERTY_SHARE_TYPES]
if (shareTypesProp) {
data.shareTypes = _.chain(shareTypesProp).filter(function(xmlvalue) {
- return (xmlvalue.namespaceURI === OC.Files.Client.NS_OWNCLOUD && xmlvalue.nodeName.split(':')[1] === 'share-type');
+ return (xmlvalue.namespaceURI === OC.Files.Client.NS_OWNCLOUD && xmlvalue.nodeName.split(':')[1] === 'share-type')
}).map(function(xmlvalue) {
- return parseInt(xmlvalue.textContent || xmlvalue.text, 10);
- }).value();
+ return parseInt(xmlvalue.textContent || xmlvalue.text, 10)
+ }).value()
}
- return data;
- });
+ return data
+ })
// use delegate to catch the case with multiple file lists
- fileList.$el.on('fileActionsReady', function(ev){
- var $files = ev.$files;
+ fileList.$el.on('fileActionsReady', function(ev) {
+ var $files = ev.$files
_.each($files, function(file) {
- var $tr = $(file);
- var shareTypes = $tr.attr('data-share-types') || '';
- var shareOwner = $tr.attr('data-share-owner');
+ var $tr = $(file)
+ var shareTypes = $tr.attr('data-share-types') || ''
+ var shareOwner = $tr.attr('data-share-owner')
if (shareTypes || shareOwner) {
- var hasLink = false;
- var hasShares = false;
+ var hasLink = false
+ var hasShares = false
_.each(shareTypes.split(',') || [], function(shareType) {
- shareType = parseInt(shareType, 10);
+ shareType = parseInt(shareType, 10)
if (shareType === OC.Share.SHARE_TYPE_LINK) {
- hasLink = true;
+ hasLink = true
} else if (shareType === OC.Share.SHARE_TYPE_EMAIL) {
- hasLink = true;
+ hasLink = true
} else if (shareType === OC.Share.SHARE_TYPE_USER) {
- hasShares = true;
+ hasShares = true
} else if (shareType === OC.Share.SHARE_TYPE_GROUP) {
- hasShares = true;
+ hasShares = true
} else if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
- hasShares = true;
+ hasShares = true
} else if (shareType === OC.Share.SHARE_TYPE_CIRCLE) {
- hasShares = true;
+ hasShares = true
} else if (shareType === OC.Share.SHARE_TYPE_ROOM) {
- hasShares = true;
+ hasShares = true
}
- });
- OCA.Sharing.Util._updateFileActionIcon($tr, hasShares, hasLink);
+ })
+ OCA.Sharing.Util._updateFileActionIcon($tr, hasShares, hasLink)
}
- });
- });
-
+ })
+ })
fileList.$el.on('changeDirectory', function() {
- OCA.Sharing.sharesLoaded = false;
- });
+ OCA.Sharing.sharesLoaded = false
+ })
fileActions.registerAction({
name: 'Share',
@@ -193,40 +193,40 @@
type: OCA.Files.FileActions.TYPE_INLINE,
actionHandler: function(fileName, context) {
// do not open sidebar if permission is set and equal to 0
- var permissions = parseInt(context.$file.data('share-permissions'), 10);
+ var permissions = parseInt(context.$file.data('share-permissions'), 10)
if (isNaN(permissions) || permissions > 0) {
- fileList.showDetailsView(fileName, 'shareTabView');
+ fileList.showDetailsView(fileName, 'shareTabView')
}
},
render: function(actionSpec, isDefault, context) {
- var permissions = parseInt(context.$file.data('permissions'), 10);
+ var permissions = parseInt(context.$file.data('permissions'), 10)
// if no share permissions but share owner exists, still show the link
if ((permissions & OC.PERMISSION_SHARE) !== 0 || context.$file.attr('data-share-owner')) {
- return fileActions._defaultRenderAction.call(fileActions, actionSpec, isDefault, context);
+ return fileActions._defaultRenderAction.call(fileActions, actionSpec, isDefault, context)
}
// don't render anything
- return null;
+ return null
}
- });
+ })
- var shareTab = new OCA.Sharing.ShareTabView('shareTabView', {order: -20});
+ var shareTab = new OCA.Sharing.ShareTabView('shareTabView', { order: -20 })
// detect changes and change the matching list entry
shareTab.on('sharesChanged', function(shareModel) {
- var fileInfoModel = shareModel.fileInfoModel;
- var $tr = fileList.findFileEl(fileInfoModel.get('name'));
+ var fileInfoModel = shareModel.fileInfoModel
+ var $tr = fileList.findFileEl(fileInfoModel.get('name'))
// We count email shares as link share
- var hasLinkShares = shareModel.hasLinkShares();
- shareModel.get('shares').forEach(function (share) {
+ var hasLinkShares = shareModel.hasLinkShares()
+ shareModel.get('shares').forEach(function(share) {
if (share.share_type === OC.Share.SHARE_TYPE_EMAIL) {
- hasLinkShares = true;
+ hasLinkShares = true
}
- });
+ })
- OCA.Sharing.Util._updateFileListDataAttributes(fileList, $tr, shareModel);
+ OCA.Sharing.Util._updateFileListDataAttributes(fileList, $tr, shareModel)
if (!OCA.Sharing.Util._updateFileActionIcon($tr, shareModel.hasUserShares(), hasLinkShares)) {
// remove icon, if applicable
- OC.Share.markFileAsShared($tr, false, false);
+ OC.Share.markFileAsShared($tr, false, false)
}
// FIXME: this is too convoluted. We need to get rid of the above updates
@@ -237,12 +237,12 @@
// we need to modify the model
// (FIXME: yes, this is hacky)
icon: $tr.attr('data-icon')
- });
- });
- fileList.registerTabView(shareTab);
+ })
+ })
+ fileList.registerTabView(shareTab)
- var breadCrumbSharingDetailView = new OCA.Sharing.ShareBreadCrumbView({shareTab: shareTab});
- fileList.registerBreadCrumbDetailView(breadCrumbSharingDetailView);
+ var breadCrumbSharingDetailView = new OCA.Sharing.ShareBreadCrumbView({ shareTab: shareTab })
+ fileList.registerBreadCrumbDetailView(breadCrumbSharingDetailView)
},
/**
@@ -252,18 +252,17 @@
// files app current cannot show recipients on load, so we don't update the
// icon when changed for consistency
if (fileList.id === 'files') {
- return;
+ return
}
- var recipients = _.pluck(shareModel.get('shares'), 'share_with_displayname');
+ var recipients = _.pluck(shareModel.get('shares'), 'share_with_displayname')
// note: we only update the data attribute because updateIcon()
if (recipients.length) {
- var recipientData = _.mapObject(shareModel.get('shares'), function (share) {
- return {shareWith: share.share_with, shareWithDisplayName: share.share_with_displayname};
- });
- $tr.attr('data-share-recipient-data', JSON.stringify(recipientData));
- }
- else {
- $tr.removeAttr('data-share-recipient-data');
+ var recipientData = _.mapObject(shareModel.get('shares'), function(share) {
+ return { shareWith: share.share_with, shareWithDisplayName: share.share_with_displayname }
+ })
+ $tr.attr('data-share-recipient-data', JSON.stringify(recipientData))
+ } else {
+ $tr.removeAttr('data-share-recipient-data')
}
},
@@ -274,16 +273,16 @@
* @param {boolean} hasUserShares true if a user share exists
* @param {boolean} hasLinkShares true if a link share exists
*
- * @return {boolean} true if the icon was set, false otherwise
+ * @returns {boolean} true if the icon was set, false otherwise
*/
_updateFileActionIcon: function($tr, hasUserShares, hasLinkShares) {
// if the statuses are loaded already, use them for the icon
// (needed when scrolling to the next page)
if (hasUserShares || hasLinkShares || $tr.attr('data-share-recipient-data') || $tr.attr('data-share-owner')) {
- OC.Share.markFileAsShared($tr, true, hasLinkShares);
- return true;
+ OC.Share.markFileAsShared($tr, true, hasLinkShares)
+ return true
}
- return false;
+ return false
},
/**
@@ -291,9 +290,9 @@
* @returns {String}
*/
getSharePermissions: function(fileData) {
- return fileData.sharePermissions;
+ return fileData.sharePermissions
}
- };
-})();
+ }
+})()
-OC.Plugins.register('OCA.Files.FileList', OCA.Sharing.Util);
+OC.Plugins.register('OCA.Files.FileList', OCA.Sharing.Util)
diff --git a/apps/files_sharing/src/sharebreadcrumbview.js b/apps/files_sharing/src/sharebreadcrumbview.js
index 17e3eae0bf..a90c94b6d7 100644
--- a/apps/files_sharing/src/sharebreadcrumbview.js
+++ b/apps/files_sharing/src/sharebreadcrumbview.js
@@ -1,5 +1,3 @@
-/* global Handlebars, OC */
-
/**
* @copyright 2016 Christoph Wurst
*
@@ -23,7 +21,7 @@
*/
(function() {
- 'use strict';
+ 'use strict'
var BreadCrumbView = OC.Backbone.View.extend({
tagName: 'span',
@@ -36,68 +34,68 @@
_shareTab: undefined,
initialize: function(options) {
- this._shareTab = options.shareTab;
+ this._shareTab = options.shareTab
},
render: function(data) {
- this._dirInfo = data.dirInfo || null;
+ this._dirInfo = data.dirInfo || null
if (this._dirInfo !== null && (this._dirInfo.path !== '/' || this._dirInfo.name !== '')) {
- var isShared = data.dirInfo && data.dirInfo.shareTypes && data.dirInfo.shareTypes.length > 0;
- this.$el.removeClass('shared icon-public icon-shared');
+ var isShared = data.dirInfo && data.dirInfo.shareTypes && data.dirInfo.shareTypes.length > 0
+ this.$el.removeClass('shared icon-public icon-shared')
if (isShared) {
- this.$el.addClass('shared');
+ this.$el.addClass('shared')
if (data.dirInfo.shareTypes.indexOf(OC.Share.SHARE_TYPE_LINK) !== -1) {
- this.$el.addClass('icon-public');
+ this.$el.addClass('icon-public')
} else {
- this.$el.addClass('icon-shared');
+ this.$el.addClass('icon-shared')
}
} else {
- this.$el.addClass('icon-shared');
+ this.$el.addClass('icon-shared')
}
- this.$el.show();
- this.delegateEvents();
+ this.$el.show()
+ this.delegateEvents()
} else {
- this.$el.removeClass('shared icon-public icon-shared');
- this.$el.hide();
+ this.$el.removeClass('shared icon-public icon-shared')
+ this.$el.hide()
}
- return this;
+ return this
},
_onClick: function(e) {
- e.preventDefault();
+ e.preventDefault()
- var fileInfoModel = new OCA.Files.FileInfoModel(this._dirInfo);
- var self = this;
+ var fileInfoModel = new OCA.Files.FileInfoModel(this._dirInfo)
+ var self = this
fileInfoModel.on('change', function() {
self.render({
dirInfo: self._dirInfo
- });
- });
+ })
+ })
this._shareTab.on('sharesChanged', function(shareModel) {
- var shareTypes = [];
- var shares = shareModel.getSharesWithCurrentItem();
+ var shareTypes = []
+ var shares = shareModel.getSharesWithCurrentItem()
- for(var i = 0; i < shares.length; i++) {
+ for (var i = 0; i < shares.length; i++) {
if (shareTypes.indexOf(shares[i].share_type) === -1) {
- shareTypes.push(shares[i].share_type);
+ shareTypes.push(shares[i].share_type)
}
}
if (shareModel.hasLinkShares()) {
- shareTypes.push(OC.Share.SHARE_TYPE_LINK);
+ shareTypes.push(OC.Share.SHARE_TYPE_LINK)
}
// Since the dirInfo isn't updated we need to do this dark hackery
- self._dirInfo.shareTypes = shareTypes;
+ self._dirInfo.shareTypes = shareTypes
self.render({
dirInfo: self._dirInfo
- });
- });
- OCA.Files.App.fileList.showDetailsView(fileInfoModel, 'shareTabView');
+ })
+ })
+ OCA.Files.App.fileList.showDetailsView(fileInfoModel, 'shareTabView')
}
- });
+ })
- OCA.Sharing.ShareBreadCrumbView = BreadCrumbView;
-})();
+ OCA.Sharing.ShareBreadCrumbView = BreadCrumbView
+})()
diff --git a/apps/files_sharing/src/sharetabview.js b/apps/files_sharing/src/sharetabview.js
index 44c863fbe9..da0708b85a 100644
--- a/apps/files_sharing/src/sharetabview.js
+++ b/apps/files_sharing/src/sharetabview.js
@@ -11,77 +11,77 @@
/* @global Handlebars */
(function() {
- var TEMPLATE =
- '1&&(t=i[1]),t}var o=function(e,t){this.client=t.client,this.initialize(e,t)};o.prototype=_.extend({},OCA.Files.FileList.prototype,{id:"trashbin",appName:t("files_trashbin","Deleted files"),client:null,initialize:function(){this.client.addFileInfoParser((function(e,t){var a=e.propStat[0].properties,o=a[r];return{displayName:a[i],mtime:1e3*parseInt(a[n],10),hasPreview:!0,path:o,extraData:o}}));var e=OCA.Files.FileList.prototype.initialize.apply(this,arguments);return this.$el.find(".undelete").click("click",_.bind(this._onClickRestoreSelected,this)),this.setSort("mtime","desc"),this.breadcrumb._makeCrumbs=function(){for(var e=OCA.Files.BreadCrumb.prototype._makeCrumbs.apply(this,arguments),t=1;ti.parts.length&&(n.parts.length=i.parts.length)}else{var o=[];for(r=0;r 1) {\n\t\t\tname = match[1];\n\t\t}\n\t\treturn name;\n\t}\n\n\t/**\n\t * @class OCA.Trashbin.FileList\n\t * @augments OCA.Files.FileList\n\t * @classdesc List of deleted files\n\t *\n\t * @param $el container element with existing markup for the #controls\n\t * and a table\n\t * @param [options] map of options\n\t */\n\tvar FileList = function($el, options) {\n\t\tthis.client = options.client;\n\t\tthis.initialize($el, options);\n\t};\n\tFileList.prototype = _.extend({}, OCA.Files.FileList.prototype,\n\t\t/** @lends OCA.Trashbin.FileList.prototype */ {\n\t\tid: 'trashbin',\n\t\tappName: t('files_trashbin', 'Deleted files'),\n\t\t/** @type {OC.Files.Client} */\n\t\tclient: null,\n\n\t\t/**\n\t\t * @private\n\t\t */\n\t\tinitialize: function() {\n\t\t\tthis.client.addFileInfoParser(function(response, data) {\n\t\t\t\tvar props = response.propStat[0].properties;\n\t\t\t\tvar path = props[TRASHBIN_ORIGINAL_LOCATION];\n\t\t\t\treturn {\n\t\t\t\t\tdisplayName: props[FILENAME_PROP],\n\t\t\t\t\tmtime: parseInt(props[DELETION_TIME_PROP], 10) * 1000,\n\t\t\t\t\thasPreview: true,\n\t\t\t\t\tpath: path,\n\t\t\t\t\textraData: path\n\t\t\t\t}\n\t\t\t});\n\n\t\t\tvar result = OCA.Files.FileList.prototype.initialize.apply(this, arguments);\n\t\t\tthis.$el.find('.undelete').click('click', _.bind(this._onClickRestoreSelected, this));\n\n\t\t\tthis.setSort('mtime', 'desc');\n\t\t\t/**\n\t\t\t * Override crumb making to add \"Deleted Files\" entry\n\t\t\t * and convert files with \".d\" extensions to a more\n\t\t\t * user friendly name.\n\t\t\t */\n\t\t\tthis.breadcrumb._makeCrumbs = function() {\n\t\t\t\tvar parts = OCA.Files.BreadCrumb.prototype._makeCrumbs.apply(this, arguments);\n\t\t\t\tfor (var i = 1; i < parts.length; i++) {\n\t\t\t\t\tparts[i].name = getDeletedFileName(parts[i].name);\n\t\t\t\t}\n\t\t\t\treturn parts;\n\t\t\t};\n\n\t\t\tOC.Plugins.attach('OCA.Trashbin.FileList', this);\n\t\t\treturn result;\n\t\t},\n\n\t\t/**\n\t\t * Override to only return read permissions\n\t\t */\n\t\tgetDirectoryPermissions: function() {\n\t\t\treturn OC.PERMISSION_READ | OC.PERMISSION_DELETE;\n\t\t},\n\n\t\t_setCurrentDir: function(targetDir) {\n\t\t\tOCA.Files.FileList.prototype._setCurrentDir.apply(this, arguments);\n\n\t\t\tvar baseDir = OC.basename(targetDir);\n\t\t\tif (baseDir !== '') {\n\t\t\t\tthis.setPageTitle(getDeletedFileName(baseDir));\n\t\t\t}\n\t\t},\n\n\t\t_createRow: function() {\n\t\t\t// FIXME: MEGAHACK until we find a better solution\n\t\t\tvar tr = OCA.Files.FileList.prototype._createRow.apply(this, arguments);\n\t\t\ttr.find('td.filesize').remove();\n\t\t\treturn tr;\n\t\t},\n\n\t\tgetAjaxUrl: function(action, params) {\n\t\t\tvar q = '';\n\t\t\tif (params) {\n\t\t\t\tq = '?' + OC.buildQueryString(params);\n\t\t\t}\n\t\t\treturn OC.filePath('files_trashbin', 'ajax', action + '.php') + q;\n\t\t},\n\n\t\tsetupUploadEvents: function() {\n\t\t\t// override and do nothing\n\t\t},\n\n\t\tlinkTo: function(dir){\n\t\t\treturn OC.linkTo('files', 'index.php')+\"?view=trashbin&dir=\"+ encodeURIComponent(dir).replace(/%2F/g, '/');\n\t\t},\n\n\t\telementToFile: function($el) {\n\t\t\tvar fileInfo = OCA.Files.FileList.prototype.elementToFile($el);\n\t\t\tif (this.getCurrentDirectory() === '/') {\n\t\t\t\tfileInfo.displayName = getDeletedFileName(fileInfo.name);\n\t\t\t}\n\t\t\t// no size available\n\t\t\tdelete fileInfo.size;\n\t\t\treturn fileInfo;\n\t\t},\n\n\t\tupdateEmptyContent: function(){\n\t\t\tvar exists = this.$fileList.find('tr:first').exists();\n\t\t\tthis.$el.find('#emptycontent').toggleClass('hidden', exists);\n\t\t\tthis.$el.find('#filestable th').toggleClass('hidden', !exists);\n\t\t},\n\n\t\t_removeCallback: function(files) {\n\t\t\tvar $el;\n\t\t\tfor (var i = 0; i < files.length; i++) {\n\t\t\t\t$el = this.remove(OC.basename(files[i]), {updateSummary: false});\n\t\t\t\tthis.fileSummary.remove({type: $el.attr('data-type'), size: $el.attr('data-size')});\n\t\t\t}\n\t\t\tthis.fileSummary.update();\n\t\t\tthis.updateEmptyContent();\n\t\t},\n\n\t\t_onClickRestoreSelected: function(event) {\n\t\t\tevent.preventDefault();\n\t\t\tvar self = this;\n\t\t\tvar files = _.pluck(this.getSelectedFiles(), 'name');\n\t\t\tfor (var i = 0; i < files.length; i++) {\n\t\t\t\tvar tr = this.findFileEl(files[i]);\n\t\t\t\tthis.showFileBusyState(tr, true);\n\t\t\t}\n\n\t\t\tthis.fileMultiSelectMenu.toggleLoading('restore', true);\n\t\t\tvar restorePromises = files.map(function(file) {\n\t\t\t\treturn self.client.move(OC.joinPaths('trash', self.getCurrentDirectory(), file), OC.joinPaths('restore', file), true)\n\t\t\t\t\t.then(\n\t\t\t\t\t\tfunction() {\n\t\t\t\t\t\t\tself._removeCallback([file]);\n\t\t\t\t\t\t}\n\t\t\t\t\t);\n\t\t\t});\n\t\t\treturn Promise.all(restorePromises).then(\n\t\t\t\tfunction() {\n\t\t\t\t\tself.fileMultiSelectMenu.toggleLoading('restore', false);\n\t\t\t\t},\n\t\t\t\tfunction() {\n\t\t\t\t\tOC.Notification.show(t('files_trashbin', 'Error while restoring files from trashbin'));\n\t\t\t\t}\n\t\t\t);\n\t\t},\n\n\t\t_onClickDeleteSelected: function(event) {\n\t\t\tevent.preventDefault();\n\t\t\tvar self = this;\n\t\t\tvar allFiles = this.$el.find('.select-all').is(':checked');\n\t\t\tvar files = _.pluck(this.getSelectedFiles(), 'name');\n\t\t\tfor (var i = 0; i < files.length; i++) {\n\t\t\t\tvar tr = this.findFileEl(files[i]);\n\t\t\t\tthis.showFileBusyState(tr, true);\n\t\t\t}\n\n\t\t\tif (allFiles) {\n\t\t\t\treturn this.client.remove(OC.joinPaths('trash', this.getCurrentDirectory()))\n\t\t\t\t\t.then(\n\t\t\t\t\t\tfunction() {\n\t\t\t\t\t\t\tself.hideMask();\n\t\t\t\t\t\t\tself.setFiles([]);\n\t\t\t\t\t\t},\n\t\t\t\t\t\tfunction() {\n\t\t\t\t\t\t\tOC.Notification.show(t('files_trashbin', 'Error while emptying trashbin'));\n\t\t\t\t\t\t}\n\t\t\t\t\t);\n\t\t\t} else {\n\t\t\t\tthis.fileMultiSelectMenu.toggleLoading('delete', true);\n\t\t\t\tvar deletePromises = files.map(function(file) {\n\t\t\t\t\treturn self.client.remove(OC.joinPaths('trash', self.getCurrentDirectory(), file))\n\t\t\t\t\t\t.then(\n\t\t\t\t\t\t\tfunction() {\n\t\t\t\t\t\t\t\tself._removeCallback([file]);\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t);\n\t\t\t\t});\n\t\t\t\treturn Promise.all(deletePromises).then(\n\t\t\t\t\tfunction() {\n\t\t\t\t\t\tself.fileMultiSelectMenu.toggleLoading('delete', false);\n\t\t\t\t\t},\n\t\t\t\t\tfunction() {\n\t\t\t\t\t\tOC.Notification.show(t('files_trashbin', 'Error while removing files from trashbin'));\n\t\t\t\t\t}\n\t\t\t\t);\n\t\t\t}\n\t\t},\n\n\t\t_onClickFile: function(event) {\n\t\t\tvar mime = $(this).parent().parent().data('mime');\n\t\t\tif (mime !== 'httpd/unix-directory') {\n\t\t\t\tevent.preventDefault();\n\t\t\t}\n\t\t\treturn OCA.Files.FileList.prototype._onClickFile.apply(this, arguments);\n\t\t},\n\n\t\tgeneratePreviewUrl: function(urlSpec) {\n\t\t\treturn OC.generateUrl('/apps/files_trashbin/preview?') + $.param(urlSpec);\n\t\t},\n\n\t\tgetDownloadUrl: function() {\n\t\t\t// no downloads\n\t\t\treturn '#';\n\t\t},\n\n\t\tupdateStorageStatistics: function() {\n\t\t\t// no op because the trashbin doesn't have\n\t\t\t// storage info like free space / used space\n\t\t},\n\n\t\tisSelectedDeletable: function() {\n\t\t\treturn true;\n\t\t},\n\n\t\t/**\n\t\t * Returns list of webdav properties to request\n\t\t */\n\t\t_getWebdavProperties: function() {\n\t\t\treturn [FILENAME_PROP, DELETION_TIME_PROP, TRASHBIN_ORIGINAL_LOCATION].concat(this.filesClient.getPropfindProperties());\n\t\t},\n\n\t\t/**\n\t\t * Reloads the file list using ajax call\n\t\t *\n\t\t * @return ajax call object\n\t\t */\n\t\treload: function() {\n\t\t\tthis._selectedFiles = {};\n\t\t\tthis._selectionSummary.clear();\n\t\t\tthis.$el.find('.select-all').prop('checked', false);\n\t\t\tthis.showMask();\n\t\t\tif (this._reloadCall) {\n\t\t\t\tthis._reloadCall.abort();\n\t\t\t}\n\t\t\tthis._reloadCall = this.client.getFolderContents(\n\t\t\t\t'trash/' + this.getCurrentDirectory(), {\n\t\t\t\t\tincludeParent: false,\n\t\t\t\t\tproperties: this._getWebdavProperties()\n\t\t\t\t}\n\t\t\t);\n\t\t\tvar callBack = this.reloadCallback.bind(this);\n\t\t\treturn this._reloadCall.then(callBack, callBack);\n\t\t},\n\t\treloadCallback: function(status, result) {\n\t\t\tdelete this._reloadCall;\n\t\t\tthis.hideMask();\n\n\t\t\tif (status === 401) {\n\t\t\t\treturn false;\n\t\t\t}\n\n\t\t\t// Firewall Blocked request?\n\t\t\tif (status === 403) {\n\t\t\t\t// Go home\n\t\t\t\tthis.changeDirectory('/');\n\t\t\t\tOC.Notification.show(t('files', 'This operation is forbidden'));\n\t\t\t\treturn false;\n\t\t\t}\n\n\t\t\t// Did share service die or something else fail?\n\t\t\tif (status === 500) {\n\t\t\t\t// Go home\n\t\t\t\tthis.changeDirectory('/');\n\t\t\t\tOC.Notification.show(t('files', 'This directory is unavailable, please check the logs or contact the administrator'));\n\t\t\t\treturn false;\n\t\t\t}\n\n\t\t\tif (status === 404) {\n\t\t\t\t// go back home\n\t\t\t\tthis.changeDirectory('/');\n\t\t\t\treturn false;\n\t\t\t}\n\t\t\t// aborted ?\n\t\t\tif (status === 0){\n\t\t\t\treturn true;\n\t\t\t}\n\n\t\t\tthis.setFiles(result);\n\t\t\treturn true;\n\t\t},\n\n\t});\n\n\tOCA.Trashbin.FileList = FileList;\n})();\n\n","var content = require(\"!!../../../node_modules/css-loader/dist/cjs.js!../../../node_modules/sass-loader/dist/cjs.js!./trash.scss\");\n\nif (typeof content === 'string') {\n content = [[module.id, content, '']];\n}\n\nvar options = {}\n\noptions.insert = \"head\";\noptions.singleton = false;\n\nvar update = require(\"!../../../node_modules/style-loader/dist/runtime/injectStylesIntoStyleTag.js\")(content, options);\n\nif (content.locals) {\n module.exports = content.locals;\n}\n","exports = module.exports = require(\"../../../node_modules/css-loader/dist/runtime/api.js\")(false);\n// Module\nexports.push([module.id, \"#app-content-trashbin tbody tr[data-type=\\\"file\\\"] td a.name,#app-content-trashbin tbody tr[data-type=\\\"file\\\"] td a.name span.nametext,#app-content-trashbin tbody tr[data-type=\\\"file\\\"] td a.name span.nametext span{cursor:default}#app-content-trashbin .summary :last-child{padding:0}#app-content-trashbin #filestable .summary .filesize{display:none}\\n\", \"\"]);\n","\"use strict\";\n\n/*\n MIT License http://www.opensource.org/licenses/mit-license.php\n Author Tobias Koppers @sokra\n*/\n// css base code, injected by the css-loader\n// eslint-disable-next-line func-names\nmodule.exports = function (useSourceMap) {\n var list = []; // return the list of modules as css string\n\n list.toString = function toString() {\n return this.map(function (item) {\n var content = cssWithMappingToString(item, useSourceMap);\n\n if (item[2]) {\n return \"@media \".concat(item[2], \"{\").concat(content, \"}\");\n }\n\n return content;\n }).join('');\n }; // import a list of modules into the list\n // eslint-disable-next-line func-names\n\n\n list.i = function (modules, mediaQuery) {\n if (typeof modules === 'string') {\n // eslint-disable-next-line no-param-reassign\n modules = [[null, modules, '']];\n }\n\n var alreadyImportedModules = {};\n\n for (var i = 0; i < this.length; i++) {\n // eslint-disable-next-line prefer-destructuring\n var id = this[i][0];\n\n if (id != null) {\n alreadyImportedModules[id] = true;\n }\n }\n\n for (var _i = 0; _i < modules.length; _i++) {\n var item = modules[_i]; // skip already imported module\n // this implementation is not 100% perfect for weird media query combinations\n // when a module is imported multiple times with different media queries.\n // I hope this will never occur (Hey this way we have smaller bundles)\n\n if (item[0] == null || !alreadyImportedModules[item[0]]) {\n if (mediaQuery && !item[2]) {\n item[2] = mediaQuery;\n } else if (mediaQuery) {\n item[2] = \"(\".concat(item[2], \") and (\").concat(mediaQuery, \")\");\n }\n\n list.push(item);\n }\n }\n };\n\n return list;\n};\n\nfunction cssWithMappingToString(item, useSourceMap) {\n var content = item[1] || ''; // eslint-disable-next-line prefer-destructuring\n\n var cssMapping = item[3];\n\n if (!cssMapping) {\n return content;\n }\n\n if (useSourceMap && typeof btoa === 'function') {\n var sourceMapping = toComment(cssMapping);\n var sourceURLs = cssMapping.sources.map(function (source) {\n return \"/*# sourceURL=\".concat(cssMapping.sourceRoot).concat(source, \" */\");\n });\n return [content].concat(sourceURLs).concat([sourceMapping]).join('\\n');\n }\n\n return [content].join('\\n');\n} // Adapted from convert-source-map (MIT)\n\n\nfunction toComment(sourceMap) {\n // eslint-disable-next-line no-undef\n var base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))));\n var data = \"sourceMappingURL=data:application/json;charset=utf-8;base64,\".concat(base64);\n return \"/*# \".concat(data, \" */\");\n}","\"use strict\";\n\nvar stylesInDom = {};\n\nvar isOldIE = function isOldIE() {\n var memo;\n return function memorize() {\n if (typeof memo === 'undefined') {\n // Test for IE <= 9 as proposed by Browserhacks\n // @see http://browserhacks.com/#hack-e71d8692f65334173fee715c222cb805\n // Tests for existence of standard globals is to allow style-loader\n // to operate correctly into non-standard environments\n // @see https://github.com/webpack-contrib/style-loader/issues/177\n memo = Boolean(window && document && document.all && !window.atob);\n }\n\n return memo;\n };\n}();\n\nvar getTarget = function getTarget() {\n var memo = {};\n return function memorize(target) {\n if (typeof memo[target] === 'undefined') {\n var styleTarget = document.querySelector(target); // Special case to return head of iframe instead of iframe itself\n\n if (window.HTMLIFrameElement && styleTarget instanceof window.HTMLIFrameElement) {\n try {\n // This will throw an exception if access to iframe is blocked\n // due to cross-origin restrictions\n styleTarget = styleTarget.contentDocument.head;\n } catch (e) {\n // istanbul ignore next\n styleTarget = null;\n }\n }\n\n memo[target] = styleTarget;\n }\n\n return memo[target];\n };\n}();\n\nfunction listToStyles(list, options) {\n var styles = [];\n var newStyles = {};\n\n for (var i = 0; i < list.length; i++) {\n var item = list[i];\n var id = options.base ? item[0] + options.base : item[0];\n var css = item[1];\n var media = item[2];\n var sourceMap = item[3];\n var part = {\n css: css,\n media: media,\n sourceMap: sourceMap\n };\n\n if (!newStyles[id]) {\n styles.push(newStyles[id] = {\n id: id,\n parts: [part]\n });\n } else {\n newStyles[id].parts.push(part);\n }\n }\n\n return styles;\n}\n\nfunction addStylesToDom(styles, options) {\n for (var i = 0; i < styles.length; i++) {\n var item = styles[i];\n var domStyle = stylesInDom[item.id];\n var j = 0;\n\n if (domStyle) {\n domStyle.refs++;\n\n for (; j < domStyle.parts.length; j++) {\n domStyle.parts[j](item.parts[j]);\n }\n\n for (; j < item.parts.length; j++) {\n domStyle.parts.push(addStyle(item.parts[j], options));\n }\n } else {\n var parts = [];\n\n for (; j < item.parts.length; j++) {\n parts.push(addStyle(item.parts[j], options));\n }\n\n stylesInDom[item.id] = {\n id: item.id,\n refs: 1,\n parts: parts\n };\n }\n }\n}\n\nfunction insertStyleElement(options) {\n var style = document.createElement('style');\n\n if (typeof options.attributes.nonce === 'undefined') {\n var nonce = typeof __webpack_nonce__ !== 'undefined' ? __webpack_nonce__ : null;\n\n if (nonce) {\n options.attributes.nonce = nonce;\n }\n }\n\n Object.keys(options.attributes).forEach(function (key) {\n style.setAttribute(key, options.attributes[key]);\n });\n\n if (typeof options.insert === 'function') {\n options.insert(style);\n } else {\n var target = getTarget(options.insert || 'head');\n\n if (!target) {\n throw new Error(\"Couldn't find a style target. This probably means that the value for the 'insert' parameter is invalid.\");\n }\n\n target.appendChild(style);\n }\n\n return style;\n}\n\nfunction removeStyleElement(style) {\n // istanbul ignore if\n if (style.parentNode === null) {\n return false;\n }\n\n style.parentNode.removeChild(style);\n}\n/* istanbul ignore next */\n\n\nvar replaceText = function replaceText() {\n var textStore = [];\n return function replace(index, replacement) {\n textStore[index] = replacement;\n return textStore.filter(Boolean).join('\\n');\n };\n}();\n\nfunction applyToSingletonTag(style, index, remove, obj) {\n var css = remove ? '' : obj.css; // For old IE\n\n /* istanbul ignore if */\n\n if (style.styleSheet) {\n style.styleSheet.cssText = replaceText(index, css);\n } else {\n var cssNode = document.createTextNode(css);\n var childNodes = style.childNodes;\n\n if (childNodes[index]) {\n style.removeChild(childNodes[index]);\n }\n\n if (childNodes.length) {\n style.insertBefore(cssNode, childNodes[index]);\n } else {\n style.appendChild(cssNode);\n }\n }\n}\n\nfunction applyToTag(style, options, obj) {\n var css = obj.css;\n var media = obj.media;\n var sourceMap = obj.sourceMap;\n\n if (media) {\n style.setAttribute('media', media);\n }\n\n if (sourceMap && btoa) {\n css += \"\\n/*# sourceMappingURL=data:application/json;base64,\".concat(btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap)))), \" */\");\n } // For old IE\n\n /* istanbul ignore if */\n\n\n if (style.styleSheet) {\n style.styleSheet.cssText = css;\n } else {\n while (style.firstChild) {\n style.removeChild(style.firstChild);\n }\n\n style.appendChild(document.createTextNode(css));\n }\n}\n\nvar singleton = null;\nvar singletonCounter = 0;\n\nfunction addStyle(obj, options) {\n var style;\n var update;\n var remove;\n\n if (options.singleton) {\n var styleIndex = singletonCounter++;\n style = singleton || (singleton = insertStyleElement(options));\n update = applyToSingletonTag.bind(null, style, styleIndex, false);\n remove = applyToSingletonTag.bind(null, style, styleIndex, true);\n } else {\n style = insertStyleElement(options);\n update = applyToTag.bind(null, style, options);\n\n remove = function remove() {\n removeStyleElement(style);\n };\n }\n\n update(obj);\n return function updateStyle(newObj) {\n if (newObj) {\n if (newObj.css === obj.css && newObj.media === obj.media && newObj.sourceMap === obj.sourceMap) {\n return;\n }\n\n update(obj = newObj);\n } else {\n remove();\n }\n };\n}\n\nmodule.exports = function (list, options) {\n options = options || {};\n options.attributes = typeof options.attributes === 'object' ? options.attributes : {}; // Force single-tag solution on IE6-9, which has a hard limit on the # of
diff --git a/apps/settings/src/components/AppList.vue b/apps/settings/src/components/AppList.vue
new file mode 100644
index 0000000000..3e40eeb5fb
--- /dev/null
+++ b/apps/settings/src/components/AppList.vue
@@ -0,0 +1,201 @@
+
+
+
+ ![]()
+
+
diff --git a/apps/settings/src/components/AppManagement.vue b/apps/settings/src/components/AppManagement.vue
new file mode 100644
index 0000000000..4de40728c5
--- /dev/null
+++ b/apps/settings/src/components/AppManagement.vue
@@ -0,0 +1,138 @@
+
+
+
diff --git a/apps/settings/src/components/AuthToken.vue b/apps/settings/src/components/AuthToken.vue
index fb5a331b72..034efc4b6a 100644
--- a/apps/settings/src/components/AuthToken.vue
+++ b/apps/settings/src/components/AuthToken.vue
@@ -23,31 +23,29 @@
-
+
- {{iconName.name}}
- ({{ t('settings', 'Marked for remote wipe') }})
+ ref="input"
+ v-model="newName"
+ type="text"
+ @keyup.enter="rename"
+ @blur="cancelRename"
+ @keyup.esc="cancelRename">
+ {{ iconName.name }}
+ ({{ t('settings', 'Marked for remote wipe') }})
- {{lastActivityRelative}}
+ {{ lastActivityRelative }}
+ }"
+ :open.sync="actionOpen">
@@ -91,7 +89,7 @@ import {
Actions,
ActionButton,
ActionCheckbox
-} from 'nextcloud-vue';
+} from 'nextcloud-vue'
const userAgentMap = {
ie: /(?:MSIE|Trident|Trident\/7.0; rv)[ :](\d+)/,
@@ -106,18 +104,18 @@ const userAgentMap = {
// Android Chrome user agent: https://developers.google.com/chrome/mobile/docs/user-agent
androidChrome: /Android.*(?:; (.*) Build\/).*Chrome\/(\d+)[0-9.]+/,
iphone: / *CPU +iPhone +OS +([0-9]+)_(?:[0-9_])+ +like +Mac +OS +X */,
- ipad: /\(iPad\; *CPU +OS +([0-9]+)_(?:[0-9_])+ +like +Mac +OS +X */,
- iosClient: /^Mozilla\/5\.0 \(iOS\) (ownCloud|Nextcloud)\-iOS.*$/,
- androidClient: /^Mozilla\/5\.0 \(Android\) ownCloud\-android.*$/,
- iosTalkClient: /^Mozilla\/5\.0 \(iOS\) Nextcloud\-Talk.*$/,
- androidTalkClient: /^Mozilla\/5\.0 \(Android\) Nextcloud\-Talk.*$/,
+ ipad: /\(iPad; *CPU +OS +([0-9]+)_(?:[0-9_])+ +like +Mac +OS +X */,
+ iosClient: /^Mozilla\/5\.0 \(iOS\) (ownCloud|Nextcloud)-iOS.*$/,
+ androidClient: /^Mozilla\/5\.0 \(Android\) ownCloud-android.*$/,
+ iosTalkClient: /^Mozilla\/5\.0 \(iOS\) Nextcloud-Talk.*$/,
+ androidTalkClient: /^Mozilla\/5\.0 \(Android\) Nextcloud-Talk.*$/,
// DAVdroid/1.2 (2016/07/03; dav4android; okhttp3) Android/6.0.1
davDroid: /DAV(droid|x5)\/([0-9.]+)/,
// Mozilla/5.0 (U; Linux; Maemo; Jolla; Sailfish; like Android 4.3) AppleWebKit/538.1 (KHTML, like Gecko) WebPirate/2.0 like Mobile Safari/538.1 (compatible)
webPirate: /(Sailfish).*WebPirate\/(\d+)/,
// Mozilla/5.0 (Maemo; Linux; U; Jolla; Sailfish; Mobile; rv:31.0) Gecko/31.0 Firefox/31.0 SailfishBrowser/1.0
sailfishBrowser: /(Sailfish).*SailfishBrowser\/(\d+)/
-};
+}
const nameMap = {
ie: t('setting', 'Internet Explorer'),
edge: t('setting', 'Edge'),
@@ -134,7 +132,7 @@ const nameMap = {
davDroid: 'DAVdroid',
webPirate: 'WebPirate',
sailfishBrowser: 'SailfishBrowser'
-};
+}
const iconMap = {
ie: 'icon-desktop',
edge: 'icon-desktop',
@@ -151,10 +149,10 @@ const iconMap = {
davDroid: 'icon-phone',
webPirate: 'icon-link',
sailfishBrowser: 'icon-link'
-};
+}
export default {
- name: "AuthToken",
+ name: 'AuthToken',
components: {
Actions,
ActionButton,
@@ -163,91 +161,93 @@ export default {
props: {
token: {
type: Object,
- required: true,
+ required: true
}
},
- computed: {
- lastActivityRelative () {
- return OC.Util.relativeModifiedDate(this.token.lastActivity * 1000);
- },
- lastActivity () {
- return OC.Util.formatDate(this.token.lastActivity * 1000, 'LLL');
- },
- iconName () {
- // pretty format sync client user agent
- let matches = this.token.name.match(/Mozilla\/5\.0 \((\w+)\) (?:mirall|csyncoC)\/(\d+\.\d+\.\d+)/);
-
- let icon = '';
- if (matches) {
- this.token.name = t('settings', 'Sync client - {os}', {
- os: matches[1],
- version: matches[2]
- });
- icon = 'icon-desktop';
- }
-
- // preserve title for cases where we format it further
- const title = this.token.name;
- let name = this.token.name;
- for (let client in userAgentMap) {
- if (matches = title.match(userAgentMap[client])) {
- if (matches[2] && matches[1]) { // version number and os
- name = nameMap[client] + ' ' + matches[2] + ' - ' + matches[1];
- } else if (matches[1]) { // only version number
- name = nameMap[client] + ' ' + matches[1];
- } else {
- name = nameMap[client];
- }
-
- icon = iconMap[client];
- }
- }
- if (this.token.current) {
- name = t('settings', 'This session');
- }
-
- return {
- icon,
- name,
- };
- },
- wiping() {
- return this.token.type === 2;
- }
- },
- data () {
+ data() {
return {
showMore: this.token.canScope || this.token.canDelete,
renaming: false,
newName: '',
- actionOpen: false,
- };
+ actionOpen: false
+ }
+ },
+ computed: {
+ lastActivityRelative() {
+ return OC.Util.relativeModifiedDate(this.token.lastActivity * 1000)
+ },
+ lastActivity() {
+ return OC.Util.formatDate(this.token.lastActivity * 1000, 'LLL')
+ },
+ iconName() {
+ // pretty format sync client user agent
+ let matches = this.token.name.match(/Mozilla\/5\.0 \((\w+)\) (?:mirall|csyncoC)\/(\d+\.\d+\.\d+)/)
+
+ let icon = ''
+ if (matches) {
+ /* eslint-disable-next-line */
+ this.token.name = t('settings', 'Sync client - {os}', {
+ os: matches[1],
+ version: matches[2]
+ })
+ icon = 'icon-desktop'
+ }
+
+ // preserve title for cases where we format it further
+ const title = this.token.name
+ let name = this.token.name
+ for (let client in userAgentMap) {
+ const matches = title.match(userAgentMap[client])
+ if (matches) {
+ if (matches[2] && matches[1]) { // version number and os
+ name = nameMap[client] + ' ' + matches[2] + ' - ' + matches[1]
+ } else if (matches[1]) { // only version number
+ name = nameMap[client] + ' ' + matches[1]
+ } else {
+ name = nameMap[client]
+ }
+
+ icon = iconMap[client]
+ }
+ }
+ if (this.token.current) {
+ name = t('settings', 'This session')
+ }
+
+ return {
+ icon,
+ name
+ }
+ },
+ wiping() {
+ return this.token.type === 2
+ }
},
methods: {
startRename() {
// Close action (popover menu)
- this.actionOpen = false;
+ this.actionOpen = false
- this.newName = this.token.name;
- this.renaming = true;
+ this.newName = this.token.name
+ this.renaming = true
this.$nextTick(() => {
- this.$refs.input.select();
- });
+ this.$refs.input.select()
+ })
},
cancelRename() {
- this.renaming = false;
+ this.renaming = false
},
revoke() {
- this.actionOpen = false;
+ this.actionOpen = false
this.$emit('delete', this.token)
},
rename() {
- this.renaming = false;
- this.$emit('rename', this.token, this.newName);
+ this.renaming = false
+ this.$emit('rename', this.token, this.newName)
},
wipe() {
- this.actionOpen = false;
- this.$emit('wipe', this.token);
+ this.actionOpen = false
+ this.$emit('wipe', this.token)
}
}
}
diff --git a/apps/settings/src/components/AuthTokenList.vue b/apps/settings/src/components/AuthTokenList.vue
index a7c0faf1b7..65f42197ed 100644
--- a/apps/settings/src/components/AuthTokenList.vue
+++ b/apps/settings/src/components/AuthTokenList.vue
@@ -22,67 +22,67 @@
-
+
diff --git a/apps/updatenotification/src/components/root.vue b/apps/updatenotification/src/components/root.vue
deleted file mode 100644
index 0f6a427bb3..0000000000
--- a/apps/updatenotification/src/components/root.vue
+++ /dev/null
@@ -1,508 +0,0 @@
-
-
+ class="multiselect-vue"
+ :multiple="multiple"
+ :close-on-select="false"
+ :tag-width="60"
+ :disabled="disabled"
+ @input="update">
{{ t('core', 'No results') }}
{{ tagLabel(scope.option) }}
diff --git a/apps/workflowengine/src/components/Checks/RequestTime.vue b/apps/workflowengine/src/components/Checks/RequestTime.vue
index ce306c0541..1d7950f64f 100644
--- a/apps/workflowengine/src/components/Checks/RequestTime.vue
+++ b/apps/workflowengine/src/components/Checks/RequestTime.vue
@@ -1,9 +1,14 @@
-
+ :placeholder="placeholder"
+ @input="updateCustom">
diff --git a/apps/workflowengine/src/components/Checks/RequestUserAgent.vue b/apps/workflowengine/src/components/Checks/RequestUserAgent.vue
index e80071ab9f..9c43ac8632 100644
--- a/apps/workflowengine/src/components/Checks/RequestUserAgent.vue
+++ b/apps/workflowengine/src/components/Checks/RequestUserAgent.vue
@@ -29,7 +29,9 @@
track-by="pattern"
group-values="children"
group-label="label"
- :options="options" :multiple="false" :tagging="false"
+ :options="options"
+ :multiple="false"
+ :tagging="false"
@input="setValue">
@@ -40,7 +42,9 @@
{{ props.option.label }} {{ props.option.$groupLabel }}
-
diff --git a/apps/workflowengine/src/components/Checks/RequestUserGroup.vue b/apps/workflowengine/src/components/Checks/RequestUserGroup.vue
index 843bbf127e..ccd556c99c 100644
--- a/apps/workflowengine/src/components/Checks/RequestUserGroup.vue
+++ b/apps/workflowengine/src/components/Checks/RequestUserGroup.vue
@@ -23,9 +23,11 @@
![]()
{{ operation.triggerHint }}
-
+
![]()
{{ props.option.displayName }}
diff --git a/apps/workflowengine/src/components/Rule.vue b/apps/workflowengine/src/components/Rule.vue
index 76d332ac41..2be9b0fc5e 100644
--- a/apps/workflowengine/src/components/Rule.vue
+++ b/apps/workflowengine/src/components/Rule.vue
@@ -7,13 +7,18 @@
-
-
diff --git a/apps/workflowengine/src/components/Workflow.vue b/apps/workflowengine/src/components/Workflow.vue
index b4fab5a058..452dbacc5f 100644
--- a/apps/workflowengine/src/components/Workflow.vue
+++ b/apps/workflowengine/src/components/Workflow.vue
@@ -4,12 +4,15 @@
-
*
* @author 2019 Christoph Wurst
@@ -25,7 +25,8 @@ import $ from 'jquery'
* check if an element exists.
* allows you to write if ($('#myid').exists()) to increase readability
* @link http://stackoverflow.com/questions/31044/is-there-an-exists-function-for-jquery
+ * @returns {boolean}
*/
-$.fn.exists = function () {
- return this.length > 0;
-};
+$.fn.exists = function() {
+ return this.length > 0
+}
diff --git a/core/src/jquery/filterattr.js b/core/src/jquery/filterattr.js
index 7675eaa1e2..204d04b46a 100644
--- a/core/src/jquery/filterattr.js
+++ b/core/src/jquery/filterattr.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2018 Christoph Wurst
*
* @author 2018 Christoph Wurst
@@ -23,9 +23,13 @@ import $ from 'jquery'
/**
* Filter jQuery selector by attribute value
+ *
+ * @param {string} attrName attribute name
+ * @param {string} attrValue attribute value
+ * @returns {Void}
*/
-$.fn.filterAttr = function (attrName, attrValue) {
- return this.filter(function () {
- return $(this).attr(attrName) === attrValue;
- });
-};
+$.fn.filterAttr = function(attrName, attrValue) {
+ return this.filter(function() {
+ return $(this).attr(attrName) === attrValue
+ })
+}
diff --git a/core/src/jquery/index.js b/core/src/jquery/index.js
index e2efc76bdf..d131ae5245 100644
--- a/core/src/jquery/index.js
+++ b/core/src/jquery/index.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -59,5 +59,5 @@ $.ajaxSetup({
*
* This thus mitigates some unexpected XSS vectors.
*/
-$.globalEval = function () {
+$.globalEval = function() {
}
diff --git a/core/src/jquery/ocdialog.js b/core/src/jquery/ocdialog.js
index 8899d9433d..6838431153 100644
--- a/core/src/jquery/ocdialog.js
+++ b/core/src/jquery/ocdialog.js
@@ -29,17 +29,17 @@ $.widget('oc.ocdialog', {
closeOnEscape: true,
modal: false
},
- _create: function () {
- var self = this;
+ _create: function() {
+ var self = this
this.originalCss = {
display: this.element[0].style.display,
width: this.element[0].style.width,
height: this.element[0].style.height
- };
+ }
- this.originalTitle = this.element.attr('title');
- this.options.title = this.options.title || this.originalTitle;
+ this.originalTitle = this.element.attr('title')
+ this.options.title = this.options.title || this.originalTitle
this.$dialog = $('')
.attr({
@@ -47,224 +47,224 @@ $.widget('oc.ocdialog', {
tabIndex: -1,
role: 'dialog'
})
- .insertBefore(this.element);
- this.$dialog.append(this.element.detach());
- this.element.removeAttr('title').addClass('oc-dialog-content').appendTo(this.$dialog);
+ .insertBefore(this.element)
+ this.$dialog.append(this.element.detach())
+ this.element.removeAttr('title').addClass('oc-dialog-content').appendTo(this.$dialog)
this.$dialog.css({
display: 'inline-block',
position: 'fixed'
- });
+ })
- this.enterCallback = null;
+ this.enterCallback = null
- $(document).on('keydown keyup', function (event) {
+ $(document).on('keydown keyup', function(event) {
if (
- event.target !== self.$dialog.get(0) &&
- self.$dialog.find($(event.target)).length === 0
+ event.target !== self.$dialog.get(0)
+ && self.$dialog.find($(event.target)).length === 0
) {
- return;
+ return
}
// Escape
if (
- event.keyCode === 27 &&
- event.type === 'keydown' &&
- self.options.closeOnEscape
+ event.keyCode === 27
+ && event.type === 'keydown'
+ && self.options.closeOnEscape
) {
- event.stopImmediatePropagation();
- self.close();
- return false;
+ event.stopImmediatePropagation()
+ self.close()
+ return false
}
// Enter
if (event.keyCode === 13) {
- event.stopImmediatePropagation();
+ event.stopImmediatePropagation()
if (self.enterCallback !== null) {
- self.enterCallback();
- event.preventDefault();
- return false;
+ self.enterCallback()
+ event.preventDefault()
+ return false
}
if (event.type === 'keyup') {
- event.preventDefault();
- return false;
+ event.preventDefault()
+ return false
}
// If no button is selected we trigger the primary
if (
- self.$buttonrow &&
- self.$buttonrow.find($(event.target)).length === 0
+ self.$buttonrow
+ && self.$buttonrow.find($(event.target)).length === 0
) {
- var $button = self.$buttonrow.find('button.primary');
+ var $button = self.$buttonrow.find('button.primary')
if ($button && !$button.prop('disabled')) {
- $button.trigger('click');
+ $button.trigger('click')
}
} else if (self.$buttonrow) {
- $(event.target).trigger('click');
+ $(event.target).trigger('click')
}
- return false;
+ return false
}
- });
+ })
- this._setOptions(this.options);
- this._createOverlay();
+ this._setOptions(this.options)
+ this._createOverlay()
},
- _init: function () {
- this.$dialog.focus();
- this._trigger('open');
+ _init: function() {
+ this.$dialog.focus()
+ this._trigger('open')
},
- _setOption: function (key, value) {
- var self = this;
+ _setOption: function(key, value) {
+ var self = this
switch (key) {
- case 'title':
- if (this.$title) {
- this.$title.text(value);
- } else {
- var $title = $(''
+ case 'title':
+ if (this.$title) {
+ this.$title.text(value)
+ } else {
+ var $title = $('
')
+ this.$title = $title.prependTo(this.$dialog)
+ }
+ this._setSizes()
+ break
+ case 'buttons':
+ if (this.$buttonrow) {
+ this.$buttonrow.empty()
+ } else {
+ var $buttonrow = $('')
+ this.$buttonrow = $buttonrow.appendTo(this.$dialog)
+ }
+ if (value.length === 1) {
+ this.$buttonrow.addClass('onebutton')
+ } else if (value.length === 2) {
+ this.$buttonrow.addClass('twobuttons')
+ } else if (value.length === 3) {
+ this.$buttonrow.addClass('threebuttons')
+ }
+ $.each(value, function(idx, val) {
+ var $button = $('
' + t('files_sharing', 'Nothing shared with you yet') + '
' + - '' + t('files_sharing', 'Files and folders others share with you will show up here') + '
'); - return this._inFileList; + this._extendFileList(this._inFileList) + this._inFileList.appName = t('files_sharing', 'Shared with you') + this._inFileList.$el.find('#emptycontent').html('' + + '' + t('files_sharing', 'Nothing shared with you yet') + '
' + + '' + t('files_sharing', 'Files and folders others share with you will show up here') + '
') + return this._inFileList }, initSharingOut: function($el) { if (this._outFileList) { - return this._outFileList; + return this._outFileList } this._outFileList = new OCA.Sharing.FileList( $el, @@ -66,19 +66,19 @@ OCA.Sharing.App = { // if handling the event with the file list already created. shown: true } - ); + ) - this._extendFileList(this._outFileList); - this._outFileList.appName = t('files_sharing', 'Shared with others'); - this._outFileList.$el.find('#emptycontent').html('' + - '' + t('files_sharing', 'Nothing shared yet') + '
' + - '' + t('files_sharing', 'Files and folders you share will show up here') + '
'); - return this._outFileList; + this._extendFileList(this._outFileList) + this._outFileList.appName = t('files_sharing', 'Shared with others') + this._outFileList.$el.find('#emptycontent').html('' + + '' + t('files_sharing', 'Nothing shared yet') + '
' + + '' + t('files_sharing', 'Files and folders you share will show up here') + '
') + return this._outFileList }, initSharingLinks: function($el) { if (this._linkFileList) { - return this._linkFileList; + return this._linkFileList } this._linkFileList = new OCA.Sharing.FileList( $el, @@ -92,19 +92,19 @@ OCA.Sharing.App = { // if handling the event with the file list already created. shown: true } - ); + ) - this._extendFileList(this._linkFileList); - this._linkFileList.appName = t('files_sharing', 'Shared by link'); - this._linkFileList.$el.find('#emptycontent').html('' + - '' + t('files_sharing', 'No shared links') + '
' + - '' + t('files_sharing', 'Files and folders you share by link will show up here') + '
'); - return this._linkFileList; + this._extendFileList(this._linkFileList) + this._linkFileList.appName = t('files_sharing', 'Shared by link') + this._linkFileList.$el.find('#emptycontent').html('' + + '' + t('files_sharing', 'No shared links') + '
' + + '' + t('files_sharing', 'Files and folders you share by link will show up here') + '
') + return this._linkFileList }, initSharingDeleted: function($el) { if (this._deletedFileList) { - return this._deletedFileList; + return this._deletedFileList } this._deletedFileList = new OCA.Sharing.FileList( $el, @@ -119,19 +119,19 @@ OCA.Sharing.App = { // if handling the event with the file list already created. shown: true } - ); + ) - this._extendFileList(this._deletedFileList); - this._deletedFileList.appName = t('files_sharing', 'Deleted shares'); - this._deletedFileList.$el.find('#emptycontent').html('' + - '' + t('files_sharing', 'No deleted shares') + '
' + - '' + t('files_sharing', 'Shares you deleted will show up here') + '
'); - return this._deletedFileList; + this._extendFileList(this._deletedFileList) + this._deletedFileList.appName = t('files_sharing', 'Deleted shares') + this._deletedFileList.$el.find('#emptycontent').html('' + + '' + t('files_sharing', 'No deleted shares') + '
' + + '' + t('files_sharing', 'Shares you deleted will show up here') + '
') + return this._deletedFileList }, initShareingOverview: function($el) { if (this._overviewFileList) { - return this._overviewFileList; + return this._overviewFileList } this._overviewFileList = new OCA.Sharing.FileList( $el, @@ -144,43 +144,43 @@ OCA.Sharing.App = { // if handling the event with the file list already created. shown: true } - ); + ) - this._extendFileList(this._overviewFileList); - this._overviewFileList.appName = t('files_sharing', 'Shares'); - this._overviewFileList.$el.find('#emptycontent').html('' + - '' + t('files_sharing', 'No shares') + '
' + - '' + t('files_sharing', 'Shares will show up here') + '
'); - return this._overviewFileList; + this._extendFileList(this._overviewFileList) + this._overviewFileList.appName = t('files_sharing', 'Shares') + this._overviewFileList.$el.find('#emptycontent').html('' + + '' + t('files_sharing', 'No shares') + '
' + + '' + t('files_sharing', 'Shares will show up here') + '
') + return this._overviewFileList }, removeSharingIn: function() { if (this._inFileList) { - this._inFileList.$fileList.empty(); + this._inFileList.$fileList.empty() } }, removeSharingOut: function() { if (this._outFileList) { - this._outFileList.$fileList.empty(); + this._outFileList.$fileList.empty() } }, removeSharingLinks: function() { if (this._linkFileList) { - this._linkFileList.$fileList.empty(); + this._linkFileList.$fileList.empty() } }, removeSharingDeleted: function() { if (this._deletedFileList) { - this._deletedFileList.$fileList.empty(); + this._deletedFileList.$fileList.empty() } }, removeSharingOverview: function() { if (this._overviewFileList) { - this._overviewFileList.$fileList.empty(); + this._overviewFileList.$fileList.empty() } }, @@ -188,46 +188,46 @@ OCA.Sharing.App = { * Destroy the app */ destroy: function() { - OCA.Files.fileActions.off('setDefault.app-sharing', this._onActionsUpdated); - OCA.Files.fileActions.off('registerAction.app-sharing', this._onActionsUpdated); - this.removeSharingIn(); - this.removeSharingOut(); - this.removeSharingLinks(); - this._inFileList = null; - this._outFileList = null; - this._linkFileList = null; - this._overviewFileList = null; - delete this._globalActionsInitialized; + OCA.Files.fileActions.off('setDefault.app-sharing', this._onActionsUpdated) + OCA.Files.fileActions.off('registerAction.app-sharing', this._onActionsUpdated) + this.removeSharingIn() + this.removeSharingOut() + this.removeSharingLinks() + this._inFileList = null + this._outFileList = null + this._linkFileList = null + this._overviewFileList = null + delete this._globalActionsInitialized }, _createFileActions: function() { // inherit file actions from the files app - var fileActions = new OCA.Files.FileActions(); + var fileActions = new OCA.Files.FileActions() // note: not merging the legacy actions because legacy apps are not // compatible with the sharing overview and need to be adapted first - fileActions.registerDefaultActions(); - fileActions.merge(OCA.Files.fileActions); + fileActions.registerDefaultActions() + fileActions.merge(OCA.Files.fileActions) if (!this._globalActionsInitialized) { // in case actions are registered later - this._onActionsUpdated = _.bind(this._onActionsUpdated, this); - OCA.Files.fileActions.on('setDefault.app-sharing', this._onActionsUpdated); - OCA.Files.fileActions.on('registerAction.app-sharing', this._onActionsUpdated); - this._globalActionsInitialized = true; + this._onActionsUpdated = _.bind(this._onActionsUpdated, this) + OCA.Files.fileActions.on('setDefault.app-sharing', this._onActionsUpdated) + OCA.Files.fileActions.on('registerAction.app-sharing', this._onActionsUpdated) + this._globalActionsInitialized = true } // when the user clicks on a folder, redirect to the corresponding // folder in the files app instead of opening it directly - fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) { - OCA.Files.App.setActiveView('files', {silent: true}); - OCA.Files.App.fileList.changeDirectory(OC.joinPaths(context.$file.attr('data-path'), filename), true, true); - }); - fileActions.setDefault('dir', 'Open'); - return fileActions; + fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function(filename, context) { + OCA.Files.App.setActiveView('files', { silent: true }) + OCA.Files.App.fileList.changeDirectory(OC.joinPaths(context.$file.attr('data-path'), filename), true, true) + }) + fileActions.setDefault('dir', 'Open') + return fileActions }, _restoreShareAction: function() { - var fileActions = new OCA.Files.FileActions(); + var fileActions = new OCA.Files.FileActions() fileActions.registerAction({ name: 'Restore', displayName: '', @@ -237,70 +237,70 @@ OCA.Sharing.App = { iconClass: 'icon-history', type: OCA.Files.FileActions.TYPE_INLINE, actionHandler: function(fileName, context) { - var shareId = context.$file.data('shareId'); + var shareId = context.$file.data('shareId') $.post(OC.linkToOCS('apps/files_sharing/api/v1/deletedshares', 2) + shareId) - .success(function(result) { - context.fileList.remove(context.fileInfoModel.attributes.name); - }).fail(function() { - OC.Notification.showTemporary(t('files_sharing', 'Something happened. Unable to restore the share.')); - }); + .success(function(result) { + context.fileList.remove(context.fileInfoModel.attributes.name) + }).fail(function() { + OC.Notification.showTemporary(t('files_sharing', 'Something happened. Unable to restore the share.')) + }) } - }); - return fileActions; + }) + return fileActions }, _onActionsUpdated: function(ev) { _.each([this._inFileList, this._outFileList, this._linkFileList], function(list) { if (!list) { - return; + return } if (ev.action) { - list.fileActions.registerAction(ev.action); + list.fileActions.registerAction(ev.action) } else if (ev.defaultAction) { list.fileActions.setDefault( ev.defaultAction.mime, ev.defaultAction.name - ); + ) } - }); + }) }, _extendFileList: function(fileList) { // remove size column from summary - fileList.fileSummary.$el.find('.filesize').remove(); + fileList.fileSummary.$el.find('.filesize').remove() } -}; +} $(document).ready(function() { $('#app-content-sharingin').on('show', function(e) { - OCA.Sharing.App.initSharingIn($(e.target)); - }); + OCA.Sharing.App.initSharingIn($(e.target)) + }) $('#app-content-sharingin').on('hide', function() { - OCA.Sharing.App.removeSharingIn(); - }); + OCA.Sharing.App.removeSharingIn() + }) $('#app-content-sharingout').on('show', function(e) { - OCA.Sharing.App.initSharingOut($(e.target)); - }); + OCA.Sharing.App.initSharingOut($(e.target)) + }) $('#app-content-sharingout').on('hide', function() { - OCA.Sharing.App.removeSharingOut(); - }); + OCA.Sharing.App.removeSharingOut() + }) $('#app-content-sharinglinks').on('show', function(e) { - OCA.Sharing.App.initSharingLinks($(e.target)); - }); + OCA.Sharing.App.initSharingLinks($(e.target)) + }) $('#app-content-sharinglinks').on('hide', function() { - OCA.Sharing.App.removeSharingLinks(); - }); + OCA.Sharing.App.removeSharingLinks() + }) $('#app-content-deletedshares').on('show', function(e) { - OCA.Sharing.App.initSharingDeleted($(e.target)); - }); + OCA.Sharing.App.initSharingDeleted($(e.target)) + }) $('#app-content-deletedshares').on('hide', function() { - OCA.Sharing.App.removeSharingDeleted(); - }); + OCA.Sharing.App.removeSharingDeleted() + }) $('#app-content-shareoverview').on('show', function(e) { - OCA.Sharing.App.initShareingOverview($(e.target)); - }); + OCA.Sharing.App.initShareingOverview($(e.target)) + }) $('#app-content-shareoverview').on('hide', function() { - OCA.Sharing.App.removeSharingOverview(); - }); -}); + OCA.Sharing.App.removeSharingOverview() + }) +}) diff --git a/apps/files_sharing/js/dist/additionalScripts.js b/apps/files_sharing/js/dist/additionalScripts.js index 1f93f3d095..79143ae714 100644 Binary files a/apps/files_sharing/js/dist/additionalScripts.js and b/apps/files_sharing/js/dist/additionalScripts.js differ diff --git a/apps/files_sharing/js/dist/additionalScripts.js.map b/apps/files_sharing/js/dist/additionalScripts.js.map index 9db2068bf9..143949c1e3 100644 Binary files a/apps/files_sharing/js/dist/additionalScripts.js.map and b/apps/files_sharing/js/dist/additionalScripts.js.map differ diff --git a/apps/files_sharing/js/dist/collaboration.js b/apps/files_sharing/js/dist/collaboration.js index 22509085e9..5dd0e126a1 100644 Binary files a/apps/files_sharing/js/dist/collaboration.js and b/apps/files_sharing/js/dist/collaboration.js differ diff --git a/apps/files_sharing/js/dist/collaboration.js.map b/apps/files_sharing/js/dist/collaboration.js.map index 0b92d9f393..ddca7ef495 100644 Binary files a/apps/files_sharing/js/dist/collaboration.js.map and b/apps/files_sharing/js/dist/collaboration.js.map differ diff --git a/apps/files_sharing/js/dist/files_sharing.4.js b/apps/files_sharing/js/dist/files_sharing.4.js index 8ac4caf8c2..7929a7a595 100644 Binary files a/apps/files_sharing/js/dist/files_sharing.4.js and b/apps/files_sharing/js/dist/files_sharing.4.js differ diff --git a/apps/files_sharing/js/dist/files_sharing.4.js.map b/apps/files_sharing/js/dist/files_sharing.4.js.map index 8e2fb48987..7ebc04b8cc 100644 Binary files a/apps/files_sharing/js/dist/files_sharing.4.js.map and b/apps/files_sharing/js/dist/files_sharing.4.js.map differ diff --git a/apps/files_sharing/js/dist/files_sharing.js.map b/apps/files_sharing/js/dist/files_sharing.js.map index 8e33e4111a..1cb98bff5e 100644 Binary files a/apps/files_sharing/js/dist/files_sharing.js.map and b/apps/files_sharing/js/dist/files_sharing.js.map differ diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js index 7fa38a58c5..5b19830058 100644 --- a/apps/files_sharing/js/sharedfilelist.js +++ b/apps/files_sharing/js/sharedfilelist.js @@ -1,3 +1,4 @@ +/* eslint-disable */ /* * Copyright (c) 2014 Vincent Petry' +
- '' +
- '' +
- '
';
+ var TEMPLATE
+ = ''
+ + ''
+ + ''
+ + '
'
/**
* @memberof OCA.Sharing
*/
var ShareTabView = OCA.Files.DetailTabView.extend(
/** @lends OCA.Sharing.ShareTabView.prototype */ {
- id: 'shareTabView',
- className: 'tab shareTabView',
+ id: 'shareTabView',
+ className: 'tab shareTabView',
- initialize: function(name, options) {
- OCA.Files.DetailTabView.prototype.initialize.call(this, name, options);
- OC.Plugins.attach('OCA.Sharing.ShareTabView', this);
- },
+ initialize: function(name, options) {
+ OCA.Files.DetailTabView.prototype.initialize.call(this, name, options)
+ OC.Plugins.attach('OCA.Sharing.ShareTabView', this)
+ },
- template: function(params) {
- return TEMPLATE;
- },
+ template: function(params) {
+ return TEMPLATE
+ },
- getLabel: function() {
- return t('files_sharing', 'Sharing');
- },
+ getLabel: function() {
+ return t('files_sharing', 'Sharing')
+ },
- getIcon: function() {
- return 'icon-shared';
- },
+ getIcon: function() {
+ return 'icon-shared'
+ },
- /**
+ /**
* Renders this details view
*/
- render: function() {
- var self = this;
- if (this._dialog) {
+ render: function() {
+ var self = this
+ if (this._dialog) {
// remove/destroy older instance
- this._dialog.model.off();
- this._dialog.remove();
- this._dialog = null;
- }
-
- if (this.model) {
- this.$el.html(this.template());
-
- if (_.isUndefined(this.model.get('sharePermissions'))) {
- this.model.set('sharePermissions', OCA.Sharing.Util.getSharePermissions(this.model.attributes));
+ this._dialog.model.off()
+ this._dialog.remove()
+ this._dialog = null
}
- // TODO: the model should read these directly off the passed fileInfoModel
- var attributes = {
- itemType: this.model.isDirectory() ? 'folder' : 'file',
- itemSource: this.model.get('id'),
- possiblePermissions: this.model.get('sharePermissions')
- };
- var configModel = new OC.Share.ShareConfigModel();
- var shareModel = new OC.Share.ShareItemModel(attributes, {
- configModel: configModel,
- fileInfoModel: this.model
- });
- this._dialog = new OC.Share.ShareDialogView({
- configModel: configModel,
- model: shareModel
- });
- this.$el.find('.dialogContainer').append(this._dialog.$el);
- this._dialog.render();
- this._dialog.model.fetch();
- this._dialog.model.on('change', function() {
- self.trigger('sharesChanged', shareModel);
- });
+ if (this.model) {
+ this.$el.html(this.template())
+
+ if (_.isUndefined(this.model.get('sharePermissions'))) {
+ this.model.set('sharePermissions', OCA.Sharing.Util.getSharePermissions(this.model.attributes))
+ }
+
+ // TODO: the model should read these directly off the passed fileInfoModel
+ var attributes = {
+ itemType: this.model.isDirectory() ? 'folder' : 'file',
+ itemSource: this.model.get('id'),
+ possiblePermissions: this.model.get('sharePermissions')
+ }
+ var configModel = new OC.Share.ShareConfigModel()
+ var shareModel = new OC.Share.ShareItemModel(attributes, {
+ configModel: configModel,
+ fileInfoModel: this.model
+ })
+ this._dialog = new OC.Share.ShareDialogView({
+ configModel: configModel,
+ model: shareModel
+ })
+ this.$el.find('.dialogContainer').append(this._dialog.$el)
+ this._dialog.render()
+ this._dialog.model.fetch()
+ this._dialog.model.on('change', function() {
+ self.trigger('sharesChanged', shareModel)
+ })
import('./collaborationresources').then((Resources) => {
var vm = new Resources.Vue({
@@ -89,20 +89,19 @@
render: h => h(Resources.View),
data: {
model: this.model.toJSON()
- },
- });
+ }
+ })
this.model.on('change', () => { vm.data = this.model.toJSON() })
})
- } else {
- this.$el.empty();
+ } else {
+ this.$el.empty()
// TODO: render placeholder text?
+ }
+ this.trigger('rendered')
}
- this.trigger('rendered');
- }
- });
-
- OCA.Sharing.ShareTabView = ShareTabView;
-})();
+ })
+ OCA.Sharing.ShareTabView = ShareTabView
+})()
diff --git a/apps/files_sharing/src/views/CollaborationView.vue b/apps/files_sharing/src/views/CollaborationView.vue
index 0307488b5a..5cfcd299cc 100644
--- a/apps/files_sharing/src/views/CollaborationView.vue
+++ b/apps/files_sharing/src/views/CollaborationView.vue
@@ -21,7 +21,10 @@
-->
-
+
+
+
+
diff --git a/apps/settings/src/components/AppList/AppItem.vue b/apps/settings/src/components/AppList/AppItem.vue
new file mode 100644
index 0000000000..6b66163cfe
--- /dev/null
+++ b/apps/settings/src/components/AppList/AppItem.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ bundle.name }}
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('settings', 'Results from other categories') }}
+
+
+
+
+
+ {{ t('settings', 'No apps found for your version') }}
+
+
+
+
+
+
+
diff --git a/apps/settings/src/components/AppList/AppScore.vue b/apps/settings/src/components/AppList/AppScore.vue
new file mode 100644
index 0000000000..810a8b54e8
--- /dev/null
+++ b/apps/settings/src/components/AppList/AppScore.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ {{ app.name }}
+
+
+ {{ app.summary }}
+
+
+ {{ app.version }}
+ {{ app.appstoreData.releases[0].version }}
+
+
+
+
+ {{ t('settings', 'Supported') }}
+
+ {{ t('settings', 'Official') }}
+
+
+
+
+
+ {{ app.error }}
+
+
+
+
+
+
+
+ | - | {{ t('settings', 'Device') }} | -{{ t('settings', 'Last activity') }} | -- |
|---|---|---|---|
| + | {{ t('settings', 'Device') }} | +{{ t('settings', 'Last activity') }} | ++ |
-
-
-
-
-
-
-
-
diff --git a/apps/updatenotification/src/init.js b/apps/updatenotification/src/init.js
index d874cb67f3..19782799db 100644
--- a/apps/updatenotification/src/init.js
+++ b/apps/updatenotification/src/init.js
@@ -18,23 +18,22 @@
*
*/
-/* global define, $ */
-import Vue from 'vue';
-import Root from './components/root'
+import Vue from 'vue'
+import Root from './components/UpdateNotification'
Vue.mixin({
methods: {
t: function(app, text, vars, count, options) {
- return OC.L10N.translate(app, text, vars, count, options);
+ return OC.L10N.translate(app, text, vars, count, options)
},
n: function(app, textSingular, textPlural, count, vars, options) {
- return OC.L10N.translatePlural(app, textSingular, textPlural, count, vars, options);
+ return OC.L10N.translatePlural(app, textSingular, textPlural, count, vars, options)
}
}
-});
+})
-const vm = new Vue({
+// eslint-disable-next-line no-new
+new Vue({
+ el: '#updatenotification',
render: h => h(Root)
-}).$mount('#updatenotification');
-
-
+})
diff --git a/apps/user_ldap/js/wizard/wizardTabGeneric.js b/apps/user_ldap/js/wizard/wizardTabGeneric.js
index 7b0df4992d..f24c520c1f 100644
--- a/apps/user_ldap/js/wizard/wizardTabGeneric.js
+++ b/apps/user_ldap/js/wizard/wizardTabGeneric.js
@@ -392,9 +392,9 @@ OCA = OCA || {};
/**
* @typedef {object} viewSaveInfo
- * @property {function} val
- * @property {function} attr
- * @property {function} is
+ * @property {Function} val
+ * @property {Function} attr
+ * @property {Function} is
*/
/**
diff --git a/apps/workflowengine/js/workflowengine.js b/apps/workflowengine/js/workflowengine.js
index 2143a2afe6..ff40c80118 100644
Binary files a/apps/workflowengine/js/workflowengine.js and b/apps/workflowengine/js/workflowengine.js differ
diff --git a/apps/workflowengine/js/workflowengine.js.map b/apps/workflowengine/js/workflowengine.js.map
index 16c62805db..db7d112b8d 100644
Binary files a/apps/workflowengine/js/workflowengine.js.map and b/apps/workflowengine/js/workflowengine.js.map differ
diff --git a/apps/workflowengine/src/components/Check.vue b/apps/workflowengine/src/components/Check.vue
index 06667b1a7e..4f68e39449 100644
--- a/apps/workflowengine/src/components/Check.vue
+++ b/apps/workflowengine/src/components/Check.vue
@@ -1,19 +1,36 @@
-
-
-
- - - - {{ t('updatenotification', 'The version you are running is not maintained anymore. Please make sure to update to a supported version as soon as possible.') }} - -
- -
-
-
-
-
- {{ t('updatenotification', 'Apps missing updates') }} - - -
- - - - -- {{ t('updatenotification', 'Apps with available updates') }} - - -
- - - - - - {{ t('updatenotification', 'The update check is not yet finished. Please refresh the page.') }} - - {{ t('updatenotification', 'Your version is up to date.') }} - - - - -
- {{ t('updatenotification', 'A non-default update server is in use to be checked for updates:') }} {{updateServerURL}}
-
- {{ t('updatenotification', 'Update channel:') }} - -
--
- {{ t('updatenotification', 'You can always update to a newer version. But you can never downgrade to a more stable version.') }}
- {{ t('updatenotification', 'Note that after a new release it can take some time before it shows up here. We roll out new versions spread out over time to our users and sometimes skip a version when issues are found.') }}
-
- {{ t('updatenotification', 'Notify members of the following groups about available updates:') }}
-
- {{ t('updatenotification', 'Only notification for app updates are available.') }}
- {{ t('updatenotification', 'The selected update channel makes dedicated notifications for the server obsolete.') }}
- {{ t('updatenotification', 'The selected update channel does not support updates of the server.') }}
-
-
diff --git a/apps/workflowengine/src/components/Checks/FileMimeType.vue b/apps/workflowengine/src/components/Checks/FileMimeType.vue
index e99bf679f0..7e07d89aea 100644
--- a/apps/workflowengine/src/components/Checks/FileMimeType.vue
+++ b/apps/workflowengine/src/components/Checks/FileMimeType.vue
@@ -5,7 +5,9 @@
:placeholder="t('workflowengine', 'Select a file type')"
label="label"
track-by="pattern"
- :options="options" :multiple="false" :tagging="false"
+ :options="options"
+ :multiple="false"
+ :tagging="false"
@input="setValue">
@@ -16,7 +18,9 @@
{{ props.option.label }}
-
diff --git a/apps/workflowengine/src/components/Checks/FileSystemTag.vue b/apps/workflowengine/src/components/Checks/FileSystemTag.vue
index e2f66b30a4..d3fd440f1b 100644
--- a/apps/workflowengine/src/components/Checks/FileSystemTag.vue
+++ b/apps/workflowengine/src/components/Checks/FileSystemTag.vue
@@ -21,7 +21,8 @@
-->
-
{{ t('workflowengine', 'and') }}
-
- +
@@ -29,10 +34,14 @@{{ t('workflowengine', 'Workflows') }}
-
diff --git a/apps/workflowengine/src/store.js b/apps/workflowengine/src/store.js
index ad1a4d3f1b..8c55be8126 100644
--- a/apps/workflowengine/src/store.js
+++ b/apps/workflowengine/src/store.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright Copyright (c) 2019 Julius Härtl
*
* @author Julius Härtl
@@ -144,8 +144,12 @@ const store = new Vuex.Store({
getEventsForOperation(state) {
return (operation) => state.events
},
+
/**
* Return all available checker plugins for a given entity class
+ * @param {Object} state the store state
+ * @param {Object} entity the entity class
+ * @returns {Array} the available plugins
*/
getChecksForEntity(state) {
return (entity) => {
diff --git a/apps/workflowengine/src/workflowengine.js b/apps/workflowengine/src/workflowengine.js
index 2eb8161fc8..e479bbfa4e 100644
--- a/apps/workflowengine/src/workflowengine.js
+++ b/apps/workflowengine/src/workflowengine.js
@@ -44,16 +44,16 @@ window.OCA.WorkflowEngine = Object.assign({}, OCA.WorkflowEngine, {
/**
*
- * @param {CheckPlugin} Plugin
+ * @param {CheckPlugin} Plugin the plugin to register
*/
- registerCheck: function (Plugin) {
+ registerCheck: function(Plugin) {
store.commit('addPluginCheck', Plugin)
},
/**
*
- * @param {OperatorPlugin} Plugin
+ * @param {OperatorPlugin} Plugin the plugin to register
*/
- registerOperator: function (Plugin) {
+ registerOperator: function(Plugin) {
store.commit('addPluginOperator', Plugin)
}
})
diff --git a/core/js/dist/login.js b/core/js/dist/login.js
index 2db891d3b0..70bb6017ea 100644
Binary files a/core/js/dist/login.js and b/core/js/dist/login.js differ
diff --git a/core/js/dist/login.js.map b/core/js/dist/login.js.map
index 6f0a80c162..9eb112cbe1 100644
Binary files a/core/js/dist/login.js.map and b/core/js/dist/login.js.map differ
diff --git a/core/js/dist/main.js b/core/js/dist/main.js
index c2a86c2444..99633f9e71 100644
Binary files a/core/js/dist/main.js and b/core/js/dist/main.js differ
diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map
index d209ba8cc0..0971391d4a 100644
Binary files a/core/js/dist/main.js.map and b/core/js/dist/main.js.map differ
diff --git a/core/js/dist/maintenance.js b/core/js/dist/maintenance.js
index ea41042e2e..aa873b696a 100644
Binary files a/core/js/dist/maintenance.js and b/core/js/dist/maintenance.js differ
diff --git a/core/js/dist/maintenance.js.map b/core/js/dist/maintenance.js.map
index 7035aa1d43..9c418602ee 100644
Binary files a/core/js/dist/maintenance.js.map and b/core/js/dist/maintenance.js.map differ
diff --git a/core/js/dist/share_backend.js b/core/js/dist/share_backend.js
index 539ad99643..c72516337e 100644
Binary files a/core/js/dist/share_backend.js and b/core/js/dist/share_backend.js differ
diff --git a/core/js/dist/share_backend.js.map b/core/js/dist/share_backend.js.map
index e23968b731..f348e16de9 100644
Binary files a/core/js/dist/share_backend.js.map and b/core/js/dist/share_backend.js.map differ
diff --git a/core/js/dist/systemtags.js b/core/js/dist/systemtags.js
index f01991d2ab..e4eafeb848 100644
Binary files a/core/js/dist/systemtags.js and b/core/js/dist/systemtags.js differ
diff --git a/core/js/dist/systemtags.js.map b/core/js/dist/systemtags.js.map
index dae918b350..e388aba428 100644
Binary files a/core/js/dist/systemtags.js.map and b/core/js/dist/systemtags.js.map differ
diff --git a/core/js/merged-share-backend.js b/core/js/merged-share-backend.js
index a27bae9aa2..b96783603a 100644
--- a/core/js/merged-share-backend.js
+++ b/core/js/merged-share-backend.js
@@ -1,9 +1,9 @@
-import './shareconfigmodel.js';
-import './sharetemplates.js';
-import './shareitemmodel.js';
-import './sharesocialmanager.js';
-import './sharedialogresharerinfoview.js';
-import './sharedialoglinkshareview.js';
-import './sharedialogshareelistview.js';
-import './sharedialogview.js';
-import './share.js';
+import './shareconfigmodel.js'
+import './sharetemplates.js'
+import './shareitemmodel.js'
+import './sharesocialmanager.js'
+import './sharedialogresharerinfoview.js'
+import './sharedialoglinkshareview.js'
+import './sharedialogshareelistview.js'
+import './sharedialogview.js'
+import './share.js'
diff --git a/core/js/share.js b/core/js/share.js
index 26b420ab47..8dc5e49064 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -1,34 +1,33 @@
-/* global escapeHTML */
-
+/* eslint-disable */
/**
* @namespace
*/
OC.Share = _.extend(OC.Share || {}, {
- SHARE_TYPE_USER:0,
- SHARE_TYPE_GROUP:1,
- SHARE_TYPE_LINK:3,
- SHARE_TYPE_EMAIL:4,
- SHARE_TYPE_REMOTE:6,
- SHARE_TYPE_CIRCLE:7,
- SHARE_TYPE_GUEST:8,
- SHARE_TYPE_REMOTE_GROUP:9,
- SHARE_TYPE_ROOM:10,
+ SHARE_TYPE_USER: 0,
+ SHARE_TYPE_GROUP: 1,
+ SHARE_TYPE_LINK: 3,
+ SHARE_TYPE_EMAIL: 4,
+ SHARE_TYPE_REMOTE: 6,
+ SHARE_TYPE_CIRCLE: 7,
+ SHARE_TYPE_GUEST: 8,
+ SHARE_TYPE_REMOTE_GROUP: 9,
+ SHARE_TYPE_ROOM: 10,
/**
* Regular expression for splitting parts of remote share owners:
* "user@example.com/path/to/owncloud"
* "user@anotherexample.com@example.com/path/to/owncloud
*/
- _REMOTE_OWNER_REGEXP: new RegExp("^([^@]*)@(([^@]*)@)?([^/]*)([/](.*)?)?$"),
+ _REMOTE_OWNER_REGEXP: new RegExp('^([^@]*)@(([^@]*)@)?([^/]*)([/](.*)?)?$'),
/**
* @deprecated use OC.Share.currentShares instead
*/
- itemShares:[],
+ itemShares: [],
/**
* Full list of all share statuses
*/
- statuses:{},
+ statuses: {},
/**
* Shares for the currently selected file.
* (for which the dropdown is open)
@@ -40,7 +39,7 @@ OC.Share = _.extend(OC.Share || {}, {
/**
* Whether the share dropdown is opened.
*/
- droppedDown:false,
+ droppedDown: false,
/**
* Loads ALL share statuses from server, stores them in
* OC.Share.statuses then calls OC.Share.updateIcons() to update the
@@ -53,12 +52,12 @@ OC.Share = _.extend(OC.Share || {}, {
* @param fileList file list instance, defaults to OCA.Files.App.fileList
* @param callback function to call after the shares were loaded
*/
- loadIcons:function(itemType, fileList, callback) {
- var path = fileList.dirInfo.path;
+ loadIcons: function(itemType, fileList, callback) {
+ var path = fileList.dirInfo.path
if (path === '/') {
- path = '';
+ path = ''
}
- path += '/' + fileList.dirInfo.name;
+ path += '/' + fileList.dirInfo.name
// Load all share icons
$.get(
@@ -69,23 +68,23 @@ OC.Share = _.extend(OC.Share || {}, {
format: 'json'
}, function(result) {
if (result && result.ocs.meta.statuscode === 200) {
- OC.Share.statuses = {};
+ OC.Share.statuses = {}
$.each(result.ocs.data, function(it, share) {
if (!(share.item_source in OC.Share.statuses)) {
- OC.Share.statuses[share.item_source] = {link: false};
+ OC.Share.statuses[share.item_source] = { link: false }
}
if (share.share_type === OC.Share.SHARE_TYPE_LINK) {
- OC.Share.statuses[share.item_source] = {link: true};
+ OC.Share.statuses[share.item_source] = { link: true }
}
- });
+ })
if (_.isFunction(callback)) {
- callback(OC.Share.statuses);
+ callback(OC.Share.statuses)
} else {
- OC.Share.updateIcons(itemType, fileList);
+ OC.Share.updateIcons(itemType, fileList)
}
}
}
- );
+ )
},
/**
* Updates the files' "Share" icons according to the known
@@ -96,106 +95,106 @@ OC.Share = _.extend(OC.Share || {}, {
* @param fileList file list instance
* defaults to OCA.Files.App.fileList
*/
- updateIcons:function(itemType, fileList){
- var item;
- var $fileList;
- var currentDir;
+ updateIcons: function(itemType, fileList) {
+ var item
+ var $fileList
+ var currentDir
if (!fileList && OCA.Files) {
- fileList = OCA.Files.App.fileList;
+ fileList = OCA.Files.App.fileList
}
// fileList is usually only defined in the files app
if (fileList) {
- $fileList = fileList.$fileList;
- currentDir = fileList.getCurrentDirectory();
+ $fileList = fileList.$fileList
+ currentDir = fileList.getCurrentDirectory()
}
// TODO: iterating over the files might be more efficient
- for (item in OC.Share.statuses){
- var iconClass = 'icon-shared';
- var data = OC.Share.statuses[item];
- var hasLink = data.link;
+ for (item in OC.Share.statuses) {
+ var iconClass = 'icon-shared'
+ var data = OC.Share.statuses[item]
+ var hasLink = data.link
// Links override shared in terms of icon display
if (hasLink) {
- iconClass = 'icon-public';
+ iconClass = 'icon-public'
}
if (itemType !== 'file' && itemType !== 'folder') {
- $('a.share[data-item="'+item+'"] .icon').removeClass('icon-shared icon-public').addClass(iconClass);
+ $('a.share[data-item="' + item + '"] .icon').removeClass('icon-shared icon-public').addClass(iconClass)
} else {
// TODO: ultimately this part should be moved to files_sharing app
- var file = $fileList.find('tr[data-id="'+item+'"]');
- var shareFolder = OC.imagePath('core', 'filetypes/folder-shared');
- var img;
+ var file = $fileList.find('tr[data-id="' + item + '"]')
+ var shareFolder = OC.imagePath('core', 'filetypes/folder-shared')
+ var img
if (file.length > 0) {
- this.markFileAsShared(file, true, hasLink);
+ this.markFileAsShared(file, true, hasLink)
} else {
- var dir = currentDir;
+ var dir = currentDir
if (dir.length > 1) {
- var last = '';
- var path = dir;
+ var last = ''
+ var path = dir
// Search for possible parent folders that are shared
while (path != last) {
if (path === data.path && !data.link) {
- var actions = $fileList.find('.fileactions .action[data-action="Share"]');
- var files = $fileList.find('.filename');
- var i;
+ var actions = $fileList.find('.fileactions .action[data-action="Share"]')
+ var files = $fileList.find('.filename')
+ var i
for (i = 0; i < actions.length; i++) {
// TODO: use this.markFileAsShared()
- img = $(actions[i]).find('img');
+ img = $(actions[i]).find('img')
if (img.attr('src') !== OC.imagePath('core', 'actions/public')) {
- img.attr('src', image);
- $(actions[i]).addClass('permanent');
- $(actions[i]).html(' '+t('core', 'Shared')+'').prepend(img);
+ img.attr('src', image)
+ $(actions[i]).addClass('permanent')
+ $(actions[i]).html(' ' + t('core', 'Shared') + '').prepend(img)
}
}
- for(i = 0; i < files.length; i++) {
+ for (i = 0; i < files.length; i++) {
if ($(files[i]).closest('tr').data('type') === 'dir') {
- $(files[i]).find('.thumbnail').css('background-image', 'url('+shareFolder+')');
+ $(files[i]).find('.thumbnail').css('background-image', 'url(' + shareFolder + ')')
}
}
}
- last = path;
- path = OC.Share.dirname(path);
+ last = path
+ path = OC.Share.dirname(path)
}
}
}
}
}
},
- updateIcon:function(itemType, itemSource) {
- var shares = false;
- var link = false;
- var iconClass = '';
+ updateIcon: function(itemType, itemSource) {
+ var shares = false
+ var link = false
+ var iconClass = ''
$.each(OC.Share.itemShares, function(index) {
if (OC.Share.itemShares[index]) {
if (index == OC.Share.SHARE_TYPE_LINK) {
if (OC.Share.itemShares[index] == true) {
- shares = true;
- iconClass = 'icon-public';
- link = true;
- return;
+ shares = true
+ iconClass = 'icon-public'
+ link = true
+
}
} else if (OC.Share.itemShares[index].length > 0) {
- shares = true;
- iconClass = 'icon-shared';
+ shares = true
+ iconClass = 'icon-shared'
}
}
- });
+ })
if (itemType != 'file' && itemType != 'folder') {
- $('a.share[data-item="'+itemSource+'"] .icon').removeClass('icon-shared icon-public').addClass(iconClass);
+ $('a.share[data-item="' + itemSource + '"] .icon').removeClass('icon-shared icon-public').addClass(iconClass)
} else {
- var $tr = $('tr').filterAttr('data-id', String(itemSource));
+ var $tr = $('tr').filterAttr('data-id', String(itemSource))
if ($tr.length > 0) {
// it might happen that multiple lists exist in the DOM
// with the same id
$tr.each(function() {
- OC.Share.markFileAsShared($(this), shares, link);
- });
+ OC.Share.markFileAsShared($(this), shares, link)
+ })
}
}
if (shares) {
- OC.Share.statuses[itemSource] = OC.Share.statuses[itemSource] || {};
- OC.Share.statuses[itemSource].link = link;
+ OC.Share.statuses[itemSource] = OC.Share.statuses[itemSource] || {}
+ OC.Share.statuses[itemSource].link = link
} else {
- delete OC.Share.statuses[itemSource];
+ delete OC.Share.statuses[itemSource]
}
},
/**
@@ -204,55 +203,55 @@ OC.Share = _.extend(OC.Share || {}, {
* @param {String} shareWith userid, full remote share, or whatever
* @param {String} shareWithDisplayName
* @param {String} message
- * @return {String} HTML code to display
+ * @returns {String} HTML code to display
*/
_formatRemoteShare: function(shareWith, shareWithDisplayName, message) {
- var parts = this._REMOTE_OWNER_REGEXP.exec(shareWith);
+ var parts = this._REMOTE_OWNER_REGEXP.exec(shareWith)
if (!parts) {
// display avatar of the user
- var avatar = '';
- var hidden = '' + message + ' ' + escapeHTML(shareWithDisplayName) + ' ';
- return avatar + hidden;
+ var avatar = ''
+ var hidden = '' + message + ' ' + escapeHTML(shareWithDisplayName) + ' '
+ return avatar + hidden
}
- var userName = parts[1];
- var userDomain = parts[3];
- var server = parts[4];
- var tooltip = message + ' ' + userName;
+ var userName = parts[1]
+ var userDomain = parts[3]
+ var server = parts[4]
+ var tooltip = message + ' ' + userName
if (userDomain) {
- tooltip += '@' + userDomain;
+ tooltip += '@' + userDomain
}
if (server) {
if (!userDomain) {
- userDomain = '…';
+ userDomain = '…'
}
- tooltip += '@' + server;
+ tooltip += '@' + server
}
- var html = '';
- html += '' + escapeHTML(userName) + '';
+ var html = ''
+ html += '' + escapeHTML(userName) + ''
if (userDomain) {
- html += '@' + escapeHTML(userDomain) + '';
+ html += '@' + escapeHTML(userDomain) + ''
}
- html += ' ';
- return html;
+ html += ' '
+ return html
},
/**
* Loop over all recipients in the list and format them using
* all kind of fancy magic.
*
* @param {Object} recipients array of all the recipients
- * @return {String[]} modified list of recipients
+ * @returns {String[]} modified list of recipients
*/
_formatShareList: function(recipients) {
- var _parent = this;
- recipients = _.toArray(recipients);
+ var _parent = this
+ recipients = _.toArray(recipients)
recipients.sort(function(a, b) {
- return a.shareWithDisplayName.localeCompare(b.shareWithDisplayName);
- });
+ return a.shareWithDisplayName.localeCompare(b.shareWithDisplayName)
+ })
return $.map(recipients, function(recipient) {
- return _parent._formatRemoteShare(recipient.shareWith, recipient.shareWithDisplayName, t('core', 'Shared with'));
- });
+ return _parent._formatRemoteShare(recipient.shareWith, recipient.shareWithDisplayName, t('core', 'Shared with'))
+ })
},
/**
* Marks/unmarks a given file as shared by changing its action icon
@@ -263,78 +262,78 @@ OC.Share = _.extend(OC.Share || {}, {
* @param hasLink whether link share is available
*/
markFileAsShared: function($tr, hasShares, hasLink) {
- var action = $tr.find('.fileactions .action[data-action="Share"]');
- var type = $tr.data('type');
- var icon = action.find('.icon');
- var message, recipients, avatars;
- var ownerId = $tr.attr('data-share-owner-id');
- var owner = $tr.attr('data-share-owner');
- var mountType = $tr.attr('data-mounttype');
- var shareFolderIcon;
- var iconClass = 'icon-shared';
- action.removeClass('shared-style');
+ var action = $tr.find('.fileactions .action[data-action="Share"]')
+ var type = $tr.data('type')
+ var icon = action.find('.icon')
+ var message, recipients, avatars
+ var ownerId = $tr.attr('data-share-owner-id')
+ var owner = $tr.attr('data-share-owner')
+ var mountType = $tr.attr('data-mounttype')
+ var shareFolderIcon
+ var iconClass = 'icon-shared'
+ action.removeClass('shared-style')
// update folder icon
if (type === 'dir' && (hasShares || hasLink || ownerId)) {
if (typeof mountType !== 'undefined' && mountType !== 'shared-root' && mountType !== 'shared') {
- shareFolderIcon = OC.MimeType.getIconUrl('dir-' + mountType);
+ shareFolderIcon = OC.MimeType.getIconUrl('dir-' + mountType)
} else if (hasLink) {
- shareFolderIcon = OC.MimeType.getIconUrl('dir-public');
+ shareFolderIcon = OC.MimeType.getIconUrl('dir-public')
} else {
- shareFolderIcon = OC.MimeType.getIconUrl('dir-shared');
+ shareFolderIcon = OC.MimeType.getIconUrl('dir-shared')
}
- $tr.find('.filename .thumbnail').css('background-image', 'url(' + shareFolderIcon + ')');
- $tr.attr('data-icon', shareFolderIcon);
+ $tr.find('.filename .thumbnail').css('background-image', 'url(' + shareFolderIcon + ')')
+ $tr.attr('data-icon', shareFolderIcon)
} else if (type === 'dir') {
- var isEncrypted = $tr.attr('data-e2eencrypted');
+ var isEncrypted = $tr.attr('data-e2eencrypted')
// FIXME: duplicate of FileList._createRow logic for external folder,
// need to refactor the icon logic into a single code path eventually
if (isEncrypted === 'true') {
- shareFolderIcon = OC.MimeType.getIconUrl('dir-encrypted');
- $tr.attr('data-icon', shareFolderIcon);
+ shareFolderIcon = OC.MimeType.getIconUrl('dir-encrypted')
+ $tr.attr('data-icon', shareFolderIcon)
} else if (mountType && mountType.indexOf('external') === 0) {
- shareFolderIcon = OC.MimeType.getIconUrl('dir-external');
- $tr.attr('data-icon', shareFolderIcon);
+ shareFolderIcon = OC.MimeType.getIconUrl('dir-external')
+ $tr.attr('data-icon', shareFolderIcon)
} else {
- shareFolderIcon = OC.MimeType.getIconUrl('dir');
+ shareFolderIcon = OC.MimeType.getIconUrl('dir')
// back to default
- $tr.removeAttr('data-icon');
+ $tr.removeAttr('data-icon')
}
- $tr.find('.filename .thumbnail').css('background-image', 'url(' + shareFolderIcon + ')');
+ $tr.find('.filename .thumbnail').css('background-image', 'url(' + shareFolderIcon + ')')
}
// update share action text / icon
if (hasShares || ownerId) {
- recipients = $tr.data('share-recipient-data');
- action.addClass('shared-style');
+ recipients = $tr.data('share-recipient-data')
+ action.addClass('shared-style')
- avatars = '' + t('core', 'Shared') + '';
+ avatars = '' + t('core', 'Shared') + ''
// even if reshared, only show "Shared by"
if (ownerId) {
- message = t('core', 'Shared by');
- avatars = this._formatRemoteShare(ownerId, owner, message);
+ message = t('core', 'Shared by')
+ avatars = this._formatRemoteShare(ownerId, owner, message)
} else if (recipients) {
- avatars = this._formatShareList(recipients);
+ avatars = this._formatShareList(recipients)
}
- action.html(avatars).prepend(icon);
+ action.html(avatars).prepend(icon)
if (ownerId || recipients) {
- var avatarElement = action.find('.avatar');
- avatarElement.each(function () {
- $(this).avatar($(this).data('username'), 32);
- });
- action.find('span[title]').tooltip({placement: 'top'});
+ var avatarElement = action.find('.avatar')
+ avatarElement.each(function() {
+ $(this).avatar($(this).data('username'), 32)
+ })
+ action.find('span[title]').tooltip({ placement: 'top' })
}
} else {
- action.html('' + t('core', 'Shared') + '').prepend(icon);
+ action.html('' + t('core', 'Shared') + '').prepend(icon)
}
if (hasLink) {
- iconClass = 'icon-public';
+ iconClass = 'icon-public'
}
- icon.removeClass('icon-shared icon-public').addClass(iconClass);
+ icon.removeClass('icon-shared icon-public').addClass(iconClass)
},
- showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions, filename) {
- var configModel = new OC.Share.ShareConfigModel();
- var attributes = {itemType: itemType, itemSource: itemSource, possiblePermissions: possiblePermissions};
- var itemModel = new OC.Share.ShareItemModel(attributes, {configModel: configModel});
+ showDropDown: function(itemType, itemSource, appendTo, link, possiblePermissions, filename) {
+ var configModel = new OC.Share.ShareConfigModel()
+ var attributes = { itemType: itemType, itemSource: itemSource, possiblePermissions: possiblePermissions }
+ var itemModel = new OC.Share.ShareItemModel(attributes, { configModel: configModel })
var dialogView = new OC.Share.ShareDialogView({
id: 'dropdown',
model: itemModel,
@@ -345,38 +344,38 @@ OC.Share = _.extend(OC.Share || {}, {
'data-item-type': itemType,
'data-item-source': itemSource
}
- });
- dialogView.setShowLink(link);
- var $dialog = dialogView.render().$el;
- $dialog.appendTo(appendTo);
+ })
+ dialogView.setShowLink(link)
+ var $dialog = dialogView.render().$el
+ $dialog.appendTo(appendTo)
$dialog.slideDown(OC.menuSpeed, function() {
- OC.Share.droppedDown = true;
- });
- itemModel.fetch();
+ OC.Share.droppedDown = true
+ })
+ itemModel.fetch()
},
- hideDropDown:function(callback) {
- OC.Share.currentShares = null;
+ hideDropDown: function(callback) {
+ OC.Share.currentShares = null
$('#dropdown').slideUp(OC.menuSpeed, function() {
- OC.Share.droppedDown = false;
- $('#dropdown').remove();
+ OC.Share.droppedDown = false
+ $('#dropdown').remove()
if (typeof FileActions !== 'undefined') {
- $('tr').removeClass('mouseOver');
+ $('tr').removeClass('mouseOver')
}
if (callback) {
- callback.call();
+ callback.call()
}
- });
+ })
},
- dirname:function(path) {
- return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
+ dirname: function(path) {
+ return path.replace(/\\/g, '/').replace(/\/[^\/]*$/, '')
}
-});
+})
$(document).ready(function() {
- if(typeof monthNames != 'undefined'){
+ if (typeof monthNames !== 'undefined') {
// min date should always be the next day
- var minDate = new Date();
- minDate.setDate(minDate.getDate()+1);
+ var minDate = new Date()
+ minDate.setDate(minDate.getDate() + 1)
$.datepicker.setDefaults({
monthNames: monthNames,
monthNamesShort: monthNamesShort,
@@ -384,19 +383,17 @@ $(document).ready(function() {
dayNamesMin: dayNamesMin,
dayNamesShort: dayNamesShort,
firstDay: firstDay,
- minDate : minDate
- });
+ minDate: minDate
+ })
}
$(this).click(function(event) {
- var target = $(event.target);
+ var target = $(event.target)
var isMatched = !target.is('.drop, .ui-datepicker-next, .ui-datepicker-prev, .ui-icon')
- && !target.closest('#ui-datepicker-div').length && !target.closest('.ui-autocomplete').length;
+ && !target.closest('#ui-datepicker-div').length && !target.closest('.ui-autocomplete').length
if (OC.Share && OC.Share.droppedDown && isMatched && $('#dropdown').has(event.target).length === 0) {
- OC.Share.hideDropDown();
+ OC.Share.hideDropDown()
}
- });
+ })
-
-
-});
+})
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 184a121075..0d066116b5 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/*
* Copyright (c) 2015
*
@@ -12,8 +13,8 @@
(function() {
if (!OC.Share) {
- OC.Share = {};
- OC.Share.Types = {};
+ OC.Share = {}
+ OC.Share.Types = {}
}
// FIXME: the config model should populate its own model attributes based on
@@ -37,36 +38,35 @@
* @returns {boolean}
*/
isPublicUploadEnabled: function() {
- var publicUploadEnabled = $('#filestable').data('allow-public-upload');
- return publicUploadEnabled === 'yes';
+ var publicUploadEnabled = $('#filestable').data('allow-public-upload')
+ return publicUploadEnabled === 'yes'
},
/**
* @returns {boolean}
*/
isShareWithLinkAllowed: function() {
- return $('#allowShareWithLink').val() === 'yes';
+ return $('#allowShareWithLink').val() === 'yes'
},
/**
* @returns {string}
*/
getFederatedShareDocLink: function() {
- return OC.appConfig.core.federatedCloudShareDoc;
+ return OC.appConfig.core.federatedCloudShareDoc
},
- getDefaultExpirationDateString: function () {
- var expireDateString = '';
+ getDefaultExpirationDateString: function() {
+ var expireDateString = ''
if (this.get('isDefaultExpireDateEnabled')) {
- var date = moment.utc();
- var expireAfterDays = this.get('defaultExpireDate');
- date.add(expireAfterDays, 'days');
- expireDateString = date.format('YYYY-MM-DD 00:00:00');
+ var date = moment.utc()
+ var expireAfterDays = this.get('defaultExpireDate')
+ date.add(expireAfterDays, 'days')
+ expireDateString = date.format('YYYY-MM-DD 00:00:00')
}
- return expireDateString;
+ return expireDateString
}
- });
+ })
-
- OC.Share.ShareConfigModel = ShareConfigModel;
-})();
+ OC.Share.ShareConfigModel = ShareConfigModel
+})()
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index b9bf888867..96ebd8ebba 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/*
* Copyright (c) 2015
*
@@ -12,12 +13,12 @@
(function() {
if (!OC.Share) {
- OC.Share = {};
+ OC.Share = {}
}
- var PASSWORD_PLACEHOLDER = '**********';
- var PASSWORD_PLACEHOLDER_MESSAGE = t('core', 'Choose a password for the public link');
- var PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL = t('core', 'Choose a password for the public link or press the "Enter" key');
+ var PASSWORD_PLACEHOLDER = '**********'
+ var PASSWORD_PLACEHOLDER_MESSAGE = t('core', 'Choose a password for the public link')
+ var PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL = t('core', 'Choose a password for the public link or press the "Enter" key')
/**
* @class OCA.Share.ShareDialogLinkShareView
@@ -54,7 +55,7 @@
// hide download
'change .hideDownloadCheckbox': 'onHideDownloadChange',
// password
- 'click input.share-pass-submit': 'onPasswordEntered',
+ 'click input.share-pass-submit': 'onPasswordEntered',
'keyup input.linkPassText': 'onPasswordKeyUp', // check for the enter key
'change .showPasswordCheckbox': 'onShowPasswordClick',
'change .passwordByTalkCheckbox': 'onPasswordByTalkChange',
@@ -66,9 +67,9 @@
// permission change
'change .publicUploadRadio': 'onPublicUploadChange',
// expire date
- 'click .expireDate' : 'onExpireDateChange',
+ 'click .expireDate': 'onExpireDateChange',
'change .datepicker': 'onChangeExpirationDate',
- 'click .datepicker' : 'showDatePicker',
+ 'click .datepicker': 'showDatePicker',
// note
'click .share-add': 'showNoteForm',
'click .share-note-delete': 'deleteNote',
@@ -78,27 +79,27 @@
// new share
'click .new-share': 'newShare',
// enforced pass set
- 'submit .enforcedPassForm': 'enforcedPasswordSet',
+ 'submit .enforcedPassForm': 'enforcedPasswordSet'
},
initialize: function(options) {
- var view = this;
+ var view = this
this.model.on('change:permissions', function() {
- view.render();
- });
+ view.render()
+ })
this.model.on('change:itemType', function() {
- view.render();
- });
+ view.render()
+ })
this.model.on('change:allowPublicUploadStatus', function() {
- view.render();
- });
+ view.render()
+ })
this.model.on('change:hideFileListStatus', function() {
- view.render();
- });
+ view.render()
+ })
this.model.on('change:linkShares', function(model, linkShares) {
// The "Password protect by Talk" item is shown only when there
@@ -110,113 +111,113 @@
// changes; other changes in the link shares does not trigger
// a rendering, so the view must be rendered again as needed in
// those cases (for example, when a link share is removed).
-
- var previousLinkShares = model.previous('linkShares');
+
+ var previousLinkShares = model.previous('linkShares')
if (previousLinkShares.length !== linkShares.length) {
- return;
+ return
}
- var i;
+ var i
for (i = 0; i < linkShares.length; i++) {
if (linkShares[i].id !== previousLinkShares[i].id) {
// A resorting should never happen, but just in case.
- return;
+ return
}
if (linkShares[i].password !== previousLinkShares[i].password) {
- view.render();
+ view.render()
- return;
+ return
}
}
- });
+ })
- if(!_.isUndefined(options.configModel)) {
- this.configModel = options.configModel;
+ if (!_.isUndefined(options.configModel)) {
+ this.configModel = options.configModel
} else {
- throw 'missing OC.Share.ShareConfigModel';
+ throw 'missing OC.Share.ShareConfigModel'
}
- var clipboard = new Clipboard('.clipboard-button');
+ var clipboard = new Clipboard('.clipboard-button')
clipboard.on('success', function(e) {
- var $trigger = $(e.trigger);
+ var $trigger = $(e.trigger)
$trigger.tooltip('hide')
.attr('data-original-title', t('core', 'Copied!'))
.tooltip('fixTitle')
- .tooltip({placement: 'bottom', trigger: 'manual'})
- .tooltip('show');
+ .tooltip({ placement: 'bottom', trigger: 'manual' })
+ .tooltip('show')
_.delay(function() {
$trigger.tooltip('hide')
.attr('data-original-title', t('core', 'Copy link'))
.tooltip('fixTitle')
- }, 3000);
- });
- clipboard.on('error', function (e) {
- var $trigger = $(e.trigger);
- var $menu = $trigger.next('.share-menu').find('.popovermenu');
- var $linkTextMenu = $menu.find('li.linkTextMenu');
- var $input = $linkTextMenu.find('.linkText');
+ }, 3000)
+ })
+ clipboard.on('error', function(e) {
+ var $trigger = $(e.trigger)
+ var $menu = $trigger.next('.share-menu').find('.popovermenu')
+ var $linkTextMenu = $menu.find('li.linkTextMenu')
+ var $input = $linkTextMenu.find('.linkText')
- var $li = $trigger.closest('li[data-share-id]');
- var shareId = $li.data('share-id');
+ var $li = $trigger.closest('li[data-share-id]')
+ var shareId = $li.data('share-id')
// show menu
- OC.showMenu(null, $menu);
+ OC.showMenu(null, $menu)
- var actionMsg = '';
+ var actionMsg = ''
if (/iPhone|iPad/i.test(navigator.userAgent)) {
- actionMsg = t('core', 'Not supported!');
+ actionMsg = t('core', 'Not supported!')
} else if (/Mac/i.test(navigator.userAgent)) {
- actionMsg = t('core', 'Press ⌘-C to copy.');
+ actionMsg = t('core', 'Press ⌘-C to copy.')
} else {
- actionMsg = t('core', 'Press Ctrl-C to copy.');
+ actionMsg = t('core', 'Press Ctrl-C to copy.')
}
- $linkTextMenu.removeClass('hidden');
- $input.select();
+ $linkTextMenu.removeClass('hidden')
+ $input.select()
$input.tooltip('hide')
.attr('data-original-title', actionMsg)
.tooltip('fixTitle')
- .tooltip({placement: 'bottom', trigger: 'manual'})
- .tooltip('show');
- _.delay(function () {
- $input.tooltip('hide');
+ .tooltip({ placement: 'bottom', trigger: 'manual' })
+ .tooltip('show')
+ _.delay(function() {
+ $input.tooltip('hide')
$input.attr('data-original-title', t('core', 'Copy'))
- .tooltip('fixTitle');
- }, 3000);
- });
+ .tooltip('fixTitle')
+ }, 3000)
+ })
},
newShare: function(event) {
- var self = this;
- var $target = $(event.target);
- var $li = $target.closest('li[data-share-id]');
- var shareId = $li.data('share-id');
- var $loading = $li.find('.share-menu > .icon-loading-small');
+ var self = this
+ var $target = $(event.target)
+ var $li = $target.closest('li[data-share-id]')
+ var shareId = $li.data('share-id')
+ var $loading = $li.find('.share-menu > .icon-loading-small')
- if(!$loading.hasClass('hidden') && this.password === '') {
+ if (!$loading.hasClass('hidden') && this.password === '') {
// in process
- return false;
+ return false
}
// hide all icons and show loading
- $li.find('.icon').addClass('hidden');
- $loading.removeClass('hidden');
+ $li.find('.icon').addClass('hidden')
+ $loading.removeClass('hidden')
// hide menu
- OC.hideMenus();
+ OC.hideMenus()
var shareData = {}
- var isPasswordEnforced = this.configModel.get('enforcePasswordForPublicLink');
- var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced');
+ var isPasswordEnforced = this.configModel.get('enforcePasswordForPublicLink')
+ var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced')
// set default expire date
if (isExpirationEnforced) {
- var defaultExpireDays = this.configModel.get('defaultExpireDate');
+ var defaultExpireDays = this.configModel.get('defaultExpireDate')
var expireDate = moment().add(defaultExpireDays, 'day').format('DD-MM-YYYY')
- shareData.expireDate = expireDate;
+ shareData.expireDate = expireDate
}
// if password is set, add to data
@@ -224,25 +225,25 @@
shareData.password = this.password
}
- var newShareId = false;
+ var newShareId = false
// We need a password before the share creation
if (isPasswordEnforced && !this.showPending && this.password === '') {
- this.showPending = shareId;
- var self = this.render();
- self.$el.find('.pending #enforcedPassText').focus();
+ this.showPending = shareId
+ var self = this.render()
+ self.$el.find('.pending #enforcedPassText').focus()
} else {
// else, we have a password or it is not enforced
$.when(this.model.saveLinkShare(shareData, {
success: function() {
- $loading.addClass('hidden');
- $li.find('.icon').removeClass('hidden');
- self.render();
+ $loading.addClass('hidden')
+ $li.find('.icon').removeClass('hidden')
+ self.render()
// open the menu by default
// we can only do that after the render
if (newShareId) {
- var shares = self.$el.find('li[data-share-id]');
- var $newShare = self.$el.find('li[data-share-id="'+newShareId+'"]');
+ var shares = self.$el.find('li[data-share-id]')
+ var $newShare = self.$el.find('li[data-share-id="' + newShareId + '"]')
}
},
error: function() {
@@ -253,49 +254,49 @@
self.password = ''
if (isPasswordEnforced && response && response.responseJSON && response.responseJSON.ocs.meta && response.responseJSON.ocs.meta.message) {
var $input = self.$el.find('.pending #enforcedPassText')
- $input.tooltip('destroy');
- $input.attr('title', response.responseJSON.ocs.meta.message);
- $input.tooltip({placement: 'bottom', trigger: 'manual'});
- $input.tooltip('show');
+ $input.tooltip('destroy')
+ $input.attr('title', response.responseJSON.ocs.meta.message)
+ $input.tooltip({ placement: 'bottom', trigger: 'manual' })
+ $input.tooltip('show')
} else {
- OC.Notification.showTemporary(t('core', 'Unable to create a link share'));
- $loading.addClass('hidden');
- $li.find('.icon').removeClass('hidden');
+ OC.Notification.showTemporary(t('core', 'Unable to create a link share'))
+ $loading.addClass('hidden')
+ $li.find('.icon').removeClass('hidden')
}
}).then(function(response) {
// resolve before success
newShareId = response.ocs.data.id
- });
+ })
}
},
enforcedPasswordSet: function(event) {
- event.preventDefault();
- var $form = $(event.target);
- var $input = $form.find('input.enforcedPassText');
- this.password = $input.val();
- this.showPending = false;
- this.newShare(event);
+ event.preventDefault()
+ var $form = $(event.target)
+ var $input = $form.find('input.enforcedPassText')
+ this.password = $input.val()
+ this.showPending = false
+ this.newShare(event)
},
onLinkTextClick: function(event) {
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var $el = $li.find('.linkText');
- $el.focus();
- $el.select();
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var $el = $li.find('.linkText')
+ $el.focus()
+ $el.select()
},
onHideDownloadChange: function(event) {
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var shareId = $li.data('share-id');
- var $checkbox = $li.find('.hideDownloadCheckbox');
- $checkbox.siblings('.icon-loading-small').removeClass('hidden').addClass('inlineblock');
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var shareId = $li.data('share-id')
+ var $checkbox = $li.find('.hideDownloadCheckbox')
+ $checkbox.siblings('.icon-loading-small').removeClass('hidden').addClass('inlineblock')
- var hideDownload = false;
- if($checkbox.is(':checked')) {
- hideDownload = true;
+ var hideDownload = false
+ if ($checkbox.is(':checked')) {
+ hideDownload = true
}
this.model.saveLinkShare({
@@ -303,103 +304,103 @@
cid: shareId
}, {
success: function() {
- $checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock');
+ $checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock')
},
error: function(obj, msg) {
- OC.Notification.showTemporary(t('core', 'Unable to toggle this option'));
- $checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock');
+ OC.Notification.showTemporary(t('core', 'Unable to toggle this option'))
+ $checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock')
}
- });
+ })
},
onShowPasswordClick: function(event) {
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var shareId = $li.data('share-id');
- $li.find('.linkPass').slideToggle(OC.menuSpeed);
- $li.find('.linkPassMenu').toggleClass('hidden');
- if(!$li.find('.showPasswordCheckbox').is(':checked')) {
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var shareId = $li.data('share-id')
+ $li.find('.linkPass').slideToggle(OC.menuSpeed)
+ $li.find('.linkPassMenu').toggleClass('hidden')
+ if (!$li.find('.showPasswordCheckbox').is(':checked')) {
this.model.saveLinkShare({
password: '',
cid: shareId
- });
+ })
} else {
if (!OC.Util.isIE()) {
- $li.find('.linkPassText').focus();
+ $li.find('.linkPassText').focus()
}
}
},
onPasswordKeyUp: function(event) {
- if(event.keyCode === 13) {
- this.onPasswordEntered(event);
+ if (event.keyCode === 13) {
+ this.onPasswordEntered(event)
}
},
onPasswordEntered: function(event) {
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var shareId = $li.data('share-id');
- var $loading = $li.find('.linkPassMenu .icon-loading-small');
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var shareId = $li.data('share-id')
+ var $loading = $li.find('.linkPassMenu .icon-loading-small')
if (!$loading.hasClass('hidden')) {
// still in process
- return;
+ return
}
- var $input = $li.find('.linkPassText');
- $input.removeClass('error');
- $input.parent().find('input').removeClass('error');
- var password = $input.val();
+ var $input = $li.find('.linkPassText')
+ $input.removeClass('error')
+ $input.parent().find('input').removeClass('error')
+ var password = $input.val()
if ($li.find('.linkPassText').attr('placeholder') === PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL) {
// in IE9 the password might be the placeholder due to bugs in the placeholders polyfill
- if(password === PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL) {
- password = '';
+ if (password === PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL) {
+ password = ''
}
} else {
// in IE9 the password might be the placeholder due to bugs in the placeholders polyfill
- if(password === '' || password === PASSWORD_PLACEHOLDER || password === PASSWORD_PLACEHOLDER_MESSAGE) {
- return;
+ if (password === '' || password === PASSWORD_PLACEHOLDER || password === PASSWORD_PLACEHOLDER_MESSAGE) {
+ return
}
}
$loading
.removeClass('hidden')
- .addClass('inlineblock');
+ .addClass('inlineblock')
this.model.saveLinkShare({
password: password,
cid: shareId
}, {
complete: function(model) {
- $loading.removeClass('inlineblock').addClass('hidden');
+ $loading.removeClass('inlineblock').addClass('hidden')
},
error: function(model, msg) {
// Add visual feedback to both the input and the submit button
- $input.parent().find('input').addClass('error');
+ $input.parent().find('input').addClass('error')
// destroy old tooltips
- var $container = $input.parent();
- $container.tooltip('destroy');
- $input.addClass('error');
- $container.attr('title', msg);
- $container.tooltip({placement: 'bottom', trigger: 'manual'});
- $container.tooltip('show');
+ var $container = $input.parent()
+ $container.tooltip('destroy')
+ $input.addClass('error')
+ $container.attr('title', msg)
+ $container.tooltip({ placement: 'bottom', trigger: 'manual' })
+ $container.tooltip('show')
}
- });
+ })
},
onPasswordByTalkChange: function(event) {
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var shareId = $li.data('share-id');
- var $checkbox = $li.find('.passwordByTalkCheckbox');
- $checkbox.siblings('.icon-loading-small').removeClass('hidden').addClass('inlineblock');
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var shareId = $li.data('share-id')
+ var $checkbox = $li.find('.passwordByTalkCheckbox')
+ $checkbox.siblings('.icon-loading-small').removeClass('hidden').addClass('inlineblock')
- var sendPasswordByTalk = false;
- if($checkbox.is(':checked')) {
- sendPasswordByTalk = true;
+ var sendPasswordByTalk = false
+ if ($checkbox.is(':checked')) {
+ sendPasswordByTalk = true
}
this.model.saveLinkShare({
@@ -407,25 +408,25 @@
cid: shareId
}, {
success: function() {
- $checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock');
+ $checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock')
},
error: function(obj, msg) {
- OC.Notification.showTemporary(t('core', 'Unable to toggle this option'));
- $checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock');
+ OC.Notification.showTemporary(t('core', 'Unable to toggle this option'))
+ $checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock')
}
- });
+ })
},
onAllowPublicEditingChange: function(event) {
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var shareId = $li.data('share-id');
- var $checkbox = $li.find('.publicEditingCheckbox');
- $checkbox.siblings('.icon-loading-small').removeClass('hidden').addClass('inlineblock');
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var shareId = $li.data('share-id')
+ var $checkbox = $li.find('.publicEditingCheckbox')
+ $checkbox.siblings('.icon-loading-small').removeClass('hidden').addClass('inlineblock')
- var permissions = OC.PERMISSION_READ;
- if($checkbox.is(':checked')) {
- permissions = OC.PERMISSION_UPDATE | OC.PERMISSION_READ;
+ var permissions = OC.PERMISSION_READ
+ if ($checkbox.is(':checked')) {
+ permissions = OC.PERMISSION_UPDATE | OC.PERMISSION_READ
}
this.model.saveLinkShare({
@@ -433,168 +434,165 @@
cid: shareId
}, {
success: function() {
- $checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock');
+ $checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock')
},
error: function(obj, msg) {
- OC.Notification.showTemporary(t('core', 'Unable to toggle this option'));
- $checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock');
+ OC.Notification.showTemporary(t('core', 'Unable to toggle this option'))
+ $checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock')
}
- });
+ })
},
-
onPublicUploadChange: function(event) {
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var shareId = $li.data('share-id');
- var permissions = event.currentTarget.value;
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var shareId = $li.data('share-id')
+ var permissions = event.currentTarget.value
this.model.saveLinkShare({
permissions: permissions,
cid: shareId
- });
+ })
},
showNoteForm: function(event) {
- event.preventDefault();
- event.stopPropagation();
- var self = this;
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var $menu = $element.closest('li');
- var $form = $menu.next('li.share-note-form');
+ event.preventDefault()
+ event.stopPropagation()
+ var self = this
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var $menu = $element.closest('li')
+ var $form = $menu.next('li.share-note-form')
// show elements
- $menu.find('.share-note-delete').toggleClass('hidden');
- $form.toggleClass('hidden');
- $form.find('textarea').focus();
+ $menu.find('.share-note-delete').toggleClass('hidden')
+ $form.toggleClass('hidden')
+ $form.find('textarea').focus()
},
deleteNote: function(event) {
- event.preventDefault();
- event.stopPropagation();
- var self = this;
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var shareId = $li.data('share-id');
- var $menu = $element.closest('li');
- var $form = $menu.next('li.share-note-form');
+ event.preventDefault()
+ event.stopPropagation()
+ var self = this
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var shareId = $li.data('share-id')
+ var $menu = $element.closest('li')
+ var $form = $menu.next('li.share-note-form')
- $form.find('.share-note').val('');
+ $form.find('.share-note').val('')
- $form.addClass('hidden');
- $menu.find('.share-note-delete').addClass('hidden');
+ $form.addClass('hidden')
+ $menu.find('.share-note-delete').addClass('hidden')
- self.sendNote('', shareId, $menu);
+ self.sendNote('', shareId, $menu)
},
updateNote: function(event) {
- event.preventDefault();
- event.stopPropagation();
- var self = this;
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var shareId = $li.data('share-id');
- var $form = $element.closest('li.share-note-form');
- var $menu = $form.prev('li');
- var message = $form.find('.share-note').val().trim();
+ event.preventDefault()
+ event.stopPropagation()
+ var self = this
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var shareId = $li.data('share-id')
+ var $form = $element.closest('li.share-note-form')
+ var $menu = $form.prev('li')
+ var message = $form.find('.share-note').val().trim()
if (message.length < 1) {
- return;
+ return
}
- self.sendNote(message, shareId, $menu);
+ self.sendNote(message, shareId, $menu)
},
sendNote: function(note, shareId, $menu) {
- var $form = $menu.next('li.share-note-form');
- var $submit = $form.find('input.share-note-submit');
- var $error = $form.find('input.share-note-error');
+ var $form = $menu.next('li.share-note-form')
+ var $submit = $form.find('input.share-note-submit')
+ var $error = $form.find('input.share-note-error')
- $submit.prop('disabled', true);
- $menu.find('.icon-loading-small').removeClass('hidden');
- $menu.find('.icon-edit').hide();
+ $submit.prop('disabled', true)
+ $menu.find('.icon-loading-small').removeClass('hidden')
+ $menu.find('.icon-edit').hide()
var complete = function() {
- $submit.prop('disabled', false);
- $menu.find('.icon-loading-small').addClass('hidden');
- $menu.find('.icon-edit').show();
- };
+ $submit.prop('disabled', false)
+ $menu.find('.icon-loading-small').addClass('hidden')
+ $menu.find('.icon-edit').show()
+ }
var error = function() {
- $error.show();
+ $error.show()
setTimeout(function() {
- $error.hide();
- }, 3000);
- };
+ $error.hide()
+ }, 3000)
+ }
// send data
$.ajax({
method: 'PUT',
- url: OC.linkToOCS('apps/files_sharing/api/v1/shares',2) + shareId + '?' + OC.buildQueryString({format: 'json'}),
+ url: OC.linkToOCS('apps/files_sharing/api/v1/shares', 2) + shareId + '?' + OC.buildQueryString({ format: 'json' }),
data: { note: note },
- complete : complete,
+ complete: complete,
error: error
- });
+ })
},
render: function() {
- this.$el.find('.has-tooltip').tooltip();
+ this.$el.find('.has-tooltip').tooltip()
// reset previously set passwords
- this.password = '';
+ this.password = ''
- var linkShareTemplate = this.template();
- var resharingAllowed = this.model.sharePermissionPossible();
+ var linkShareTemplate = this.template()
+ var resharingAllowed = this.model.sharePermissionPossible()
- if(!resharingAllowed
+ if (!resharingAllowed
|| !this.showLink
- || !this.configModel.isShareWithLinkAllowed())
- {
- var templateData = {shareAllowed: false};
+ || !this.configModel.isShareWithLinkAllowed()) {
+ var templateData = { shareAllowed: false }
if (!resharingAllowed) {
// add message
- templateData.noSharingPlaceholder = t('core', 'Resharing is not allowed');
+ templateData.noSharingPlaceholder = t('core', 'Resharing is not allowed')
}
- this.$el.html(linkShareTemplate(templateData));
- return this;
+ this.$el.html(linkShareTemplate(templateData))
+ return this
}
- var publicUpload =
- this.model.isFolder()
+ var publicUpload
+ = this.model.isFolder()
&& this.model.createPermissionPossible()
- && this.configModel.isPublicUploadEnabled();
+ && this.configModel.isPublicUploadEnabled()
-
- var publicEditingChecked = '';
- if(this.model.isPublicEditingAllowed()) {
- publicEditingChecked = 'checked="checked"';
+ var publicEditingChecked = ''
+ if (this.model.isPublicEditingAllowed()) {
+ publicEditingChecked = 'checked="checked"'
}
- var isPasswordEnforced = this.configModel.get('enforcePasswordForPublicLink');
- var isPasswordEnabledByDefault = this.configModel.get('enableLinkPasswordByDefault') === true;
+ var isPasswordEnforced = this.configModel.get('enforcePasswordForPublicLink')
+ var isPasswordEnabledByDefault = this.configModel.get('enableLinkPasswordByDefault') === true
var passwordPlaceholderInitial = this.configModel.get('enforcePasswordForPublicLink')
- ? PASSWORD_PLACEHOLDER_MESSAGE : PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL;
+ ? PASSWORD_PLACEHOLDER_MESSAGE : PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL
- var publicEditable =
- !this.model.isFolder()
- && this.model.updatePermissionPossible();
+ var publicEditable
+ = !this.model.isFolder()
+ && this.model.updatePermissionPossible()
- var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced');
+ var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced')
// what if there is another date picker on that page?
- var minDate = new Date();
+ var minDate = new Date()
// min date should always be the next day
- minDate.setDate(minDate.getDate()+1);
+ minDate.setDate(minDate.getDate() + 1)
$.datepicker.setDefaults({
minDate: minDate
- });
+ })
- this.$el.find('.datepicker').datepicker({dateFormat : 'dd-mm-yy'});
+ this.$el.find('.datepicker').datepicker({ dateFormat: 'dd-mm-yy' })
var minPasswordLength = 4
// password policy?
- if(OC.getCapabilities().password_policy && OC.getCapabilities().password_policy.minLength) {
- minPasswordLength = OC.getCapabilities().password_policy.minLength;
+ if (OC.getCapabilities().password_policy && OC.getCapabilities().password_policy.minLength) {
+ minPasswordLength = OC.getCapabilities().password_policy.minLength
}
var popoverBase = {
@@ -624,34 +622,34 @@
addNoteLabel: t('core', 'Note to recipient'),
unshareLabel: t('core', 'Unshare'),
unshareLinkLabel: t('core', 'Delete share link'),
- newShareLabel: t('core', 'Add another link'),
- };
+ newShareLabel: t('core', 'Add another link')
+ }
var pendingPopover = {
isPasswordEnforced: isPasswordEnforced,
enforcedPasswordLabel: t('core', 'Password protection for links is mandatory'),
passwordPlaceholder: passwordPlaceholderInitial,
- minPasswordLength: minPasswordLength,
- };
+ minPasswordLength: minPasswordLength
+ }
var pendingPopoverMenu = this.pendingPopoverMenuTemplate(_.extend({}, pendingPopover))
- var linkShares = this.getShareeList();
- if(_.isArray(linkShares)) {
+ var linkShares = this.getShareeList()
+ if (_.isArray(linkShares)) {
for (var i = 0; i < linkShares.length; i++) {
- var social = [];
- OC.Share.Social.Collection.each(function (model) {
- var url = model.get('url');
- url = url.replace('{{reference}}', linkShares[i].shareLinkURL);
+ var social = []
+ OC.Share.Social.Collection.each(function(model) {
+ var url = model.get('url')
+ url = url.replace('{{reference}}', linkShares[i].shareLinkURL)
social.push({
url: url,
- label: t('core', 'Share to {name}', {name: model.get('name')}),
+ label: t('core', 'Share to {name}', { name: model.get('name') }),
name: model.get('name'),
iconClass: model.get('iconClass'),
newWindow: model.get('newWindow')
- });
- });
+ })
+ })
var popover = this.getPopoverObject(linkShares[i])
- linkShares[i].popoverMenu = this.popoverMenuTemplate(_.extend({}, popoverBase, popover, {social: social}));
+ linkShares[i].popoverMenu = this.popoverMenuTemplate(_.extend({}, popoverBase, popover, { social: social }))
linkShares[i].pendingPopoverMenu = pendingPopoverMenu
}
}
@@ -664,33 +662,33 @@
newShareTitle: t('core', 'New share link'),
pendingPopoverMenu: pendingPopoverMenu,
showPending: this.showPending === this.newShareId,
- newShareId: this.newShareId,
- }));
+ newShareId: this.newShareId
+ }))
- this.delegateEvents();
+ this.delegateEvents()
// new note autosize
- autosize(this.$el.find('.share-note-form .share-note'));
+ autosize(this.$el.find('.share-note-form .share-note'))
- return this;
+ return this
},
onToggleMenu: function(event) {
- event.preventDefault();
- event.stopPropagation();
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var $menu = $li.find('.sharingOptionsGroup .popovermenu');
- var shareId = $li.data('share-id');
+ event.preventDefault()
+ event.stopPropagation()
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var $menu = $li.find('.sharingOptionsGroup .popovermenu')
+ var shareId = $li.data('share-id')
- OC.showMenu(null, $menu);
+ OC.showMenu(null, $menu)
// focus the password if not set and enforced
- var isPasswordEnabledByDefault = this.configModel.get('enableLinkPasswordByDefault') === true;
- var haspassword = $menu.find('.linkPassText').val() !== '';
+ var isPasswordEnabledByDefault = this.configModel.get('enableLinkPasswordByDefault') === true
+ var haspassword = $menu.find('.linkPassText').val() !== ''
if (!haspassword && isPasswordEnabledByDefault) {
- $menu.find('.linkPassText').focus();
+ $menu.find('.linkPassText').focus()
}
},
@@ -698,8 +696,8 @@
* @returns {Function} from Handlebars
* @private
*/
- template: function () {
- return OC.Share.Templates['sharedialoglinkshareview'];
+ template: function() {
+ return OC.Share.Templates['sharedialoglinkshareview']
},
/**
@@ -709,7 +707,7 @@
* @returns {string}
*/
popoverMenuTemplate: function(data) {
- return OC.Share.Templates['sharedialoglinkshareview_popover_menu'](data);
+ return OC.Share.Templates['sharedialoglinkshareview_popover_menu'](data)
},
/**
@@ -719,85 +717,85 @@
* @returns {string}
*/
pendingPopoverMenuTemplate: function(data) {
- return OC.Share.Templates['sharedialoglinkshareview_popover_menu_pending'](data);
+ return OC.Share.Templates['sharedialoglinkshareview_popover_menu_pending'](data)
},
onPopUpClick: function(event) {
- event.preventDefault();
- event.stopPropagation();
+ event.preventDefault()
+ event.stopPropagation()
- var url = $(event.currentTarget).data('url');
- var newWindow = $(event.currentTarget).data('window');
- $(event.currentTarget).tooltip('hide');
+ var url = $(event.currentTarget).data('url')
+ var newWindow = $(event.currentTarget).data('window')
+ $(event.currentTarget).tooltip('hide')
if (url) {
if (newWindow === true) {
- var width = 600;
- var height = 400;
- var left = (screen.width / 2) - (width / 2);
- var top = (screen.height / 2) - (height / 2);
+ var width = 600
+ var height = 400
+ var left = (screen.width / 2) - (width / 2)
+ var top = (screen.height / 2) - (height / 2)
- window.open(url, 'name', 'width=' + width + ', height=' + height + ', top=' + top + ', left=' + left);
+ window.open(url, 'name', 'width=' + width + ', height=' + height + ', top=' + top + ', left=' + left)
} else {
- window.location.href = url;
+ window.location.href = url
}
}
},
onExpireDateChange: function(event) {
- var $element = $(event.target);
- var li = $element.closest('li[data-share-id]');
- var shareId = li.data('share-id');
- var expirationDatePicker = '#expirationDateContainer-' + shareId;
- var datePicker = $(expirationDatePicker);
- var state = $element.prop('checked');
- datePicker.toggleClass('hidden', !state);
+ var $element = $(event.target)
+ var li = $element.closest('li[data-share-id]')
+ var shareId = li.data('share-id')
+ var expirationDatePicker = '#expirationDateContainer-' + shareId
+ var datePicker = $(expirationDatePicker)
+ var state = $element.prop('checked')
+ datePicker.toggleClass('hidden', !state)
if (!state) {
// disabled, let's hide the input and
// set the expireDate to nothing
- $element.closest('li').next('li').addClass('hidden');
- this.setExpirationDate('', shareId);
+ $element.closest('li').next('li').addClass('hidden')
+ this.setExpirationDate('', shareId)
} else {
// enabled, show the input and the datepicker
- $element.closest('li').next('li').removeClass('hidden');
- this.showDatePicker(event);
+ $element.closest('li').next('li').removeClass('hidden')
+ this.showDatePicker(event)
}
},
showDatePicker: function(event) {
- var $element = $(event.target);
- var li = $element.closest('li[data-share-id]');
- var shareId = li.data('share-id');
- var maxDate = $element.data('max-date');
- var expirationDatePicker = '#expirationDatePicker-' + shareId;
- var self = this;
+ var $element = $(event.target)
+ var li = $element.closest('li[data-share-id]')
+ var shareId = li.data('share-id')
+ var maxDate = $element.data('max-date')
+ var expirationDatePicker = '#expirationDatePicker-' + shareId
+ var self = this
$(expirationDatePicker).datepicker({
- dateFormat : 'dd-mm-yy',
- onSelect: function (expireDate) {
- self.setExpirationDate(expireDate, shareId);
+ dateFormat: 'dd-mm-yy',
+ onSelect: function(expireDate) {
+ self.setExpirationDate(expireDate, shareId)
},
maxDate: maxDate
- });
- $(expirationDatePicker).datepicker('show');
- $(expirationDatePicker).focus();
+ })
+ $(expirationDatePicker).datepicker('show')
+ $(expirationDatePicker).focus()
},
setExpirationDate: function(expireDate, shareId) {
- this.model.saveLinkShare({expireDate: expireDate, cid: shareId});
+ this.model.saveLinkShare({ expireDate: expireDate, cid: shareId })
},
onChangeExpirationDate: function(event) {
- var $element = $(event.target);
- var expireDate = $element.val();
- var li = $element.closest('li[data-share-id]');
- var shareId = li.data('share-id');
- var expirationDatePicker = '#expirationDatePicker-' + shareId;
+ var $element = $(event.target)
+ var expireDate = $element.val()
+ var li = $element.closest('li[data-share-id]')
+ var shareId = li.data('share-id')
+ var expirationDatePicker = '#expirationDatePicker-' + shareId
- this.setExpirationDate(expireDate, shareId);
- $(expirationDatePicker).datepicker('hide');
+ this.setExpirationDate(expireDate, shareId)
+ $(expirationDatePicker).datepicker('hide')
},
/**
@@ -806,21 +804,21 @@
* @returns {Array}
*/
getShareeList: function() {
- var shares = this.model.get('linkShares');
+ var shares = this.model.get('linkShares')
- if(!this.model.hasLinkShares()) {
- return [];
+ if (!this.model.hasLinkShares()) {
+ return []
}
- var list = [];
- for(var index = 0; index < shares.length; index++) {
- var share = this.getShareeObject(index);
+ var list = []
+ for (var index = 0; index < shares.length; index++) {
+ var share = this.getShareeObject(index)
// first empty {} is necessary, otherwise we get in trouble
// with references
- list.push(_.extend({}, share));
+ list.push(_.extend({}, share))
}
- return list;
+ return list
},
/**
@@ -829,7 +827,7 @@
* @returns {object}
*/
getShareeObject: function(shareIndex) {
- var share = this.model.get('linkShares')[shareIndex];
+ var share = this.model.get('linkShares')[shareIndex]
return _.extend({}, share, {
cid: share.id,
@@ -845,53 +843,53 @@
},
getPopoverObject: function(share) {
- var publicUploadRWChecked = '';
- var publicUploadRChecked = '';
- var publicUploadWChecked = '';
+ var publicUploadRWChecked = ''
+ var publicUploadRChecked = ''
+ var publicUploadWChecked = ''
switch (this.model.linkSharePermissions(share.id)) {
- case OC.PERMISSION_READ:
- publicUploadRChecked = 'checked';
- break;
- case OC.PERMISSION_CREATE:
- publicUploadWChecked = 'checked';
- break;
- case OC.PERMISSION_UPDATE | OC.PERMISSION_CREATE | OC.PERMISSION_READ | OC.PERMISSION_DELETE:
- publicUploadRWChecked = 'checked';
- break;
+ case OC.PERMISSION_READ:
+ publicUploadRChecked = 'checked'
+ break
+ case OC.PERMISSION_CREATE:
+ publicUploadWChecked = 'checked'
+ break
+ case OC.PERMISSION_UPDATE | OC.PERMISSION_CREATE | OC.PERMISSION_READ | OC.PERMISSION_DELETE:
+ publicUploadRWChecked = 'checked'
+ break
}
- var isPasswordSet = !!share.password;
- var isPasswordEnabledByDefault = this.configModel.get('enableLinkPasswordByDefault') === true;
- var isPasswordEnforced = this.configModel.get('enforcePasswordForPublicLink');
- var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced');
- var defaultExpireDays = this.configModel.get('defaultExpireDate');
- var hasExpireDate = !!share.expiration || isExpirationEnforced;
+ var isPasswordSet = !!share.password
+ var isPasswordEnabledByDefault = this.configModel.get('enableLinkPasswordByDefault') === true
+ var isPasswordEnforced = this.configModel.get('enforcePasswordForPublicLink')
+ var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced')
+ var defaultExpireDays = this.configModel.get('defaultExpireDate')
+ var hasExpireDate = !!share.expiration || isExpirationEnforced
- var expireDate;
+ var expireDate
if (hasExpireDate) {
- expireDate = moment(share.expiration, 'YYYY-MM-DD').format('DD-MM-YYYY');
+ expireDate = moment(share.expiration, 'YYYY-MM-DD').format('DD-MM-YYYY')
}
- var isTalkEnabled = OC.appswebroots['spreed'] !== undefined;
- var sendPasswordByTalk = share.sendPasswordByTalk;
+ var isTalkEnabled = OC.appswebroots['spreed'] !== undefined
+ var sendPasswordByTalk = share.sendPasswordByTalk
- var hideDownload = share.hideDownload;
+ var hideDownload = share.hideDownload
- var maxDate = null;
+ var maxDate = null
- if(hasExpireDate) {
- if(isExpirationEnforced) {
+ if (hasExpireDate) {
+ if (isExpirationEnforced) {
// TODO: hack: backend returns string instead of integer
- var shareTime = share.stime;
+ var shareTime = share.stime
if (_.isNumber(shareTime)) {
- shareTime = new Date(shareTime * 1000);
+ shareTime = new Date(shareTime * 1000)
}
if (!shareTime) {
- shareTime = new Date(); // now
+ shareTime = new Date() // now
}
- shareTime = OC.Util.stripTime(shareTime).getTime();
- maxDate = new Date(shareTime + defaultExpireDays * 24 * 3600 * 1000);
+ shareTime = OC.Util.stripTime(shareTime).getTime()
+ maxDate = new Date(shareTime + defaultExpireDays * 24 * 3600 * 1000)
}
}
@@ -912,46 +910,45 @@
hasNote: share.note !== '',
maxDate: maxDate,
hideDownload: hideDownload,
- isExpirationEnforced: isExpirationEnforced,
+ isExpirationEnforced: isExpirationEnforced
}
},
onUnshare: function(event) {
- event.preventDefault();
- event.stopPropagation();
- var self = this;
- var $element = $(event.target);
+ event.preventDefault()
+ event.stopPropagation()
+ var self = this
+ var $element = $(event.target)
if (!$element.is('a')) {
- $element = $element.closest('a');
+ $element = $element.closest('a')
}
- var $loading = $element.find('.icon-loading-small').eq(0);
- if(!$loading.hasClass('hidden')) {
+ var $loading = $element.find('.icon-loading-small').eq(0)
+ if (!$loading.hasClass('hidden')) {
// in process
- return false;
+ return false
}
- $loading.removeClass('hidden');
+ $loading.removeClass('hidden')
- var $li = $element.closest('li[data-share-id]');
+ var $li = $element.closest('li[data-share-id]')
- var shareId = $li.data('share-id');
+ var shareId = $li.data('share-id')
self.model.removeShare(shareId, {
success: function() {
- $li.remove();
+ $li.remove()
self.render()
},
error: function() {
- $loading.addClass('hidden');
- OC.Notification.showTemporary(t('core', 'Could not unshare'));
+ $loading.addClass('hidden')
+ OC.Notification.showTemporary(t('core', 'Could not unshare'))
}
- });
- return false;
- },
+ })
+ return false
+ }
+ })
- });
+ OC.Share.ShareDialogLinkShareView = ShareDialogLinkShareView
- OC.Share.ShareDialogLinkShareView = ShareDialogLinkShareView;
-
-})();
+})()
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index f55f2bcc52..b235adf435 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/*
* Copyright (c) 2015
*
@@ -12,7 +13,7 @@
(function() {
if (!OC.Share) {
- OC.Share = {};
+ OC.Share = {}
}
/**
@@ -42,32 +43,31 @@
_template: undefined,
initialize: function(options) {
- var view = this;
+ var view = this
this.model.on('change:reshare', function() {
- view.render();
- });
+ view.render()
+ })
- if(!_.isUndefined(options.configModel)) {
- this.configModel = options.configModel;
+ if (!_.isUndefined(options.configModel)) {
+ this.configModel = options.configModel
} else {
- throw 'missing OC.Share.ShareConfigModel';
+ throw 'missing OC.Share.ShareConfigModel'
}
},
render: function() {
if (!this.model.hasReshare()
- || this.model.getReshareOwner() === OC.currentUser)
- {
- this.$el.empty();
- return this;
+ || this.model.getReshareOwner() === OC.currentUser) {
+ this.$el.empty()
+ return this
}
- var reshareTemplate = this.template();
- var ownerDisplayName = this.model.getReshareOwnerDisplayname();
- var shareNote = this.model.getReshareNote();
-
- var sharedByText = '';
+ var reshareTemplate = this.template()
+ var ownerDisplayName = this.model.getReshareOwnerDisplayname()
+ var shareNote = this.model.getReshareNote()
+
+ var sharedByText = ''
if (this.model.getReshareType() === OC.Share.SHARE_TYPE_GROUP) {
sharedByText = t(
@@ -78,8 +78,8 @@
owner: ownerDisplayName
},
undefined,
- {escape: false}
- );
+ { escape: false }
+ )
} else if (this.model.getReshareType() === OC.Share.SHARE_TYPE_CIRCLE) {
sharedByText = t(
'core',
@@ -89,8 +89,8 @@
owner: ownerDisplayName
},
undefined,
- {escape: false}
- );
+ { escape: false }
+ )
} else if (this.model.getReshareType() === OC.Share.SHARE_TYPE_ROOM) {
if (this.model.get('reshare').share_with_displayname) {
sharedByText = t(
@@ -101,8 +101,8 @@
owner: ownerDisplayName
},
undefined,
- {escape: false}
- );
+ { escape: false }
+ )
} else {
sharedByText = t(
'core',
@@ -111,8 +111,8 @@
owner: ownerDisplayName
},
undefined,
- {escape: false}
- );
+ { escape: false }
+ )
}
} else {
sharedByText = t(
@@ -120,42 +120,40 @@
'Shared with you by {owner}',
{ owner: ownerDisplayName },
undefined,
- {escape: false}
- );
+ { escape: false }
+ )
}
-
-
this.$el.html(reshareTemplate({
reshareOwner: this.model.getReshareOwner(),
sharedByText: sharedByText,
shareNote: shareNote,
hasShareNote: shareNote !== ''
- }));
+ }))
this.$el.find('.avatar').each(function() {
- var $this = $(this);
- $this.avatar($this.data('username'), 32);
- });
+ var $this = $(this)
+ $this.avatar($this.data('username'), 32)
+ })
this.$el.find('.reshare').contactsMenu(
this.model.getReshareOwner(),
OC.Share.SHARE_TYPE_USER,
- this.$el);
+ this.$el)
- return this;
+ return this
},
/**
* @returns {Function} from Handlebars
* @private
*/
- template: function () {
- return OC.Share.Templates['sharedialogresharerinfoview'];
+ template: function() {
+ return OC.Share.Templates['sharedialogresharerinfoview']
}
- });
+ })
- OC.Share.ShareDialogResharerInfoView = ShareDialogResharerInfoView;
+ OC.Share.ShareDialogResharerInfoView = ShareDialogResharerInfoView
-})();
+})()
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 088adaff31..5fdb352fd5 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/* global OC, Handlebars */
/*
@@ -14,11 +15,11 @@
(function() {
- var PASSWORD_PLACEHOLDER = '**********';
- var PASSWORD_PLACEHOLDER_MESSAGE = t('core', 'Choose a password for the mail share');
+ var PASSWORD_PLACEHOLDER = '**********'
+ var PASSWORD_PLACEHOLDER_MESSAGE = t('core', 'Choose a password for the mail share')
if (!OC.Share) {
- OC.Share = {};
+ OC.Share = {}
}
/**
@@ -50,27 +51,27 @@
'click .share-note-submit': 'updateNote',
'click .share-menu .icon-more': 'onToggleMenu',
'click .permissions': 'onPermissionChange',
- 'click .expireDate' : 'onExpireDateChange',
- 'click .password' : 'onMailSharePasswordProtectChange',
- 'click .passwordByTalk' : 'onMailSharePasswordProtectByTalkChange',
- 'click .secureDrop' : 'onSecureDropChange',
+ 'click .expireDate': 'onExpireDateChange',
+ 'click .password': 'onMailSharePasswordProtectChange',
+ 'click .passwordByTalk': 'onMailSharePasswordProtectByTalkChange',
+ 'click .secureDrop': 'onSecureDropChange',
'keyup input.passwordField': 'onMailSharePasswordKeyUp',
'focusout input.passwordField': 'onMailSharePasswordEntered',
'change .datepicker': 'onChangeExpirationDate',
- 'click .datepicker' : 'showDatePicker'
+ 'click .datepicker': 'showDatePicker'
},
initialize: function(options) {
- if(!_.isUndefined(options.configModel)) {
- this.configModel = options.configModel;
+ if (!_.isUndefined(options.configModel)) {
+ this.configModel = options.configModel
} else {
- throw 'missing OC.Share.ShareConfigModel';
+ throw 'missing OC.Share.ShareConfigModel'
}
- var view = this;
+ var view = this
this.model.on('change:shares', function() {
- view.render();
- });
+ view.render()
+ })
},
/**
@@ -79,63 +80,62 @@
* @returns {object}
*/
getShareeObject: function(shareIndex) {
- var shareWith = this.model.getShareWith(shareIndex);
- var shareWithDisplayName = this.model.getShareWithDisplayName(shareIndex);
- var shareWithAvatar = this.model.getShareWithAvatar(shareIndex);
- var shareWithTitle = '';
- var shareType = this.model.getShareType(shareIndex);
- var sharedBy = this.model.getSharedBy(shareIndex);
- var sharedByDisplayName = this.model.getSharedByDisplayName(shareIndex);
- var fileOwnerUid = this.model.getFileOwnerUid(shareIndex);
+ var shareWith = this.model.getShareWith(shareIndex)
+ var shareWithDisplayName = this.model.getShareWithDisplayName(shareIndex)
+ var shareWithAvatar = this.model.getShareWithAvatar(shareIndex)
+ var shareWithTitle = ''
+ var shareType = this.model.getShareType(shareIndex)
+ var sharedBy = this.model.getSharedBy(shareIndex)
+ var sharedByDisplayName = this.model.getSharedByDisplayName(shareIndex)
+ var fileOwnerUid = this.model.getFileOwnerUid(shareIndex)
- var hasPermissionOverride = {};
+ var hasPermissionOverride = {}
if (shareType === OC.Share.SHARE_TYPE_GROUP) {
- shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'group') + ')';
+ shareWithDisplayName = shareWithDisplayName + ' (' + t('core', 'group') + ')'
} else if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
- shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'remote') + ')';
+ shareWithDisplayName = shareWithDisplayName + ' (' + t('core', 'remote') + ')'
} else if (shareType === OC.Share.SHARE_TYPE_REMOTE_GROUP) {
- shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'remote group') + ')';
+ shareWithDisplayName = shareWithDisplayName + ' (' + t('core', 'remote group') + ')'
} else if (shareType === OC.Share.SHARE_TYPE_EMAIL) {
- shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'email') + ')';
+ shareWithDisplayName = shareWithDisplayName + ' (' + t('core', 'email') + ')'
} else if (shareType === OC.Share.SHARE_TYPE_CIRCLE) {
} else if (shareType === OC.Share.SHARE_TYPE_ROOM) {
- shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'conversation') + ')';
+ shareWithDisplayName = shareWithDisplayName + ' (' + t('core', 'conversation') + ')'
}
if (shareType === OC.Share.SHARE_TYPE_GROUP) {
- shareWithTitle = shareWith + " (" + t('core', 'group') + ')';
+ shareWithTitle = shareWith + ' (' + t('core', 'group') + ')'
} else if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
- shareWithTitle = shareWith + " (" + t('core', 'remote') + ')';
+ shareWithTitle = shareWith + ' (' + t('core', 'remote') + ')'
} else if (shareType === OC.Share.SHARE_TYPE_REMOTE_GROUP) {
- shareWithTitle = shareWith + " (" + t('core', 'remote group') + ')';
- }
- else if (shareType === OC.Share.SHARE_TYPE_EMAIL) {
- shareWithTitle = shareWith + " (" + t('core', 'email') + ')';
+ shareWithTitle = shareWith + ' (' + t('core', 'remote group') + ')'
+ } else if (shareType === OC.Share.SHARE_TYPE_EMAIL) {
+ shareWithTitle = shareWith + ' (' + t('core', 'email') + ')'
} else if (shareType === OC.Share.SHARE_TYPE_CIRCLE) {
- shareWithTitle = shareWith;
+ shareWithTitle = shareWith
// Force "shareWith" in the template to a safe value, as the
// original "shareWith" returned by the model may contain
// problematic characters like "'".
- shareWith = 'circle-' + shareIndex;
+ shareWith = 'circle-' + shareIndex
}
if (sharedBy !== OC.getCurrentUser().uid) {
- var empty = shareWithTitle === '';
+ var empty = shareWithTitle === ''
if (!empty) {
- shareWithTitle += ' (';
+ shareWithTitle += ' ('
}
- shareWithTitle += t('core', 'shared by {sharer}', {sharer: sharedByDisplayName});
+ shareWithTitle += t('core', 'shared by {sharer}', { sharer: sharedByDisplayName })
if (!empty) {
- shareWithTitle += ')';
+ shareWithTitle += ')'
}
}
- var share = this.model.get('shares')[shareIndex];
- var password = share.password;
- var hasPassword = password !== null && password !== '';
- var sendPasswordByTalk = share.send_password_by_talk;
+ var share = this.model.get('shares')[shareIndex]
+ var password = share.password
+ var hasPassword = password !== null && password !== ''
+ var sendPasswordByTalk = share.send_password_by_talk
- var shareNote = this.model.getNote(shareIndex);
+ var shareNote = this.model.getNote(shareIndex)
return _.extend(hasPermissionOverride, {
cid: this.cid,
@@ -178,8 +178,8 @@
// brief time between disabling sending the password by email
// and receiving the updated share.
passwordPlaceholder: hasPassword ? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE,
- passwordByTalkPlaceholder: (hasPassword && sendPasswordByTalk)? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE,
- });
+ passwordByTalkPlaceholder: (hasPassword && sendPasswordByTalk) ? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE
+ })
},
getShareProperties: function() {
@@ -212,7 +212,7 @@
deletePermission: OC.PERMISSION_DELETE,
readPermission: OC.PERMISSION_READ,
isFolder: this.model.isFolder()
- };
+ }
},
/**
@@ -221,160 +221,160 @@
* @returns {Array}
*/
getShareeList: function() {
- var universal = this.getShareProperties();
+ var universal = this.getShareProperties()
- if(!this.model.hasUserShares()) {
- return [];
+ if (!this.model.hasUserShares()) {
+ return []
}
- var shares = this.model.get('shares');
- var list = [];
- for(var index = 0; index < shares.length; index++) {
- var share = this.getShareeObject(index);
+ var shares = this.model.get('shares')
+ var list = []
+ for (var index = 0; index < shares.length; index++) {
+ var share = this.getShareeObject(index)
if (share.shareType === OC.Share.SHARE_TYPE_LINK) {
- continue;
+ continue
}
// first empty {} is necessary, otherwise we get in trouble
// with references
- list.push(_.extend({}, universal, share));
+ list.push(_.extend({}, universal, share))
}
- return list;
+ return list
},
getLinkReshares: function() {
var universal = {
- unshareLabel: t('core', 'Unshare'),
- };
-
- if(!this.model.hasUserShares()) {
- return [];
+ unshareLabel: t('core', 'Unshare')
}
- var shares = this.model.get('shares');
- var list = [];
- for(var index = 0; index < shares.length; index++) {
- var share = this.getShareeObject(index);
+ if (!this.model.hasUserShares()) {
+ return []
+ }
+
+ var shares = this.model.get('shares')
+ var list = []
+ for (var index = 0; index < shares.length; index++) {
+ var share = this.getShareeObject(index)
if (share.shareType !== OC.Share.SHARE_TYPE_LINK) {
- continue;
+ continue
}
// first empty {} is necessary, otherwise we get in trouble
// with references
list.push(_.extend({}, universal, share, {
shareInitiator: shares[index].uid_owner,
- shareInitiatorText: t('core', '{shareInitiatorDisplayName} shared via link', {shareInitiatorDisplayName: shares[index].displayname_owner})
- }));
+ shareInitiatorText: t('core', '{shareInitiatorDisplayName} shared via link', { shareInitiatorDisplayName: shares[index].displayname_owner })
+ }))
}
- return list;
+ return list
},
render: function() {
- if(!this._renderPermissionChange) {
+ if (!this._renderPermissionChange) {
this.$el.html(this.template({
cid: this.cid,
sharees: this.getShareeList(),
linkReshares: this.getLinkReshares()
- }));
+ }))
- this.$('.avatar').each(function () {
- var $this = $(this);
+ this.$('.avatar').each(function() {
+ var $this = $(this)
if ($this.hasClass('imageplaceholderseed')) {
- $this.css({width: 32, height: 32});
+ $this.css({ width: 32, height: 32 })
if ($this.data('avatar')) {
- $this.css('border-radius', '0%');
- $this.css('background', 'url(' + $this.data('avatar') + ') no-repeat');
- $this.css('background-size', '31px');
+ $this.css('border-radius', '0%')
+ $this.css('background', 'url(' + $this.data('avatar') + ') no-repeat')
+ $this.css('background-size', '31px')
} else {
- $this.imageplaceholder($this.data('seed'));
+ $this.imageplaceholder($this.data('seed'))
}
} else {
// user, size, ie8fix, hidedefault, callback, displayname
- $this.avatar($this.data('username'), 32, undefined, undefined, undefined, $this.data('displayname'));
+ $this.avatar($this.data('username'), 32, undefined, undefined, undefined, $this.data('displayname'))
}
- });
+ })
this.$('.has-tooltip').tooltip({
placement: 'bottom'
- });
+ })
this.$('ul.shareWithList > li').each(function() {
- var $this = $(this);
+ var $this = $(this)
- var shareWith = $this.data('share-with');
- var shareType = $this.data('share-type');
+ var shareWith = $this.data('share-with')
+ var shareType = $this.data('share-type')
- $this.find('div.avatar, span.username').contactsMenu(shareWith, shareType, $this);
- });
+ $this.find('div.avatar, span.username').contactsMenu(shareWith, shareType, $this)
+ })
} else {
- var permissionChangeShareId = parseInt(this._renderPermissionChange, 10);
- var shareWithIndex = this.model.findShareWithIndex(permissionChangeShareId);
- var sharee = this.getShareeObject(shareWithIndex);
- $.extend(sharee, this.getShareProperties());
- var $li = this.$('li[data-share-id=' + permissionChangeShareId + ']');
- $li.find('.sharingOptionsGroup .popovermenu').replaceWith(this.popoverMenuTemplate(sharee));
+ var permissionChangeShareId = parseInt(this._renderPermissionChange, 10)
+ var shareWithIndex = this.model.findShareWithIndex(permissionChangeShareId)
+ var sharee = this.getShareeObject(shareWithIndex)
+ $.extend(sharee, this.getShareProperties())
+ var $li = this.$('li[data-share-id=' + permissionChangeShareId + ']')
+ $li.find('.sharingOptionsGroup .popovermenu').replaceWith(this.popoverMenuTemplate(sharee))
}
- var _this = this;
+ var _this = this
this.getShareeList().forEach(function(sharee) {
- var $edit = _this.$('#canEdit-' + _this.cid + '-' + sharee.shareId);
- if($edit.length === 1) {
- $edit.prop('checked', sharee.editPermissionState === 'checked');
+ var $edit = _this.$('#canEdit-' + _this.cid + '-' + sharee.shareId)
+ if ($edit.length === 1) {
+ $edit.prop('checked', sharee.editPermissionState === 'checked')
if (sharee.isFolder) {
- $edit.prop('indeterminate', sharee.editPermissionState === 'indeterminate');
+ $edit.prop('indeterminate', sharee.editPermissionState === 'indeterminate')
}
}
- });
+ })
this.$('.popovermenu').on('afterHide', function() {
- _this._menuOpen = false;
- });
+ _this._menuOpen = false
+ })
this.$('.popovermenu').on('beforeHide', function() {
- var shareId = parseInt(_this._menuOpen, 10);
- if(!_.isNaN(shareId)) {
- var datePickerClass = '.expirationDateContainer-' + _this.cid + '-' + shareId;
- var datePickerInput = '#expirationDatePicker-' + _this.cid + '-' + shareId;
- var expireDateCheckbox = '#expireDate-' + _this.cid + '-' + shareId;
+ var shareId = parseInt(_this._menuOpen, 10)
+ if (!_.isNaN(shareId)) {
+ var datePickerClass = '.expirationDateContainer-' + _this.cid + '-' + shareId
+ var datePickerInput = '#expirationDatePicker-' + _this.cid + '-' + shareId
+ var expireDateCheckbox = '#expireDate-' + _this.cid + '-' + shareId
if ($(expireDateCheckbox).prop('checked')) {
- $(datePickerInput).removeClass('hidden-visually');
- $(datePickerClass).removeClass('hasDatepicker');
- $(datePickerClass + ' .ui-datepicker').hide();
+ $(datePickerInput).removeClass('hidden-visually')
+ $(datePickerClass).removeClass('hasDatepicker')
+ $(datePickerClass + ' .ui-datepicker').hide()
}
}
- });
+ })
if (this._menuOpen !== false) {
// Open menu again if it was opened before
- var shareId = parseInt(this._menuOpen, 10);
- if(!_.isNaN(shareId)) {
- var liSelector = 'li[data-share-id=' + shareId + ']';
- OC.showMenu(null, this.$(liSelector + ' .sharingOptionsGroup .popovermenu'));
+ var shareId = parseInt(this._menuOpen, 10)
+ if (!_.isNaN(shareId)) {
+ var liSelector = 'li[data-share-id=' + shareId + ']'
+ OC.showMenu(null, this.$(liSelector + ' .sharingOptionsGroup .popovermenu'))
}
}
- this._renderPermissionChange = false;
+ this._renderPermissionChange = false
// new note autosize
- autosize(this.$el.find('.share-note-form .share-note'));
+ autosize(this.$el.find('.share-note-form .share-note'))
- this.delegateEvents();
+ this.delegateEvents()
- return this;
+ return this
},
/**
* @returns {Function} from Handlebars
* @private
*/
- template: function (data) {
- var sharees = data.sharees;
- if(_.isArray(sharees)) {
+ template: function(data) {
+ var sharees = data.sharees
+ if (_.isArray(sharees)) {
for (var i = 0; i < sharees.length; i++) {
- data.sharees[i].popoverMenu = this.popoverMenuTemplate(sharees[i]);
+ data.sharees[i].popoverMenu = this.popoverMenuTemplate(sharees[i])
}
}
- return OC.Share.Templates['sharedialogshareelistview'](data);
+ return OC.Share.Templates['sharedialogshareelistview'](data)
},
/**
@@ -384,235 +384,235 @@
* @returns {string}
*/
popoverMenuTemplate: function(data) {
- return OC.Share.Templates['sharedialogshareelistview_popover_menu'](data);
+ return OC.Share.Templates['sharedialogshareelistview_popover_menu'](data)
},
showNoteForm: function(event) {
- event.preventDefault();
- event.stopPropagation();
- var $element = $(event.target);
- var $menu = $element.closest('li');
- var $form = $menu.next('li.share-note-form');
+ event.preventDefault()
+ event.stopPropagation()
+ var $element = $(event.target)
+ var $menu = $element.closest('li')
+ var $form = $menu.next('li.share-note-form')
// show elements
- $menu.find('.share-note-delete').toggleClass('hidden');
- $form.toggleClass('hidden');
- $form.find('textarea').focus();
+ $menu.find('.share-note-delete').toggleClass('hidden')
+ $form.toggleClass('hidden')
+ $form.find('textarea').focus()
},
deleteNote: function(event) {
- event.preventDefault();
- event.stopPropagation();
- var self = this;
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var shareId = $li.data('share-id');
- var $menu = $element.closest('li');
- var $form = $menu.next('li.share-note-form');
+ event.preventDefault()
+ event.stopPropagation()
+ var self = this
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var shareId = $li.data('share-id')
+ var $menu = $element.closest('li')
+ var $form = $menu.next('li.share-note-form')
- console.log($form.find('.share-note'));
- $form.find('.share-note').val('');
-
- $form.addClass('hidden');
- $menu.find('.share-note-delete').addClass('hidden');
+ console.log($form.find('.share-note'))
+ $form.find('.share-note').val('')
- self.sendNote('', shareId, $menu);
+ $form.addClass('hidden')
+ $menu.find('.share-note-delete').addClass('hidden')
+
+ self.sendNote('', shareId, $menu)
},
updateNote: function(event) {
- event.preventDefault();
- event.stopPropagation();
- var self = this;
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var shareId = $li.data('share-id');
- var $form = $element.closest('li.share-note-form');
- var $menu = $form.prev('li');
- var message = $form.find('.share-note').val().trim();
+ event.preventDefault()
+ event.stopPropagation()
+ var self = this
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var shareId = $li.data('share-id')
+ var $form = $element.closest('li.share-note-form')
+ var $menu = $form.prev('li')
+ var message = $form.find('.share-note').val().trim()
if (message.length < 1) {
- return;
+ return
}
- self.sendNote(message, shareId, $menu);
+ self.sendNote(message, shareId, $menu)
},
sendNote: function(note, shareId, $menu) {
- var $form = $menu.next('li.share-note-form');
- var $submit = $form.find('input.share-note-submit');
- var $error = $form.find('input.share-note-error');
+ var $form = $menu.next('li.share-note-form')
+ var $submit = $form.find('input.share-note-submit')
+ var $error = $form.find('input.share-note-error')
- $submit.prop('disabled', true);
- $menu.find('.icon-loading-small').removeClass('hidden');
- $menu.find('.icon-edit').hide();
+ $submit.prop('disabled', true)
+ $menu.find('.icon-loading-small').removeClass('hidden')
+ $menu.find('.icon-edit').hide()
var complete = function() {
- $submit.prop('disabled', false);
- $menu.find('.icon-loading-small').addClass('hidden');
- $menu.find('.icon-edit').show();
- };
+ $submit.prop('disabled', false)
+ $menu.find('.icon-loading-small').addClass('hidden')
+ $menu.find('.icon-edit').show()
+ }
var error = function() {
- $error.show();
+ $error.show()
setTimeout(function() {
- $error.hide();
- }, 3000);
- };
+ $error.hide()
+ }, 3000)
+ }
// send data
$.ajax({
method: 'PUT',
- url: OC.linkToOCS('apps/files_sharing/api/v1/shares',2) + shareId + '?' + OC.buildQueryString({format: 'json'}),
+ url: OC.linkToOCS('apps/files_sharing/api/v1/shares', 2) + shareId + '?' + OC.buildQueryString({ format: 'json' }),
data: { note: note },
- complete : complete,
+ complete: complete,
error: error
- });
+ })
},
onUnshare: function(event) {
- event.preventDefault();
- event.stopPropagation();
- var self = this;
- var $element = $(event.target);
+ event.preventDefault()
+ event.stopPropagation()
+ var self = this
+ var $element = $(event.target)
if (!$element.is('a')) {
- $element = $element.closest('a');
+ $element = $element.closest('a')
}
- var $loading = $element.find('.icon-loading-small').eq(0);
- if(!$loading.hasClass('hidden')) {
+ var $loading = $element.find('.icon-loading-small').eq(0)
+ if (!$loading.hasClass('hidden')) {
// in process
- return false;
+ return false
}
- $loading.removeClass('hidden');
+ $loading.removeClass('hidden')
- var $li = $element.closest('li[data-share-id]');
+ var $li = $element.closest('li[data-share-id]')
- var shareId = $li.data('share-id');
+ var shareId = $li.data('share-id')
self.model.removeShare(shareId)
.done(function() {
- $li.remove();
+ $li.remove()
})
.fail(function() {
- $loading.addClass('hidden');
- OC.Notification.showTemporary(t('core', 'Could not unshare'));
- });
- return false;
+ $loading.addClass('hidden')
+ OC.Notification.showTemporary(t('core', 'Could not unshare'))
+ })
+ return false
},
onToggleMenu: function(event) {
- event.preventDefault();
- event.stopPropagation();
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var $menu = $li.find('.sharingOptionsGroup .popovermenu');
+ event.preventDefault()
+ event.stopPropagation()
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var $menu = $li.find('.sharingOptionsGroup .popovermenu')
- OC.showMenu(null, $menu);
- this._menuOpen = $li.data('share-id');
+ OC.showMenu(null, $menu)
+ this._menuOpen = $li.data('share-id')
},
onExpireDateChange: function(event) {
- var $element = $(event.target);
- var li = $element.closest('li[data-share-id]');
- var shareId = li.data('share-id');
- var datePickerClass = '.expirationDateContainer-' + this.cid + '-' + shareId;
- var datePicker = $(datePickerClass);
- var state = $element.prop('checked');
- datePicker.toggleClass('hidden', !state);
+ var $element = $(event.target)
+ var li = $element.closest('li[data-share-id]')
+ var shareId = li.data('share-id')
+ var datePickerClass = '.expirationDateContainer-' + this.cid + '-' + shareId
+ var datePicker = $(datePickerClass)
+ var state = $element.prop('checked')
+ datePicker.toggleClass('hidden', !state)
if (!state) {
// disabled, let's hide the input and
// set the expireDate to nothing
- $element.closest('li').next('li').addClass('hidden');
- this.setExpirationDate(shareId, '');
+ $element.closest('li').next('li').addClass('hidden')
+ this.setExpirationDate(shareId, '')
} else {
// enabled, show the input and the datepicker
- $element.closest('li').next('li').removeClass('hidden');
- this.showDatePicker(event);
+ $element.closest('li').next('li').removeClass('hidden')
+ this.showDatePicker(event)
}
},
showDatePicker: function(event) {
- var element = $(event.target);
- var li = element.closest('li[data-share-id]');
- var shareId = li.data('share-id');
- var expirationDatePicker = '#expirationDatePicker-' + this.cid + '-' + shareId;
- var view = this;
+ var element = $(event.target)
+ var li = element.closest('li[data-share-id]')
+ var shareId = li.data('share-id')
+ var expirationDatePicker = '#expirationDatePicker-' + this.cid + '-' + shareId
+ var view = this
$(expirationDatePicker).datepicker({
- dateFormat : 'dd-mm-yy',
- onSelect: function (expireDate) {
- view.setExpirationDate(shareId, expireDate);
+ dateFormat: 'dd-mm-yy',
+ onSelect: function(expireDate) {
+ view.setExpirationDate(shareId, expireDate)
}
- });
- $(expirationDatePicker).focus();
+ })
+ $(expirationDatePicker).focus()
},
setExpirationDate: function(shareId, expireDate) {
- this.model.updateShare(shareId, {expireDate: expireDate}, {});
+ this.model.updateShare(shareId, { expireDate: expireDate }, {})
},
onMailSharePasswordProtectChange: function(event) {
- var element = $(event.target);
- var li = element.closest('li[data-share-id]');
- var shareId = li.data('share-id');
- var passwordContainerClass = '.passwordMenu-' + this.cid + '-' + shareId;
- var passwordContainer = $(passwordContainerClass);
- var loading = this.$el.find(passwordContainerClass + ' .icon-loading-small');
- var inputClass = '#passwordField-' + this.cid + '-' + shareId;
- var passwordField = $(inputClass);
- var state = element.prop('checked');
- var passwordByTalkElement = $('#passwordByTalk-' + this.cid + '-' + shareId);
- var passwordByTalkState = passwordByTalkElement.prop('checked');
+ var element = $(event.target)
+ var li = element.closest('li[data-share-id]')
+ var shareId = li.data('share-id')
+ var passwordContainerClass = '.passwordMenu-' + this.cid + '-' + shareId
+ var passwordContainer = $(passwordContainerClass)
+ var loading = this.$el.find(passwordContainerClass + ' .icon-loading-small')
+ var inputClass = '#passwordField-' + this.cid + '-' + shareId
+ var passwordField = $(inputClass)
+ var state = element.prop('checked')
+ var passwordByTalkElement = $('#passwordByTalk-' + this.cid + '-' + shareId)
+ var passwordByTalkState = passwordByTalkElement.prop('checked')
if (!state && !passwordByTalkState) {
- this.model.updateShare(shareId, {password: '', sendPasswordByTalk: false});
- passwordField.attr('value', '');
- passwordField.removeClass('error');
- passwordField.tooltip('hide');
- loading.addClass('hidden');
- passwordField.attr('placeholder', PASSWORD_PLACEHOLDER_MESSAGE);
+ this.model.updateShare(shareId, { password: '', sendPasswordByTalk: false })
+ passwordField.attr('value', '')
+ passwordField.removeClass('error')
+ passwordField.tooltip('hide')
+ loading.addClass('hidden')
+ passwordField.attr('placeholder', PASSWORD_PLACEHOLDER_MESSAGE)
// We first need to reset the password field before we hide it
- passwordContainer.toggleClass('hidden', !state);
+ passwordContainer.toggleClass('hidden', !state)
} else if (state) {
if (passwordByTalkState) {
// Switching from sending the password by Talk to sending
// the password by mail can be done keeping the previous
// password sent by Talk.
- this.model.updateShare(shareId, {sendPasswordByTalk: false});
+ this.model.updateShare(shareId, { sendPasswordByTalk: false })
- var passwordByTalkContainerClass = '.passwordByTalkMenu-' + this.cid + '-' + shareId;
- var passwordByTalkContainer = $(passwordByTalkContainerClass);
- passwordByTalkContainer.addClass('hidden');
- passwordByTalkElement.prop('checked', false);
+ var passwordByTalkContainerClass = '.passwordByTalkMenu-' + this.cid + '-' + shareId
+ var passwordByTalkContainer = $(passwordByTalkContainerClass)
+ passwordByTalkContainer.addClass('hidden')
+ passwordByTalkElement.prop('checked', false)
}
- passwordContainer.toggleClass('hidden', !state);
- passwordField = '#passwordField-' + this.cid + '-' + shareId;
- this.$(passwordField).focus();
+ passwordContainer.toggleClass('hidden', !state)
+ passwordField = '#passwordField-' + this.cid + '-' + shareId
+ this.$(passwordField).focus()
}
},
onMailSharePasswordProtectByTalkChange: function(event) {
- var element = $(event.target);
- var li = element.closest('li[data-share-id]');
- var shareId = li.data('share-id');
- var passwordByTalkContainerClass = '.passwordByTalkMenu-' + this.cid + '-' + shareId;
- var passwordByTalkContainer = $(passwordByTalkContainerClass);
- var loading = this.$el.find(passwordByTalkContainerClass + ' .icon-loading-small');
- var inputClass = '#passwordByTalkField-' + this.cid + '-' + shareId;
- var passwordByTalkField = $(inputClass);
- var state = element.prop('checked');
- var passwordElement = $('#password-' + this.cid + '-' + shareId);
- var passwordState = passwordElement.prop('checked');
+ var element = $(event.target)
+ var li = element.closest('li[data-share-id]')
+ var shareId = li.data('share-id')
+ var passwordByTalkContainerClass = '.passwordByTalkMenu-' + this.cid + '-' + shareId
+ var passwordByTalkContainer = $(passwordByTalkContainerClass)
+ var loading = this.$el.find(passwordByTalkContainerClass + ' .icon-loading-small')
+ var inputClass = '#passwordByTalkField-' + this.cid + '-' + shareId
+ var passwordByTalkField = $(inputClass)
+ var state = element.prop('checked')
+ var passwordElement = $('#password-' + this.cid + '-' + shareId)
+ var passwordState = passwordElement.prop('checked')
if (!state) {
- this.model.updateShare(shareId, {password: '', sendPasswordByTalk: false});
- passwordByTalkField.attr('value', '');
- passwordByTalkField.removeClass('error');
- passwordByTalkField.tooltip('hide');
- loading.addClass('hidden');
- passwordByTalkField.attr('placeholder', PASSWORD_PLACEHOLDER_MESSAGE);
+ this.model.updateShare(shareId, { password: '', sendPasswordByTalk: false })
+ passwordByTalkField.attr('value', '')
+ passwordByTalkField.removeClass('error')
+ passwordByTalkField.tooltip('hide')
+ loading.addClass('hidden')
+ passwordByTalkField.attr('placeholder', PASSWORD_PLACEHOLDER_MESSAGE)
// We first need to reset the password field before we hide it
- passwordByTalkContainer.toggleClass('hidden', !state);
+ passwordByTalkContainer.toggleClass('hidden', !state)
} else if (state) {
if (passwordState) {
// Enabling sending the password by Talk requires a new
@@ -622,53 +622,52 @@
// the share is not updated until the user explicitly gives
// the new password.
- var passwordContainerClass = '.passwordMenu-' + this.cid + '-' + shareId;
- var passwordContainer = $(passwordContainerClass);
- passwordContainer.addClass('hidden');
- passwordElement.prop('checked', false);
+ var passwordContainerClass = '.passwordMenu-' + this.cid + '-' + shareId
+ var passwordContainer = $(passwordContainerClass)
+ passwordContainer.addClass('hidden')
+ passwordElement.prop('checked', false)
}
- passwordByTalkContainer.toggleClass('hidden', !state);
- passwordByTalkField = '#passwordByTalkField-' + this.cid + '-' + shareId;
- this.$(passwordByTalkField).focus();
+ passwordByTalkContainer.toggleClass('hidden', !state)
+ passwordByTalkField = '#passwordByTalkField-' + this.cid + '-' + shareId
+ this.$(passwordByTalkField).focus()
}
},
onMailSharePasswordKeyUp: function(event) {
- if(event.keyCode === 13) {
- this.onMailSharePasswordEntered(event);
+ if (event.keyCode === 13) {
+ this.onMailSharePasswordEntered(event)
}
},
onMailSharePasswordEntered: function(event) {
- var passwordField = $(event.target);
- var li = passwordField.closest('li[data-share-id]');
- var shareId = li.data('share-id');
- var passwordContainerClass = '.passwordMenu-' + this.cid + '-' + shareId;
- var passwordByTalkContainerClass = '.passwordByTalkMenu-' + this.cid + '-' + shareId;
- var sendPasswordByTalk = passwordField.attr('id').startsWith('passwordByTalk');
- var loading;
+ var passwordField = $(event.target)
+ var li = passwordField.closest('li[data-share-id]')
+ var shareId = li.data('share-id')
+ var passwordContainerClass = '.passwordMenu-' + this.cid + '-' + shareId
+ var passwordByTalkContainerClass = '.passwordByTalkMenu-' + this.cid + '-' + shareId
+ var sendPasswordByTalk = passwordField.attr('id').startsWith('passwordByTalk')
+ var loading
if (sendPasswordByTalk) {
- loading = this.$el.find(passwordByTalkContainerClass + ' .icon-loading-small');
+ loading = this.$el.find(passwordByTalkContainerClass + ' .icon-loading-small')
} else {
- loading = this.$el.find(passwordContainerClass + ' .icon-loading-small');
+ loading = this.$el.find(passwordContainerClass + ' .icon-loading-small')
}
if (!loading.hasClass('hidden')) {
// still in process
- return;
+ return
}
- passwordField.removeClass('error');
- var password = passwordField.val();
+ passwordField.removeClass('error')
+ var password = passwordField.val()
// in IE9 the password might be the placeholder due to bugs in the placeholders polyfill
- if(password === '' || password === PASSWORD_PLACEHOLDER || password === PASSWORD_PLACEHOLDER_MESSAGE) {
- return;
+ if (password === '' || password === PASSWORD_PLACEHOLDER || password === PASSWORD_PLACEHOLDER_MESSAGE) {
+ return
}
loading
.removeClass('hidden')
- .addClass('inlineblock');
-
+ .addClass('inlineblock')
this.model.updateShare(shareId, {
password: password,
@@ -676,104 +675,103 @@
}, {
error: function(model, msg) {
// destroy old tooltips
- passwordField.tooltip('destroy');
- loading.removeClass('inlineblock').addClass('hidden');
- passwordField.addClass('error');
- passwordField.attr('title', msg);
- passwordField.tooltip({placement: 'bottom', trigger: 'manual'});
- passwordField.tooltip('show');
+ passwordField.tooltip('destroy')
+ loading.removeClass('inlineblock').addClass('hidden')
+ passwordField.addClass('error')
+ passwordField.attr('title', msg)
+ passwordField.tooltip({ placement: 'bottom', trigger: 'manual' })
+ passwordField.tooltip('show')
},
success: function(model, msg) {
- passwordField.blur();
- passwordField.attr('value', '');
- passwordField.attr('placeholder', PASSWORD_PLACEHOLDER);
- loading.removeClass('inlineblock').addClass('hidden');
+ passwordField.blur()
+ passwordField.attr('value', '')
+ passwordField.attr('placeholder', PASSWORD_PLACEHOLDER)
+ loading.removeClass('inlineblock').addClass('hidden')
}
- });
+ })
},
onPermissionChange: function(event) {
- event.preventDefault();
- event.stopPropagation();
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var shareId = $li.data('share-id');
+ event.preventDefault()
+ event.stopPropagation()
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var shareId = $li.data('share-id')
- var permissions = OC.PERMISSION_READ;
+ var permissions = OC.PERMISSION_READ
if (this.model.isFolder()) {
// adjust checkbox states
- var $checkboxes = $('.permissions', $li).not('input[name="edit"]').not('input[name="share"]');
- var checked;
+ var $checkboxes = $('.permissions', $li).not('input[name="edit"]').not('input[name="share"]')
+ var checked
if ($element.attr('name') === 'edit') {
- checked = $element.is(':checked');
+ checked = $element.is(':checked')
// Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck
- $($checkboxes).prop('checked', checked);
+ $($checkboxes).prop('checked', checked)
if (checked) {
- permissions |= OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE;
+ permissions |= OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE
}
} else {
- var numberChecked = $checkboxes.filter(':checked').length;
- checked = numberChecked === $checkboxes.length;
- var $editCb = $('input[name="edit"]', $li);
- $editCb.prop('checked', checked);
- $editCb.prop('indeterminate', !checked && numberChecked > 0);
+ var numberChecked = $checkboxes.filter(':checked').length
+ checked = numberChecked === $checkboxes.length
+ var $editCb = $('input[name="edit"]', $li)
+ $editCb.prop('checked', checked)
+ $editCb.prop('indeterminate', !checked && numberChecked > 0)
}
} else {
if ($element.attr('name') === 'edit' && $element.is(':checked')) {
- permissions |= OC.PERMISSION_UPDATE;
+ permissions |= OC.PERMISSION_UPDATE
}
}
$('.permissions', $li).not('input[name="edit"]').filter(':checked').each(function(index, checkbox) {
- permissions |= $(checkbox).data('permissions');
- });
-
+ permissions |= $(checkbox).data('permissions')
+ })
/** disable checkboxes during save operation to avoid race conditions **/
- $li.find('input[type=checkbox]').prop('disabled', true);
+ $li.find('input[type=checkbox]').prop('disabled', true)
var enableCb = function() {
- $li.find('input[type=checkbox]').prop('disabled', false);
- };
+ $li.find('input[type=checkbox]').prop('disabled', false)
+ }
var errorCb = function(elem, msg) {
- OC.dialogs.alert(msg, t('core', 'Error while sharing'));
- enableCb();
- };
+ OC.dialogs.alert(msg, t('core', 'Error while sharing'))
+ enableCb()
+ }
- this.model.updateShare(shareId, {permissions: permissions}, {error: errorCb, success: enableCb});
+ this.model.updateShare(shareId, { permissions: permissions }, { error: errorCb, success: enableCb })
- this._renderPermissionChange = shareId;
+ this._renderPermissionChange = shareId
},
onSecureDropChange: function(event) {
- event.preventDefault();
- event.stopPropagation();
- var $element = $(event.target);
- var $li = $element.closest('li[data-share-id]');
- var shareId = $li.data('share-id');
+ event.preventDefault()
+ event.stopPropagation()
+ var $element = $(event.target)
+ var $li = $element.closest('li[data-share-id]')
+ var shareId = $li.data('share-id')
- var permissions = OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE | OC.PERMISSION_READ;
+ var permissions = OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE | OC.PERMISSION_READ
if ($element.is(':checked')) {
- permissions = OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE;
+ permissions = OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE
}
/** disable checkboxes during save operation to avoid race conditions **/
- $li.find('input[type=checkbox]').prop('disabled', true);
+ $li.find('input[type=checkbox]').prop('disabled', true)
var enableCb = function() {
- $li.find('input[type=checkbox]').prop('disabled', false);
- };
+ $li.find('input[type=checkbox]').prop('disabled', false)
+ }
var errorCb = function(elem, msg) {
- OC.dialogs.alert(msg, t('core', 'Error while sharing'));
- enableCb();
- };
+ OC.dialogs.alert(msg, t('core', 'Error while sharing'))
+ enableCb()
+ }
- this.model.updateShare(shareId, {permissions: permissions}, {error: errorCb, success: enableCb});
+ this.model.updateShare(shareId, { permissions: permissions }, { error: errorCb, success: enableCb })
- this._renderPermissionChange = shareId;
+ this._renderPermissionChange = shareId
}
- });
+ })
- OC.Share.ShareDialogShareeListView = ShareDialogShareeListView;
+ OC.Share.ShareDialogShareeListView = ShareDialogShareeListView
-})();
+})()
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 2765cf43ad..9bc87a6946 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/*
* Copyright (c) 2015
*
@@ -11,8 +12,8 @@
/* globals Handlebars */
(function() {
- if(!OC.Share) {
- OC.Share = {};
+ if (!OC.Share) {
+ OC.Share = {}
}
/**
@@ -67,47 +68,47 @@
},
initialize: function(options) {
- var view = this;
+ var view = this
this.model.on('fetchError', function() {
- OC.Notification.showTemporary(t('core', 'Share details could not be loaded for this item.'));
- });
+ OC.Notification.showTemporary(t('core', 'Share details could not be loaded for this item.'))
+ })
- if(!_.isUndefined(options.configModel)) {
- this.configModel = options.configModel;
+ if (!_.isUndefined(options.configModel)) {
+ this.configModel = options.configModel
} else {
- throw 'missing OC.Share.ShareConfigModel';
+ throw 'missing OC.Share.ShareConfigModel'
}
this.configModel.on('change:isRemoteShareAllowed', function() {
- view.render();
- });
+ view.render()
+ })
this.configModel.on('change:isRemoteGroupShareAllowed', function() {
- view.render();
- });
+ view.render()
+ })
this.model.on('change:permissions', function() {
- view.render();
- });
+ view.render()
+ })
- this.model.on('request', this._onRequest, this);
- this.model.on('sync', this._onEndRequest, this);
+ this.model.on('request', this._onRequest, this)
+ this.model.on('sync', this._onEndRequest, this)
var subViewOptions = {
model: this.model,
configModel: this.configModel
- };
+ }
var subViews = {
resharerInfoView: 'ShareDialogResharerInfoView',
linkShareView: 'ShareDialogLinkShareView',
shareeListView: 'ShareDialogShareeListView'
- };
+ }
- for(var name in subViews) {
- var className = subViews[name];
+ for (var name in subViews) {
+ var className = subViews[name]
this[name] = _.isUndefined(options[name])
? new OC.Share[className](subViewOptions)
- : options[name];
+ : options[name]
}
_.bindAll(this,
@@ -115,35 +116,35 @@
'_onSelectRecipient',
'onShareWithFieldChanged',
'onShareWithFieldFocus'
- );
+ )
- OC.Plugins.attach('OC.Share.ShareDialogView', this);
+ OC.Plugins.attach('OC.Share.ShareDialogView', this)
},
onShareWithFieldChanged: function() {
- var $el = this.$el.find('.shareWithField');
+ var $el = this.$el.find('.shareWithField')
if ($el.val().length < 2) {
- $el.removeClass('error').tooltip('hide');
+ $el.removeClass('error').tooltip('hide')
}
},
/* trigger search after the field was re-selected */
onShareWithFieldFocus: function() {
- var $shareWithField = this.$el.find('.shareWithField');
- $shareWithField.autocomplete("search", $shareWithField.val());
+ var $shareWithField = this.$el.find('.shareWithField')
+ $shareWithField.autocomplete('search', $shareWithField.val())
},
_getSuggestions: function(searchTerm, perPage, model, lookup) {
- if (this._lastSuggestions &&
- this._lastSuggestions.searchTerm === searchTerm &&
- this._lastSuggestions.lookup === lookup &&
- this._lastSuggestions.perPage === perPage &&
- this._lastSuggestions.model === model) {
- return this._lastSuggestions.promise;
+ if (this._lastSuggestions
+ && this._lastSuggestions.searchTerm === searchTerm
+ && this._lastSuggestions.lookup === lookup
+ && this._lastSuggestions.perPage === perPage
+ && this._lastSuggestions.model === model) {
+ return this._lastSuggestions.promise
}
- var deferred = $.Deferred();
- var view = this;
+ var deferred = $.Deferred()
+ var view = this
$.get(
OC.linkToOCS('apps/files_sharing/api/v1') + 'sharees',
@@ -154,115 +155,115 @@
perPage: perPage,
itemType: model.get('itemType')
},
- function (result) {
+ function(result) {
if (result.ocs.meta.statuscode === 100) {
var filter = function(users, groups, remotes, remote_groups, emails, circles, rooms) {
- if (typeof(emails) === 'undefined') {
- emails = [];
+ if (typeof (emails) === 'undefined') {
+ emails = []
}
- if (typeof(circles) === 'undefined') {
- circles = [];
+ if (typeof (circles) === 'undefined') {
+ circles = []
}
- if (typeof(rooms) === 'undefined') {
- rooms = [];
+ if (typeof (rooms) === 'undefined') {
+ rooms = []
}
- var usersLength;
- var groupsLength;
- var remotesLength;
- var remoteGroupsLength;
- var emailsLength;
- var circlesLength;
- var roomsLength;
+ var usersLength
+ var groupsLength
+ var remotesLength
+ var remoteGroupsLength
+ var emailsLength
+ var circlesLength
+ var roomsLength
- var i, j;
+ var i, j
- //Filter out the current user
- usersLength = users.length;
+ // Filter out the current user
+ usersLength = users.length
for (i = 0; i < usersLength; i++) {
if (users[i].value.shareWith === OC.currentUser) {
- users.splice(i, 1);
- break;
+ users.splice(i, 1)
+ break
}
}
// Filter out the owner of the share
if (model.hasReshare()) {
- usersLength = users.length;
- for (i = 0 ; i < usersLength; i++) {
+ usersLength = users.length
+ for (i = 0; i < usersLength; i++) {
if (users[i].value.shareWith === model.getReshareOwner()) {
- users.splice(i, 1);
- break;
+ users.splice(i, 1)
+ break
}
}
}
- var shares = model.get('shares');
- var sharesLength = shares.length;
+ var shares = model.get('shares')
+ var sharesLength = shares.length
// Now filter out all sharees that are already shared with
for (i = 0; i < sharesLength; i++) {
- var share = shares[i];
+ var share = shares[i]
if (share.share_type === OC.Share.SHARE_TYPE_USER) {
- usersLength = users.length;
+ usersLength = users.length
for (j = 0; j < usersLength; j++) {
if (users[j].value.shareWith === share.share_with) {
- users.splice(j, 1);
- break;
+ users.splice(j, 1)
+ break
}
}
} else if (share.share_type === OC.Share.SHARE_TYPE_GROUP) {
- groupsLength = groups.length;
+ groupsLength = groups.length
for (j = 0; j < groupsLength; j++) {
if (groups[j].value.shareWith === share.share_with) {
- groups.splice(j, 1);
- break;
+ groups.splice(j, 1)
+ break
}
}
} else if (share.share_type === OC.Share.SHARE_TYPE_REMOTE) {
- remotesLength = remotes.length;
+ remotesLength = remotes.length
for (j = 0; j < remotesLength; j++) {
if (remotes[j].value.shareWith === share.share_with) {
- remotes.splice(j, 1);
- break;
+ remotes.splice(j, 1)
+ break
}
}
} else if (share.share_type === OC.Share.SHARE_TYPE_REMOTE_GROUP) {
- remoteGroupsLength = remote_groups.length;
+ remoteGroupsLength = remote_groups.length
for (j = 0; j < remoteGroupsLength; j++) {
if (remote_groups[j].value.shareWith === share.share_with) {
- remote_groups.splice(j, 1);
- break;
+ remote_groups.splice(j, 1)
+ break
}
}
} else if (share.share_type === OC.Share.SHARE_TYPE_EMAIL) {
- emailsLength = emails.length;
+ emailsLength = emails.length
for (j = 0; j < emailsLength; j++) {
if (emails[j].value.shareWith === share.share_with) {
- emails.splice(j, 1);
- break;
+ emails.splice(j, 1)
+ break
}
}
} else if (share.share_type === OC.Share.SHARE_TYPE_CIRCLE) {
- circlesLength = circles.length;
+ circlesLength = circles.length
for (j = 0; j < circlesLength; j++) {
if (circles[j].value.shareWith === share.share_with) {
- circles.splice(j, 1);
- break;
+ circles.splice(j, 1)
+ break
}
}
} else if (share.share_type === OC.Share.SHARE_TYPE_ROOM) {
- roomsLength = rooms.length;
+ roomsLength = rooms.length
for (j = 0; j < roomsLength; j++) {
if (rooms[j].value.shareWith === share.share_with) {
- rooms.splice(j, 1);
- break;
+ rooms.splice(j, 1)
+ break
}
}
}
}
- };
+ }
filter(
result.ocs.data.exact.users,
@@ -272,26 +273,26 @@
result.ocs.data.exact.emails,
result.ocs.data.exact.circles,
result.ocs.data.exact.rooms
- );
+ )
- var exactUsers = result.ocs.data.exact.users;
- var exactGroups = result.ocs.data.exact.groups;
- var exactRemotes = result.ocs.data.exact.remotes;
- var exactRemoteGroups = result.ocs.data.exact.remote_groups;
- var exactEmails = [];
- if (typeof(result.ocs.data.emails) !== 'undefined') {
- exactEmails = result.ocs.data.exact.emails;
+ var exactUsers = result.ocs.data.exact.users
+ var exactGroups = result.ocs.data.exact.groups
+ var exactRemotes = result.ocs.data.exact.remotes
+ var exactRemoteGroups = result.ocs.data.exact.remote_groups
+ var exactEmails = []
+ if (typeof (result.ocs.data.emails) !== 'undefined') {
+ exactEmails = result.ocs.data.exact.emails
}
- var exactCircles = [];
- if (typeof(result.ocs.data.circles) !== 'undefined') {
- exactCircles = result.ocs.data.exact.circles;
+ var exactCircles = []
+ if (typeof (result.ocs.data.circles) !== 'undefined') {
+ exactCircles = result.ocs.data.exact.circles
}
- var exactRooms = [];
- if (typeof(result.ocs.data.rooms) !== 'undefined') {
- exactRooms = result.ocs.data.exact.rooms;
+ var exactRooms = []
+ if (typeof (result.ocs.data.rooms) !== 'undefined') {
+ exactRooms = result.ocs.data.exact.rooms
}
- var exactMatches = exactUsers.concat(exactGroups).concat(exactRemotes).concat(exactRemoteGroups).concat(exactEmails).concat(exactCircles).concat(exactRooms);
+ var exactMatches = exactUsers.concat(exactGroups).concat(exactRemotes).concat(exactRemoteGroups).concat(exactEmails).concat(exactCircles).concat(exactRooms)
filter(
result.ocs.data.users,
@@ -301,66 +302,66 @@
result.ocs.data.emails,
result.ocs.data.circles,
result.ocs.data.rooms
- );
+ )
- var users = result.ocs.data.users;
- var groups = result.ocs.data.groups;
- var remotes = result.ocs.data.remotes;
- var remoteGroups = result.ocs.data.remote_groups;
- var lookup = result.ocs.data.lookup;
- var lookupEnabled = result.ocs.data.lookupEnabled;
- var emails = [];
- if (typeof(result.ocs.data.emails) !== 'undefined') {
- emails = result.ocs.data.emails;
+ var users = result.ocs.data.users
+ var groups = result.ocs.data.groups
+ var remotes = result.ocs.data.remotes
+ var remoteGroups = result.ocs.data.remote_groups
+ var lookup = result.ocs.data.lookup
+ var lookupEnabled = result.ocs.data.lookupEnabled
+ var emails = []
+ if (typeof (result.ocs.data.emails) !== 'undefined') {
+ emails = result.ocs.data.emails
}
- var circles = [];
- if (typeof(result.ocs.data.circles) !== 'undefined') {
- circles = result.ocs.data.circles;
+ var circles = []
+ if (typeof (result.ocs.data.circles) !== 'undefined') {
+ circles = result.ocs.data.circles
}
- var rooms = [];
- if (typeof(result.ocs.data.rooms) !== 'undefined') {
- rooms = result.ocs.data.rooms;
+ var rooms = []
+ if (typeof (result.ocs.data.rooms) !== 'undefined') {
+ rooms = result.ocs.data.rooms
}
- var suggestions = exactMatches.concat(users).concat(groups).concat(remotes).concat(remoteGroups).concat(emails).concat(circles).concat(rooms).concat(lookup);
+ var suggestions = exactMatches.concat(users).concat(groups).concat(remotes).concat(remoteGroups).concat(emails).concat(circles).concat(rooms).concat(lookup)
function dynamicSort(property) {
- return function (a,b) {
- var aProperty = '';
- var bProperty = '';
+ return function(a, b) {
+ var aProperty = ''
+ var bProperty = ''
if (typeof a[property] !== 'undefined') {
- aProperty = a[property];
+ aProperty = a[property]
}
if (typeof b[property] !== 'undefined') {
- bProperty = b[property];
+ bProperty = b[property]
}
- return (aProperty < bProperty) ? -1 : (aProperty > bProperty) ? 1 : 0;
+ return (aProperty < bProperty) ? -1 : (aProperty > bProperty) ? 1 : 0
}
}
/**
* Sort share entries by uuid to properly group them
*/
- var grouped = suggestions.sort(dynamicSort('uuid'));
+ var grouped = suggestions.sort(dynamicSort('uuid'))
- var previousUuid = null;
- var groupedLength = grouped.length;
- var result = [];
+ var previousUuid = null
+ var groupedLength = grouped.length
+ var result = []
/**
* build the result array that only contains all contact entries from
* merged contacts, if the search term matches its contact name
*/
for (var i = 0; i < groupedLength; i++) {
if (typeof grouped[i].uuid !== 'undefined' && grouped[i].uuid === previousUuid) {
- grouped[i].merged = true;
+ grouped[i].merged = true
}
if (searchTerm === grouped[i].name || typeof grouped[i].merged === 'undefined') {
- result.push(grouped[i]);
+ result.push(grouped[i])
}
- previousUuid = grouped[i].uuid;
+ previousUuid = grouped[i].uuid
}
- var moreResultsAvailable =
- (
+ var moreResultsAvailable
+ = (
OC.config['sharing.maxAutocompleteResults'] > 0
&& Math.min(perPage, OC.config['sharing.maxAutocompleteResults'])
<= Math.max(
@@ -373,7 +374,7 @@
rooms.length + exactRooms.length,
lookup.length
)
- );
+ )
if (!view._lookup && lookupEnabled) {
result.push(
{
@@ -384,14 +385,14 @@
)
}
- deferred.resolve(result, exactMatches, moreResultsAvailable, lookupEnabled);
+ deferred.resolve(result, exactMatches, moreResultsAvailable, lookupEnabled)
} else {
- deferred.reject(result.ocs.meta.message);
+ deferred.reject(result.ocs.meta.message)
}
}
).fail(function() {
- deferred.reject();
- });
+ deferred.reject()
+ })
this._lastSuggestions = {
searchTerm: searchTerm,
@@ -399,18 +400,18 @@
perPage: perPage,
model: model,
promise: deferred.promise()
- };
+ }
- return this._lastSuggestions.promise;
+ return this._lastSuggestions.promise
},
_getRecommendations: function(model) {
- if (this._lastRecommendations &&
- this._lastRecommendations.model === model) {
- return this._lastRecommendations.promise;
+ if (this._lastRecommendations
+ && this._lastRecommendations.model === model) {
+ return this._lastRecommendations.promise
}
- var deferred = $.Deferred();
+ var deferred = $.Deferred()
$.get(
OC.linkToOCS('apps/files_sharing/api/v1') + 'sharees_recommended',
@@ -418,115 +419,115 @@
format: 'json',
itemType: model.get('itemType')
},
- function (result) {
+ function(result) {
if (result.ocs.meta.statuscode === 100) {
var filter = function(users, groups, remotes, remote_groups, emails, circles, rooms) {
- if (typeof(emails) === 'undefined') {
- emails = [];
+ if (typeof (emails) === 'undefined') {
+ emails = []
}
- if (typeof(circles) === 'undefined') {
- circles = [];
+ if (typeof (circles) === 'undefined') {
+ circles = []
}
- if (typeof(rooms) === 'undefined') {
- rooms = [];
+ if (typeof (rooms) === 'undefined') {
+ rooms = []
}
- var usersLength;
- var groupsLength;
- var remotesLength;
- var remoteGroupsLength;
- var emailsLength;
- var circlesLength;
- var roomsLength;
+ var usersLength
+ var groupsLength
+ var remotesLength
+ var remoteGroupsLength
+ var emailsLength
+ var circlesLength
+ var roomsLength
- var i, j;
+ var i, j
- //Filter out the current user
- usersLength = users.length;
+ // Filter out the current user
+ usersLength = users.length
for (i = 0; i < usersLength; i++) {
if (users[i].value.shareWith === OC.currentUser) {
- users.splice(i, 1);
- break;
+ users.splice(i, 1)
+ break
}
}
// Filter out the owner of the share
if (model.hasReshare()) {
- usersLength = users.length;
- for (i = 0 ; i < usersLength; i++) {
+ usersLength = users.length
+ for (i = 0; i < usersLength; i++) {
if (users[i].value.shareWith === model.getReshareOwner()) {
- users.splice(i, 1);
- break;
+ users.splice(i, 1)
+ break
}
}
}
- var shares = model.get('shares');
- var sharesLength = shares.length;
+ var shares = model.get('shares')
+ var sharesLength = shares.length
// Now filter out all sharees that are already shared with
for (i = 0; i < sharesLength; i++) {
- var share = shares[i];
+ var share = shares[i]
if (share.share_type === OC.Share.SHARE_TYPE_USER) {
- usersLength = users.length;
+ usersLength = users.length
for (j = 0; j < usersLength; j++) {
if (users[j].value.shareWith === share.share_with) {
- users.splice(j, 1);
- break;
+ users.splice(j, 1)
+ break
}
}
} else if (share.share_type === OC.Share.SHARE_TYPE_GROUP) {
- groupsLength = groups.length;
+ groupsLength = groups.length
for (j = 0; j < groupsLength; j++) {
if (groups[j].value.shareWith === share.share_with) {
- groups.splice(j, 1);
- break;
+ groups.splice(j, 1)
+ break
}
}
} else if (share.share_type === OC.Share.SHARE_TYPE_REMOTE) {
- remotesLength = remotes.length;
+ remotesLength = remotes.length
for (j = 0; j < remotesLength; j++) {
if (remotes[j].value.shareWith === share.share_with) {
- remotes.splice(j, 1);
- break;
+ remotes.splice(j, 1)
+ break
}
}
} else if (share.share_type === OC.Share.SHARE_TYPE_REMOTE_GROUP) {
- remoteGroupsLength = remote_groups.length;
+ remoteGroupsLength = remote_groups.length
for (j = 0; j < remoteGroupsLength; j++) {
if (remote_groups[j].value.shareWith === share.share_with) {
- remote_groups.splice(j, 1);
- break;
+ remote_groups.splice(j, 1)
+ break
}
}
} else if (share.share_type === OC.Share.SHARE_TYPE_EMAIL) {
- emailsLength = emails.length;
+ emailsLength = emails.length
for (j = 0; j < emailsLength; j++) {
if (emails[j].value.shareWith === share.share_with) {
- emails.splice(j, 1);
- break;
+ emails.splice(j, 1)
+ break
}
}
} else if (share.share_type === OC.Share.SHARE_TYPE_CIRCLE) {
- circlesLength = circles.length;
+ circlesLength = circles.length
for (j = 0; j < circlesLength; j++) {
if (circles[j].value.shareWith === share.share_with) {
- circles.splice(j, 1);
- break;
+ circles.splice(j, 1)
+ break
}
}
} else if (share.share_type === OC.Share.SHARE_TYPE_ROOM) {
- roomsLength = rooms.length;
+ roomsLength = rooms.length
for (j = 0; j < roomsLength; j++) {
if (rooms[j].value.shareWith === share.share_with) {
- rooms.splice(j, 1);
- break;
+ rooms.splice(j, 1)
+ break
}
}
}
}
- };
+ }
filter(
result.ocs.data.exact.users,
@@ -536,26 +537,26 @@
result.ocs.data.exact.emails,
result.ocs.data.exact.circles,
result.ocs.data.exact.rooms
- );
+ )
- var exactUsers = result.ocs.data.exact.users;
- var exactGroups = result.ocs.data.exact.groups;
- var exactRemotes = result.ocs.data.exact.remotes || [];
- var exactRemoteGroups = result.ocs.data.exact.remote_groups || [];
- var exactEmails = [];
- if (typeof(result.ocs.data.emails) !== 'undefined') {
- exactEmails = result.ocs.data.exact.emails;
+ var exactUsers = result.ocs.data.exact.users
+ var exactGroups = result.ocs.data.exact.groups
+ var exactRemotes = result.ocs.data.exact.remotes || []
+ var exactRemoteGroups = result.ocs.data.exact.remote_groups || []
+ var exactEmails = []
+ if (typeof (result.ocs.data.emails) !== 'undefined') {
+ exactEmails = result.ocs.data.exact.emails
}
- var exactCircles = [];
- if (typeof(result.ocs.data.circles) !== 'undefined') {
- exactCircles = result.ocs.data.exact.circles;
+ var exactCircles = []
+ if (typeof (result.ocs.data.circles) !== 'undefined') {
+ exactCircles = result.ocs.data.exact.circles
}
- var exactRooms = [];
- if (typeof(result.ocs.data.rooms) !== 'undefined') {
- exactRooms = result.ocs.data.exact.rooms;
+ var exactRooms = []
+ if (typeof (result.ocs.data.rooms) !== 'undefined') {
+ exactRooms = result.ocs.data.exact.rooms
}
- var exactMatches = exactUsers.concat(exactGroups).concat(exactRemotes).concat(exactRemoteGroups).concat(exactEmails).concat(exactCircles).concat(exactRooms);
+ var exactMatches = exactUsers.concat(exactGroups).concat(exactRemotes).concat(exactRemoteGroups).concat(exactEmails).concat(exactCircles).concat(exactRooms)
filter(
result.ocs.data.users,
@@ -565,124 +566,124 @@
result.ocs.data.emails,
result.ocs.data.circles,
result.ocs.data.rooms
- );
+ )
- var users = result.ocs.data.users;
- var groups = result.ocs.data.groups;
- var remotes = result.ocs.data.remotes || [];
- var remoteGroups = result.ocs.data.remote_groups || [];
- var lookup = result.ocs.data.lookup || [];
- var emails = [];
- if (typeof(result.ocs.data.emails) !== 'undefined') {
- emails = result.ocs.data.emails;
+ var users = result.ocs.data.users
+ var groups = result.ocs.data.groups
+ var remotes = result.ocs.data.remotes || []
+ var remoteGroups = result.ocs.data.remote_groups || []
+ var lookup = result.ocs.data.lookup || []
+ var emails = []
+ if (typeof (result.ocs.data.emails) !== 'undefined') {
+ emails = result.ocs.data.emails
}
- var circles = [];
- if (typeof(result.ocs.data.circles) !== 'undefined') {
- circles = result.ocs.data.circles;
+ var circles = []
+ if (typeof (result.ocs.data.circles) !== 'undefined') {
+ circles = result.ocs.data.circles
}
- var rooms = [];
- if (typeof(result.ocs.data.rooms) !== 'undefined') {
- rooms = result.ocs.data.rooms;
+ var rooms = []
+ if (typeof (result.ocs.data.rooms) !== 'undefined') {
+ rooms = result.ocs.data.rooms
}
- var suggestions = exactMatches.concat(users).concat(groups).concat(remotes).concat(remoteGroups).concat(emails).concat(circles).concat(rooms).concat(lookup);
+ var suggestions = exactMatches.concat(users).concat(groups).concat(remotes).concat(remoteGroups).concat(emails).concat(circles).concat(rooms).concat(lookup)
function dynamicSort(property) {
- return function (a,b) {
- var aProperty = '';
- var bProperty = '';
+ return function(a, b) {
+ var aProperty = ''
+ var bProperty = ''
if (typeof a[property] !== 'undefined') {
- aProperty = a[property];
+ aProperty = a[property]
}
if (typeof b[property] !== 'undefined') {
- bProperty = b[property];
+ bProperty = b[property]
}
- return (aProperty < bProperty) ? -1 : (aProperty > bProperty) ? 1 : 0;
+ return (aProperty < bProperty) ? -1 : (aProperty > bProperty) ? 1 : 0
}
}
/**
* Sort share entries by uuid to properly group them
*/
- var grouped = suggestions.sort(dynamicSort('uuid'));
+ var grouped = suggestions.sort(dynamicSort('uuid'))
- var previousUuid = null;
- var groupedLength = grouped.length;
- var result = [];
+ var previousUuid = null
+ var groupedLength = grouped.length
+ var result = []
/**
* build the result array that only contains all contact entries from
* merged contacts, if the search term matches its contact name
*/
for (var i = 0; i < groupedLength; i++) {
if (typeof grouped[i].uuid !== 'undefined' && grouped[i].uuid === previousUuid) {
- grouped[i].merged = true;
+ grouped[i].merged = true
}
if (typeof grouped[i].merged === 'undefined') {
- result.push(grouped[i]);
+ result.push(grouped[i])
}
- previousUuid = grouped[i].uuid;
+ previousUuid = grouped[i].uuid
}
- deferred.resolve(result, exactMatches, false);
+ deferred.resolve(result, exactMatches, false)
} else {
- deferred.reject(result.ocs.meta.message);
+ deferred.reject(result.ocs.meta.message)
}
}
).fail(function() {
- deferred.reject();
- });
+ deferred.reject()
+ })
this._lastRecommendations = {
model: model,
promise: deferred.promise()
- };
+ }
- return this._lastRecommendations.promise;
+ return this._lastRecommendations.promise
},
- recommendationHandler: function (response) {
- var view = this;
- var $shareWithField = $('.shareWithField');
+ recommendationHandler: function(response) {
+ var view = this
+ var $shareWithField = $('.shareWithField')
this._getRecommendations(
view.model
).done(function(suggestions) {
- console.info('recommendations', suggestions);
+ console.info('recommendations', suggestions)
if (suggestions.length > 0) {
$shareWithField
- .autocomplete("option", "autoFocus", true);
+ .autocomplete('option', 'autoFocus', true)
- response(suggestions);
+ response(suggestions)
} else {
- console.info('no sharing recommendations found');
- response();
+ console.info('no sharing recommendations found')
+ response()
}
}).fail(function(message) {
console.error('could not load recommendations', message)
- });
+ })
},
- autocompleteHandler: function (search, response) {
+ autocompleteHandler: function(search, response) {
// If nothing is entered we show recommendations instead of search
// results
if (search.term.length === 0) {
- console.info(search.term, 'empty search term -> using recommendations');
- this.recommendationHandler(response);
- return;
+ console.info(search.term, 'empty search term -> using recommendations')
+ this.recommendationHandler(response)
+ return
}
- var $shareWithField = $('.shareWithField'),
- view = this,
- $loading = this.$el.find('.shareWithLoading'),
- $confirm = this.$el.find('.shareWithConfirm');
+ var $shareWithField = $('.shareWithField')
+ var view = this
+ var $loading = this.$el.find('.shareWithLoading')
+ var $confirm = this.$el.find('.shareWithConfirm')
- var count = OC.config['sharing.minSearchStringLength'];
+ var count = OC.config['sharing.minSearchStringLength']
if (search.term.trim().length < count) {
var title = n('core',
'At least {count} character is needed for autocompletion',
'At least {count} characters are needed for autocompletion',
count,
{ count: count }
- );
+ )
$shareWithField.addClass('error')
.attr('data-original-title', title)
.tooltip('hide')
@@ -691,50 +692,50 @@
trigger: 'manual'
})
.tooltip('fixTitle')
- .tooltip('show');
- response();
- return;
+ .tooltip('show')
+ response()
+ return
}
- $loading.removeClass('hidden');
- $loading.addClass('inlineblock');
- $confirm.addClass('hidden');
- this._pendingOperationsCount++;
+ $loading.removeClass('hidden')
+ $loading.addClass('inlineblock')
+ $confirm.addClass('hidden')
+ this._pendingOperationsCount++
$shareWithField.removeClass('error')
- .tooltip('hide');
+ .tooltip('hide')
- var perPage = parseInt(OC.config['sharing.maxAutocompleteResults'], 10) || 200;
+ var perPage = parseInt(OC.config['sharing.maxAutocompleteResults'], 10) || 200
this._getSuggestions(
search.term.trim(),
perPage,
view.model,
view._lookup
).done(function(suggestions, exactMatches, moreResultsAvailable) {
- view._pendingOperationsCount--;
+ view._pendingOperationsCount--
if (view._pendingOperationsCount === 0) {
- $loading.addClass('hidden');
- $loading.removeClass('inlineblock');
- $confirm.removeClass('hidden');
+ $loading.addClass('hidden')
+ $loading.removeClass('inlineblock')
+ $confirm.removeClass('hidden')
}
if (suggestions.length > 0) {
$shareWithField
- .autocomplete("option", "autoFocus", true);
+ .autocomplete('option', 'autoFocus', true)
- response(suggestions);
+ response(suggestions)
// show a notice that the list is truncated
// this is the case if one of the search results is at least as long as the max result config option
- if(moreResultsAvailable) {
- var message = t('core', 'This list is maybe truncated - please refine your search term to see more results.');
- $('.ui-autocomplete').append('' + message + ' ');
+ if (moreResultsAvailable) {
+ var message = t('core', 'This list is maybe truncated - please refine your search term to see more results.')
+ $('.ui-autocomplete').append('' + message + ' ')
}
} else {
- var title = t('core', 'No users or groups found for {search}', {search: $shareWithField.val()});
+ var title = t('core', 'No users or groups found for {search}', { search: $shareWithField.val() })
if (!view.configModel.get('allowGroupSharing')) {
- title = t('core', 'No users found for {search}', {search: $('.shareWithField').val()});
+ title = t('core', 'No users found for {search}', { search: $('.shareWithField').val() })
}
$shareWithField.addClass('error')
.attr('data-original-title', title)
@@ -744,197 +745,198 @@
trigger: 'manual'
})
.tooltip('fixTitle')
- .tooltip('show');
- response();
+ .tooltip('show')
+ response()
}
}).fail(function(message) {
- view._pendingOperationsCount--;
+ view._pendingOperationsCount--
if (view._pendingOperationsCount === 0) {
- $loading.addClass('hidden');
- $loading.removeClass('inlineblock');
- $confirm.removeClass('hidden');
+ $loading.addClass('hidden')
+ $loading.removeClass('inlineblock')
+ $confirm.removeClass('hidden')
}
if (message) {
- OC.Notification.showTemporary(t('core', 'An error occurred ("{message}"). Please try again', { message: message }));
+ OC.Notification.showTemporary(t('core', 'An error occurred ("{message}"). Please try again', { message: message }))
} else {
- OC.Notification.showTemporary(t('core', 'An error occurred. Please try again'));
+ OC.Notification.showTemporary(t('core', 'An error occurred. Please try again'))
}
- });
+ })
},
autocompleteRenderItem: function(ul, item) {
- var icon = 'icon-user';
- var text = escapeHTML(item.label);
- var description = '';
- var type = '';
+ var icon = 'icon-user'
+ var text = escapeHTML(item.label)
+ var description = ''
+ var type = ''
var getTranslatedType = function(type) {
switch (type) {
- case 'HOME':
- return t('core', 'Home');
- case 'WORK':
- return t('core', 'Work');
- case 'OTHER':
- return t('core', 'Other');
- default:
- return '' + type;
+ case 'HOME':
+ return t('core', 'Home')
+ case 'WORK':
+ return t('core', 'Work')
+ case 'OTHER':
+ return t('core', 'Other')
+ default:
+ return '' + type
}
- };
+ }
if (typeof item.type !== 'undefined' && item.type !== null) {
- type = getTranslatedType(item.type) + ' ';
+ type = getTranslatedType(item.type) + ' '
}
if (typeof item.name !== 'undefined') {
- text = escapeHTML(item.name);
+ text = escapeHTML(item.name)
}
if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
- icon = 'icon-contacts-dark';
+ icon = 'icon-contacts-dark'
} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
- icon = 'icon-shared';
- description += item.value.shareWith;
+ icon = 'icon-shared'
+ description += item.value.shareWith
} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE_GROUP) {
- text = t('core', '{sharee} (remote group)', { sharee: text }, undefined, { escape: false });
- icon = 'icon-shared';
- description += item.value.shareWith;
+ text = t('core', '{sharee} (remote group)', { sharee: text }, undefined, { escape: false })
+ icon = 'icon-shared'
+ description += item.value.shareWith
} else if (item.value.shareType === OC.Share.SHARE_TYPE_EMAIL) {
- icon = 'icon-mail';
- description += item.value.shareWith;
+ icon = 'icon-mail'
+ description += item.value.shareWith
} else if (item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) {
- text = t('core', '{sharee} ({type}, {owner})', {sharee: text, type: item.value.circleInfo, owner: item.value.circleOwner}, undefined, {escape: false});
- icon = 'icon-circle';
+ text = t('core', '{sharee} ({type}, {owner})', { sharee: text, type: item.value.circleInfo, owner: item.value.circleOwner }, undefined, { escape: false })
+ icon = 'icon-circle'
} else if (item.value.shareType === OC.Share.SHARE_TYPE_ROOM) {
- icon = 'icon-talk';
+ icon = 'icon-talk'
}
- var insert = $("");
+ var insert = $("")
if (item.merged) {
- insert.addClass('merged');
- text = item.value.shareWith;
- description = type;
+ insert.addClass('merged')
+ text = item.value.shareWith
+ description = type
} else if (item.lookup) {
- text = item.label;
- icon = false;
- insert.append('');
+ text = item.label
+ icon = false
+ insert.append('')
} else {
- var avatar = $("").appendTo(insert);
+ var avatar = $("").appendTo(insert)
if (item.value.shareType === OC.Share.SHARE_TYPE_USER || item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) {
- avatar.avatar(item.value.shareWith, 32, undefined, undefined, undefined, item.label);
+ avatar.avatar(item.value.shareWith, 32, undefined, undefined, undefined, item.label)
} else {
if (typeof item.uuid === 'undefined') {
- item.uuid = text;
+ item.uuid = text
}
- avatar.imageplaceholder(item.uuid, text, 32);
+ avatar.imageplaceholder(item.uuid, text, 32)
}
- description = type + description;
+ description = type + description
}
if (description !== '') {
- insert.addClass('with-description');
+ insert.addClass('with-description')
}
$("")
.html(
text.replace(
- new RegExp(this.term, "gi"),
- "$&")
+ new RegExp(this.term, 'gi'),
+ "$&")
+ '' + description + ''
)
- .appendTo(insert);
- insert.attr('title', item.value.shareWith);
+ .appendTo(insert)
+ insert.attr('title', item.value.shareWith)
if (icon) {
- insert.append('');
+ insert.append('')
}
- insert = $("")
- .append(insert);
- return $("")
+ insert = $('')
+ .append(insert)
+ return $('')
.addClass((item.value.shareType === OC.Share.SHARE_TYPE_GROUP) ? 'group' : 'user')
.append(insert)
- .appendTo(ul);
+ .appendTo(ul)
},
_onSelectRecipient: function(e, s) {
- var self = this;
+ var self = this
if (e.keyCode == 9) {
- e.preventDefault();
+ e.preventDefault()
if (typeof s.item.name !== 'undefined') {
- e.target.value = s.item.name;
+ e.target.value = s.item.name
} else {
- e.target.value = s.item.label;
+ e.target.value = s.item.label
}
setTimeout(function() {
$(e.target).attr('disabled', false)
- .autocomplete('search', $(e.target).val());
- }, 0);
- return false;
+ .autocomplete('search', $(e.target).val())
+ }, 0)
+ return false
}
if (s.item.lookup) {
// Retrigger search but with global lookup this time
- this._lookup = true;
- var $shareWithField = this.$el.find('.shareWithField');
- var val = $shareWithField.val();
+ this._lookup = true
+ var $shareWithField = this.$el.find('.shareWithField')
+ var val = $shareWithField.val()
setTimeout(function() {
- console.debug('searching again, but globally. search term: ' + val);
- $shareWithField.autocomplete("search", val);
- }, 0);
- return false;
+ console.debug('searching again, but globally. search term: ' + val)
+ $shareWithField.autocomplete('search', val)
+ }, 0)
+ return false
}
- e.preventDefault();
+ e.preventDefault()
// Ensure that the keydown handler for the input field is not
// called; otherwise it would try to add the recipient again, which
// would fail.
- e.stopImmediatePropagation();
+ e.stopImmediatePropagation()
$(e.target).attr('disabled', true)
- .val(s.item.label);
+ .val(s.item.label)
- var $loading = this.$el.find('.shareWithLoading');
- var $confirm = this.$el.find('.shareWithConfirm');
+ var $loading = this.$el.find('.shareWithLoading')
+ var $confirm = this.$el.find('.shareWithConfirm')
- $loading.removeClass('hidden');
- $loading.addClass('inlineblock');
- $confirm.addClass('hidden');
- this._pendingOperationsCount++;
+ $loading.removeClass('hidden')
+ $loading.addClass('inlineblock')
+ $confirm.addClass('hidden')
+ this._pendingOperationsCount++
- this.model.addShare(s.item.value, {success: function() {
+ this.model.addShare(s.item.value, { success: function() {
// Adding a share changes the suggestions.
- self._lastSuggestions = undefined;
+ self._lastSuggestions = undefined
$(e.target).val('')
- .attr('disabled', false);
+ .attr('disabled', false)
- self._pendingOperationsCount--;
+ self._pendingOperationsCount--
if (self._pendingOperationsCount === 0) {
- $loading.addClass('hidden');
- $loading.removeClass('inlineblock');
- $confirm.removeClass('hidden');
+ $loading.addClass('hidden')
+ $loading.removeClass('inlineblock')
+ $confirm.removeClass('hidden')
}
- }, error: function(obj, msg) {
- OC.Notification.showTemporary(msg);
+ },
+ error: function(obj, msg) {
+ OC.Notification.showTemporary(msg)
$(e.target).attr('disabled', false)
- .autocomplete('search', $(e.target).val());
+ .autocomplete('search', $(e.target).val())
- self._pendingOperationsCount--;
+ self._pendingOperationsCount--
if (self._pendingOperationsCount === 0) {
- $loading.addClass('hidden');
- $loading.removeClass('inlineblock');
- $confirm.removeClass('hidden');
+ $loading.addClass('hidden')
+ $loading.removeClass('inlineblock')
+ $confirm.removeClass('hidden')
}
- }});
+ } })
},
_confirmShare: function() {
- var self = this;
- var $shareWithField = $('.shareWithField');
- var $loading = this.$el.find('.shareWithLoading');
- var $confirm = this.$el.find('.shareWithConfirm');
+ var self = this
+ var $shareWithField = $('.shareWithField')
+ var $loading = this.$el.find('.shareWithLoading')
+ var $confirm = this.$el.find('.shareWithConfirm')
- $loading.removeClass('hidden');
- $loading.addClass('inlineblock');
- $confirm.addClass('hidden');
- this._pendingOperationsCount++;
+ $loading.removeClass('hidden')
+ $loading.addClass('inlineblock')
+ $confirm.addClass('hidden')
+ this._pendingOperationsCount++
- $shareWithField.prop('disabled', true);
+ $shareWithField.prop('disabled', true)
// Disabling the autocompletion does not clear its search timeout;
// removing the focus from the input field does, but only if the
@@ -942,22 +944,22 @@
// Thus, the field has to be disabled before disabling the
// autocompletion to prevent an old pending search result from
// appearing once the field is enabled again.
- $shareWithField.autocomplete('close');
- $shareWithField.autocomplete('disable');
+ $shareWithField.autocomplete('close')
+ $shareWithField.autocomplete('disable')
var restoreUI = function() {
- self._pendingOperationsCount--;
+ self._pendingOperationsCount--
if (self._pendingOperationsCount === 0) {
- $loading.addClass('hidden');
- $loading.removeClass('inlineblock');
- $confirm.removeClass('hidden');
+ $loading.addClass('hidden')
+ $loading.removeClass('inlineblock')
+ $confirm.removeClass('hidden')
}
- $shareWithField.prop('disabled', false);
- $shareWithField.focus();
- };
+ $shareWithField.prop('disabled', false)
+ $shareWithField.focus()
+ }
- var perPage = parseInt(OC.config['sharing.maxAutocompleteResults'], 10) || 200;
+ var perPage = parseInt(OC.config['sharing.maxAutocompleteResults'], 10) || 200
this._getSuggestions(
$shareWithField.val(),
perPage,
@@ -965,139 +967,139 @@
this._lookup
).done(function(suggestions, exactMatches) {
if (suggestions.length === 0) {
- restoreUI();
+ restoreUI()
- $shareWithField.autocomplete('enable');
+ $shareWithField.autocomplete('enable')
// There is no need to show an error message here; it will
// be automatically shown when the autocomplete is activated
// again (due to the focus on the field) and it finds no
// matches.
- return;
+ return
}
if (exactMatches.length !== 1) {
- restoreUI();
+ restoreUI()
- $shareWithField.autocomplete('enable');
+ $shareWithField.autocomplete('enable')
- return;
+ return
}
var actionSuccess = function() {
// Adding a share changes the suggestions.
- self._lastSuggestions = undefined;
+ self._lastSuggestions = undefined
- $shareWithField.val('');
+ $shareWithField.val('')
- restoreUI();
+ restoreUI()
- $shareWithField.autocomplete('enable');
- };
+ $shareWithField.autocomplete('enable')
+ }
var actionError = function(obj, msg) {
- restoreUI();
+ restoreUI()
- $shareWithField.autocomplete('enable');
+ $shareWithField.autocomplete('enable')
- OC.Notification.showTemporary(msg);
- };
+ OC.Notification.showTemporary(msg)
+ }
self.model.addShare(exactMatches[0].value, {
success: actionSuccess,
error: actionError
- });
+ })
}).fail(function(message) {
- restoreUI();
+ restoreUI()
- $shareWithField.autocomplete('enable');
+ $shareWithField.autocomplete('enable')
// There is no need to show an error message here; it will be
// automatically shown when the autocomplete is activated again
// (due to the focus on the field) and getting the suggestions
// fail.
- });
+ })
},
_toggleLoading: function(state) {
- this._loading = state;
- this.$el.find('.subView').toggleClass('hidden', state);
- this.$el.find('.loading').toggleClass('hidden', !state);
+ this._loading = state
+ this.$el.find('.subView').toggleClass('hidden', state)
+ this.$el.find('.loading').toggleClass('hidden', !state)
},
_onRequest: function() {
// only show the loading spinner for the first request (for now)
if (!this._loadingOnce) {
- this._toggleLoading(true);
+ this._toggleLoading(true)
}
},
_onEndRequest: function() {
- var self = this;
- this._toggleLoading(false);
+ var self = this
+ this._toggleLoading(false)
if (!this._loadingOnce) {
- this._loadingOnce = true;
+ this._loadingOnce = true
}
},
render: function() {
- var self = this;
- var baseTemplate = OC.Share.Templates['sharedialogview'];
+ var self = this
+ var baseTemplate = OC.Share.Templates['sharedialogview']
this.$el.html(baseTemplate({
cid: this.cid,
shareLabel: t('core', 'Share'),
sharePlaceholder: this._renderSharePlaceholderPart(),
isSharingAllowed: this.model.sharePermissionPossible()
- }));
+ }))
- var $shareField = this.$el.find('.shareWithField');
+ var $shareField = this.$el.find('.shareWithField')
if ($shareField.length) {
var shareFieldKeydownHandler = function(event) {
if (event.keyCode !== 13) {
- return true;
+ return true
}
- self._confirmShare();
+ self._confirmShare()
- return false;
- };
+ return false
+ }
$shareField.autocomplete({
minLength: 0,
delay: 750,
focus: function(event) {
- event.preventDefault();
+ event.preventDefault()
},
source: this.autocompleteHandler,
select: this._onSelectRecipient,
open: function() {
- var autocomplete = $(this).autocomplete('widget');
- var numberOfItems = autocomplete.find('li').size();
- autocomplete.removeClass('item-count-1');
- autocomplete.removeClass('item-count-2');
+ var autocomplete = $(this).autocomplete('widget')
+ var numberOfItems = autocomplete.find('li').size()
+ autocomplete.removeClass('item-count-1')
+ autocomplete.removeClass('item-count-2')
if (numberOfItems <= 2) {
- autocomplete.addClass('item-count-' + numberOfItems);
+ autocomplete.addClass('item-count-' + numberOfItems)
}
}
- }).data('ui-autocomplete')._renderItem = this.autocompleteRenderItem;
+ }).data('ui-autocomplete')._renderItem = this.autocompleteRenderItem
- $shareField.on('keydown', null, shareFieldKeydownHandler);
+ $shareField.on('keydown', null, shareFieldKeydownHandler)
}
- this.resharerInfoView.$el = this.$el.find('.resharerInfoView');
- this.resharerInfoView.render();
+ this.resharerInfoView.$el = this.$el.find('.resharerInfoView')
+ this.resharerInfoView.render()
- this.linkShareView.$el = this.$el.find('.linkShareView');
- this.linkShareView.render();
+ this.linkShareView.$el = this.$el.find('.linkShareView')
+ this.linkShareView.render()
- this.shareeListView.$el = this.$el.find('.shareeListView');
- this.shareeListView.render();
+ this.shareeListView.$el = this.$el.find('.shareeListView')
+ this.shareeListView.render()
- this.$el.find('.hasTooltip').tooltip();
+ this.$el.find('.hasTooltip').tooltip()
- return this;
+ return this
},
/**
@@ -1107,29 +1109,29 @@
* @param {bool} showLink
*/
setShowLink: function(showLink) {
- this._showLink = (typeof showLink === 'boolean') ? showLink : true;
- this.linkShareView.showLink = this._showLink;
+ this._showLink = (typeof showLink === 'boolean') ? showLink : true
+ this.linkShareView.showLink = this._showLink
},
- _renderSharePlaceholderPart: function () {
- var allowRemoteSharing = this.configModel.get('isRemoteShareAllowed');
- var allowMailSharing = this.configModel.get('isMailShareAllowed');
+ _renderSharePlaceholderPart: function() {
+ var allowRemoteSharing = this.configModel.get('isRemoteShareAllowed')
+ var allowMailSharing = this.configModel.get('isMailShareAllowed')
if (!allowRemoteSharing && allowMailSharing) {
- return t('core', 'Name or email address...');
+ return t('core', 'Name or email address...')
}
if (allowRemoteSharing && !allowMailSharing) {
- return t('core', 'Name or federated cloud ID...');
+ return t('core', 'Name or federated cloud ID...')
}
if (allowRemoteSharing && allowMailSharing) {
- return t('core', 'Name, federated cloud ID or email address...');
+ return t('core', 'Name, federated cloud ID or email address...')
}
- return t('core', 'Name...');
- },
+ return t('core', 'Name...')
+ }
- });
+ })
- OC.Share.ShareDialogView = ShareDialogView;
+ OC.Share.ShareDialogView = ShareDialogView
-})();
+})()
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 2349f19092..e86731ab1b 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/*
* Copyright (c) 2015
*
@@ -9,9 +10,9 @@
*/
(function() {
- if(!OC.Share) {
- OC.Share = {};
- OC.Share.Types = {};
+ if (!OC.Share) {
+ OC.Share = {}
+ OC.Share.Types = {}
}
/**
@@ -65,7 +66,7 @@
var SHARE_RESPONSE_INT_PROPS = [
'id', 'file_parent', 'mail_send', 'file_source', 'item_source', 'permissions',
'storage', 'share_type', 'parent', 'stime'
- ];
+ ]
/**
* @class OCA.Share.ShareItemModel
@@ -85,15 +86,15 @@
_linkShareId: null,
initialize: function(attributes, options) {
- if(!_.isUndefined(options.configModel)) {
- this.configModel = options.configModel;
+ if (!_.isUndefined(options.configModel)) {
+ this.configModel = options.configModel
}
- if(!_.isUndefined(options.fileInfoModel)) {
+ if (!_.isUndefined(options.fileInfoModel)) {
/** @type {OC.Files.FileInfo} **/
- this.fileInfoModel = options.fileInfoModel;
+ this.fileInfoModel = options.fileInfoModel
}
- _.bindAll(this, 'addShare');
+ _.bindAll(this, 'addShare')
},
defaults: {
@@ -117,26 +118,26 @@
* TODO: this should be a separate model
*/
saveLinkShare: function(attributes, options) {
- options = options || {};
- attributes = _.extend({}, attributes);
+ options = options || {}
+ attributes = _.extend({}, attributes)
- var shareId = null;
- var call;
+ var shareId = null
+ var call
// oh yeah...
if (attributes.expiration) {
- attributes.expireDate = attributes.expiration;
- delete attributes.expiration;
+ attributes.expireDate = attributes.expiration
+ delete attributes.expiration
}
- var linkShares = this.get('linkShares');
- var shareIndex = _.findIndex(linkShares, function(share) {return share.id === attributes.cid})
+ var linkShares = this.get('linkShares')
+ var shareIndex = _.findIndex(linkShares, function(share) { return share.id === attributes.cid })
if (linkShares.length > 0 && shareIndex !== -1) {
- shareId = linkShares[shareIndex].id;
+ shareId = linkShares[shareIndex].id
// note: update can only update a single value at a time
- call = this.updateShare(shareId, attributes, options);
+ call = this.updateShare(shareId, attributes, options)
} else {
attributes = _.defaults(attributes, {
hideDownload: false,
@@ -146,38 +147,38 @@
permissions: OC.PERMISSION_READ,
expireDate: this.configModel.getDefaultExpirationDateString(),
shareType: OC.Share.SHARE_TYPE_LINK
- });
+ })
- call = this.addShare(attributes, options);
+ call = this.addShare(attributes, options)
}
- return call;
+ return call
},
addShare: function(attributes, options) {
- var shareType = attributes.shareType;
- attributes = _.extend({}, attributes);
+ var shareType = attributes.shareType
+ attributes = _.extend({}, attributes)
// get default permissions
- var defaultPermissions = OC.getCapabilities()['files_sharing']['default_permissions'] || OC.PERMISSION_ALL;
- var possiblePermissions = OC.PERMISSION_READ;
+ var defaultPermissions = OC.getCapabilities()['files_sharing']['default_permissions'] || OC.PERMISSION_ALL
+ var possiblePermissions = OC.PERMISSION_READ
if (this.updatePermissionPossible()) {
- possiblePermissions = possiblePermissions | OC.PERMISSION_UPDATE;
+ possiblePermissions = possiblePermissions | OC.PERMISSION_UPDATE
}
if (this.createPermissionPossible()) {
- possiblePermissions = possiblePermissions | OC.PERMISSION_CREATE;
+ possiblePermissions = possiblePermissions | OC.PERMISSION_CREATE
}
if (this.deletePermissionPossible()) {
- possiblePermissions = possiblePermissions | OC.PERMISSION_DELETE;
+ possiblePermissions = possiblePermissions | OC.PERMISSION_DELETE
}
if (this.configModel.get('isResharingAllowed') && (this.sharePermissionPossible())) {
- possiblePermissions = possiblePermissions | OC.PERMISSION_SHARE;
+ possiblePermissions = possiblePermissions | OC.PERMISSION_SHARE
}
- attributes.permissions = defaultPermissions & possiblePermissions;
+ attributes.permissions = defaultPermissions & possiblePermissions
if (_.isUndefined(attributes.path)) {
- attributes.path = this.fileInfoModel.getFullPath();
+ attributes.path = this.fileInfoModel.getFullPath()
}
return this._addOrUpdateShare({
@@ -185,7 +186,7 @@
url: this._getUrl('shares'),
data: attributes,
dataType: 'json'
- }, options);
+ }, options)
},
updateShare: function(shareId, attrs, options) {
@@ -194,105 +195,105 @@
url: this._getUrl('shares/' + encodeURIComponent(shareId)),
data: attrs,
dataType: 'json'
- }, options);
+ }, options)
},
_addOrUpdateShare: function(ajaxSettings, options) {
- var self = this;
- options = options || {};
+ var self = this
+ options = options || {}
return $.ajax(
ajaxSettings
).always(function() {
if (_.isFunction(options.complete)) {
- options.complete(self);
+ options.complete(self)
}
}).done(function() {
self.fetch().done(function() {
if (_.isFunction(options.success)) {
- options.success(self);
+ options.success(self)
}
- });
+ })
}).fail(function(xhr) {
- var msg = t('core', 'Error');
- var result = xhr.responseJSON;
+ var msg = t('core', 'Error')
+ var result = xhr.responseJSON
if (result && result.ocs && result.ocs.meta) {
- msg = result.ocs.meta.message;
+ msg = result.ocs.meta.message
}
if (_.isFunction(options.error)) {
- options.error(self, msg);
+ options.error(self, msg)
} else {
- OC.dialogs.alert(msg, t('core', 'Error while sharing'));
+ OC.dialogs.alert(msg, t('core', 'Error while sharing'))
}
- });
+ })
},
/**
* Deletes the share with the given id
*
* @param {int} shareId share id
- * @return {jQuery}
+ * @returns {jQuery}
*/
removeShare: function(shareId, options) {
- var self = this;
- options = options || {};
+ var self = this
+ options = options || {}
return $.ajax({
type: 'DELETE',
- url: this._getUrl('shares/' + encodeURIComponent(shareId)),
+ url: this._getUrl('shares/' + encodeURIComponent(shareId))
}).done(function() {
self.fetch({
success: function() {
if (_.isFunction(options.success)) {
- options.success(self);
+ options.success(self)
}
}
- });
+ })
}).fail(function(xhr) {
- var msg = t('core', 'Error');
- var result = xhr.responseJSON;
+ var msg = t('core', 'Error')
+ var result = xhr.responseJSON
if (result.ocs && result.ocs.meta) {
- msg = result.ocs.meta.message;
+ msg = result.ocs.meta.message
}
if (_.isFunction(options.error)) {
- options.error(self, msg);
+ options.error(self, msg)
} else {
- OC.dialogs.alert(msg, t('core', 'Error removing share'));
+ OC.dialogs.alert(msg, t('core', 'Error removing share'))
}
- });
+ })
},
/**
* @returns {boolean}
*/
isPublicUploadAllowed: function() {
- return this.get('allowPublicUploadStatus');
+ return this.get('allowPublicUploadStatus')
},
isPublicEditingAllowed: function() {
- return this.get('allowPublicEditingStatus');
+ return this.get('allowPublicEditingStatus')
},
/**
* @returns {boolean}
*/
isHideFileListSet: function() {
- return this.get('hideFileListStatus');
+ return this.get('hideFileListStatus')
},
/**
* @returns {boolean}
*/
isFolder: function() {
- return this.get('itemType') === 'folder';
+ return this.get('itemType') === 'folder'
},
/**
* @returns {boolean}
*/
isFile: function() {
- return this.get('itemType') === 'file';
+ return this.get('itemType') === 'file'
},
/**
@@ -300,8 +301,8 @@
* @returns {boolean}
*/
hasReshare: function() {
- var reshare = this.get('reshare');
- return _.isObject(reshare) && !_.isUndefined(reshare.uid_owner);
+ var reshare = this.get('reshare')
+ return _.isObject(reshare) && !_.isUndefined(reshare.uid_owner)
},
/**
@@ -309,85 +310,85 @@
* @returns {boolean}
*/
hasUserShares: function() {
- return this.getSharesWithCurrentItem().length > 0;
+ return this.getSharesWithCurrentItem().length > 0
},
/**
* Returns whether this item has link shares
*
- * @return {bool} true if a link share exists, false otherwise
+ * @returns {bool} true if a link share exists, false otherwise
*/
hasLinkShares: function() {
- var linkShares = this.get('linkShares');
+ var linkShares = this.get('linkShares')
if (linkShares && linkShares.length > 0) {
- return true;
+ return true
}
- return false;
+ return false
},
/**
* @returns {string}
*/
getReshareOwner: function() {
- return this.get('reshare').uid_owner;
+ return this.get('reshare').uid_owner
},
/**
* @returns {string}
*/
getReshareOwnerDisplayname: function() {
- return this.get('reshare').displayname_owner;
+ return this.get('reshare').displayname_owner
},
/**
* @returns {string}
*/
getReshareNote: function() {
- return this.get('reshare').note;
+ return this.get('reshare').note
},
/**
* @returns {string}
*/
getReshareWith: function() {
- return this.get('reshare').share_with;
+ return this.get('reshare').share_with
},
/**
* @returns {string}
*/
getReshareWithDisplayName: function() {
- var reshare = this.get('reshare');
- return reshare.share_with_displayname || reshare.share_with;
+ var reshare = this.get('reshare')
+ return reshare.share_with_displayname || reshare.share_with
},
/**
* @returns {number}
*/
getReshareType: function() {
- return this.get('reshare').share_type;
+ return this.get('reshare').share_type
},
getExpireDate: function(shareIndex) {
- return this._shareExpireDate(shareIndex);
+ return this._shareExpireDate(shareIndex)
},
getNote: function(shareIndex) {
- return this._shareNote(shareIndex);
+ return this._shareNote(shareIndex)
},
/**
* Returns all share entries that only apply to the current item
* (file/folder)
*
- * @return {Array.}
+ * @returns {Array.}
*/
getSharesWithCurrentItem: function() {
- var shares = this.get('shares') || [];
- var fileId = this.fileInfoModel.get('id');
+ var shares = this.get('shares') || []
+ var fileId = this.fileInfoModel.get('id')
return _.filter(shares, function(share) {
- return share.item_source === fileId;
- });
+ return share.item_source === fileId
+ })
},
/**
@@ -396,11 +397,11 @@
*/
getShareWith: function(shareIndex) {
/** @type OC.Share.Types.ShareInfo **/
- var share = this.get('shares')[shareIndex];
- if(!_.isObject(share)) {
- throw "Unknown Share";
+ var share = this.get('shares')[shareIndex]
+ if (!_.isObject(share)) {
+ throw 'Unknown Share'
}
- return share.share_with;
+ return share.share_with
},
/**
@@ -409,25 +410,24 @@
*/
getShareWithDisplayName: function(shareIndex) {
/** @type OC.Share.Types.ShareInfo **/
- var share = this.get('shares')[shareIndex];
- if(!_.isObject(share)) {
- throw "Unknown Share";
+ var share = this.get('shares')[shareIndex]
+ if (!_.isObject(share)) {
+ throw 'Unknown Share'
}
- return share.share_with_displayname;
+ return share.share_with_displayname
},
-
/**
* @param shareIndex
* @returns {string}
*/
getShareWithAvatar: function(shareIndex) {
/** @type OC.Share.Types.ShareInfo **/
- var share = this.get('shares')[shareIndex];
- if(!_.isObject(share)) {
- throw "Unknown Share";
+ var share = this.get('shares')[shareIndex]
+ if (!_.isObject(share)) {
+ throw 'Unknown Share'
}
- return share.share_with_avatar;
+ return share.share_with_avatar
},
/**
@@ -436,11 +436,11 @@
*/
getSharedBy: function(shareIndex) {
/** @type OC.Share.Types.ShareInfo **/
- var share = this.get('shares')[shareIndex];
- if(!_.isObject(share)) {
- throw "Unknown Share";
+ var share = this.get('shares')[shareIndex]
+ if (!_.isObject(share)) {
+ throw 'Unknown Share'
}
- return share.uid_owner;
+ return share.uid_owner
},
/**
@@ -449,11 +449,11 @@
*/
getSharedByDisplayName: function(shareIndex) {
/** @type OC.Share.Types.ShareInfo **/
- var share = this.get('shares')[shareIndex];
- if(!_.isObject(share)) {
- throw "Unknown Share";
+ var share = this.get('shares')[shareIndex]
+ if (!_.isObject(share)) {
+ throw 'Unknown Share'
}
- return share.displayname_owner;
+ return share.displayname_owner
},
/**
@@ -462,11 +462,11 @@
*/
getFileOwnerUid: function(shareIndex) {
/** @type OC.Share.Types.ShareInfo **/
- var share = this.get('shares')[shareIndex];
- if(!_.isObject(share)) {
- throw "Unknown Share";
+ var share = this.get('shares')[shareIndex]
+ if (!_.isObject(share)) {
+ throw 'Unknown Share'
}
- return share.uid_file_owner;
+ return share.uid_file_owner
},
/**
@@ -476,26 +476,26 @@
* @returns {number}
*/
findShareWithIndex: function(shareId) {
- var shares = this.get('shares');
- if(!_.isArray(shares)) {
- throw "Unknown Share";
+ var shares = this.get('shares')
+ if (!_.isArray(shares)) {
+ throw 'Unknown Share'
}
- for(var i = 0; i < shares.length; i++) {
- var shareWith = shares[i];
- if(shareWith.id === shareId) {
- return i;
+ for (var i = 0; i < shares.length; i++) {
+ var shareWith = shares[i]
+ if (shareWith.id === shareId) {
+ return i
}
}
- throw "Unknown Sharee";
+ throw 'Unknown Sharee'
},
getShareType: function(shareIndex) {
/** @type OC.Share.Types.ShareInfo **/
- var share = this.get('shares')[shareIndex];
- if(!_.isObject(share)) {
- throw "Unknown Share";
+ var share = this.get('shares')[shareIndex]
+ if (!_.isObject(share)) {
+ throw 'Unknown Share'
}
- return share.share_type;
+ return share.share_type
},
/**
@@ -508,44 +508,42 @@
*/
_shareHasPermission: function(shareIndex, permission) {
/** @type OC.Share.Types.ShareInfo **/
- var share = this.get('shares')[shareIndex];
- if(!_.isObject(share)) {
- throw "Unknown Share";
+ var share = this.get('shares')[shareIndex]
+ if (!_.isObject(share)) {
+ throw 'Unknown Share'
}
- return (share.permissions & permission) === permission;
+ return (share.permissions & permission) === permission
},
-
_shareExpireDate: function(shareIndex) {
- var share = this.get('shares')[shareIndex];
- if(!_.isObject(share)) {
- throw "Unknown Share";
+ var share = this.get('shares')[shareIndex]
+ if (!_.isObject(share)) {
+ throw 'Unknown Share'
}
- var date2 = share.expiration;
- return date2;
+ var date2 = share.expiration
+ return date2
},
-
_shareNote: function(shareIndex) {
- var share = this.get('shares')[shareIndex];
- if(!_.isObject(share)) {
- throw "Unknown Share";
+ var share = this.get('shares')[shareIndex]
+ if (!_.isObject(share)) {
+ throw 'Unknown Share'
}
- return share.note;
+ return share.note
},
/**
- * @return {int}
+ * @returns {int}
*/
getPermissions: function() {
- return this.get('permissions');
+ return this.get('permissions')
},
/**
* @returns {boolean}
*/
sharePermissionPossible: function() {
- return (this.get('permissions') & OC.PERMISSION_SHARE) === OC.PERMISSION_SHARE;
+ return (this.get('permissions') & OC.PERMISSION_SHARE) === OC.PERMISSION_SHARE
},
/**
@@ -553,14 +551,14 @@
* @returns {boolean}
*/
hasSharePermission: function(shareIndex) {
- return this._shareHasPermission(shareIndex, OC.PERMISSION_SHARE);
+ return this._shareHasPermission(shareIndex, OC.PERMISSION_SHARE)
},
/**
* @returns {boolean}
*/
createPermissionPossible: function() {
- return (this.get('permissions') & OC.PERMISSION_CREATE) === OC.PERMISSION_CREATE;
+ return (this.get('permissions') & OC.PERMISSION_CREATE) === OC.PERMISSION_CREATE
},
/**
@@ -568,14 +566,14 @@
* @returns {boolean}
*/
hasCreatePermission: function(shareIndex) {
- return this._shareHasPermission(shareIndex, OC.PERMISSION_CREATE);
+ return this._shareHasPermission(shareIndex, OC.PERMISSION_CREATE)
},
/**
* @returns {boolean}
*/
updatePermissionPossible: function() {
- return (this.get('permissions') & OC.PERMISSION_UPDATE) === OC.PERMISSION_UPDATE;
+ return (this.get('permissions') & OC.PERMISSION_UPDATE) === OC.PERMISSION_UPDATE
},
/**
@@ -583,14 +581,14 @@
* @returns {boolean}
*/
hasUpdatePermission: function(shareIndex) {
- return this._shareHasPermission(shareIndex, OC.PERMISSION_UPDATE);
+ return this._shareHasPermission(shareIndex, OC.PERMISSION_UPDATE)
},
/**
* @returns {boolean}
*/
deletePermissionPossible: function() {
- return (this.get('permissions') & OC.PERMISSION_DELETE) === OC.PERMISSION_DELETE;
+ return (this.get('permissions') & OC.PERMISSION_DELETE) === OC.PERMISSION_DELETE
},
/**
@@ -598,20 +596,20 @@
* @returns {boolean}
*/
hasDeletePermission: function(shareIndex) {
- return this._shareHasPermission(shareIndex, OC.PERMISSION_DELETE);
+ return this._shareHasPermission(shareIndex, OC.PERMISSION_DELETE)
},
hasReadPermission: function(shareIndex) {
- return this._shareHasPermission(shareIndex, OC.PERMISSION_READ);
+ return this._shareHasPermission(shareIndex, OC.PERMISSION_READ)
},
/**
* @returns {boolean}
*/
editPermissionPossible: function() {
- return this.createPermissionPossible()
+ return this.createPermissionPossible()
|| this.updatePermissionPossible()
- || this.deletePermissionPossible();
+ || this.deletePermissionPossible()
},
/**
@@ -623,69 +621,69 @@
* - 'indeterminate': some but not all permissions
*/
editPermissionState: function(shareIndex) {
- var hcp = this.hasCreatePermission(shareIndex);
- var hup = this.hasUpdatePermission(shareIndex);
- var hdp = this.hasDeletePermission(shareIndex);
+ var hcp = this.hasCreatePermission(shareIndex)
+ var hup = this.hasUpdatePermission(shareIndex)
+ var hdp = this.hasDeletePermission(shareIndex)
if (this.isFile()) {
if (hcp || hup || hdp) {
- return 'checked';
+ return 'checked'
}
- return '';
+ return ''
}
if (!hcp && !hup && !hdp) {
- return '';
+ return ''
}
- if ( (this.createPermissionPossible() && !hcp)
+ if ((this.createPermissionPossible() && !hcp)
|| (this.updatePermissionPossible() && !hup)
- || (this.deletePermissionPossible() && !hdp) ) {
- return 'indeterminate';
+ || (this.deletePermissionPossible() && !hdp)) {
+ return 'indeterminate'
}
- return 'checked';
+ return 'checked'
},
/**
* @returns {int}
*/
linkSharePermissions: function(shareId) {
- var linkShares = this.get('linkShares');
- var shareIndex = _.findIndex(linkShares, function(share) {return share.id === shareId})
+ var linkShares = this.get('linkShares')
+ var shareIndex = _.findIndex(linkShares, function(share) { return share.id === shareId })
if (!this.hasLinkShares()) {
- return -1;
+ return -1
} else if (linkShares.length > 0 && shareIndex !== -1) {
- return linkShares[shareIndex].permissions;
+ return linkShares[shareIndex].permissions
}
- return -1;
+ return -1
},
_getUrl: function(base, params) {
- params = _.extend({format: 'json'}, params || {});
- return OC.linkToOCS('apps/files_sharing/api/v1', 2) + base + '?' + OC.buildQueryString(params);
+ params = _.extend({ format: 'json' }, params || {})
+ return OC.linkToOCS('apps/files_sharing/api/v1', 2) + base + '?' + OC.buildQueryString(params)
},
_fetchShares: function() {
- var path = this.fileInfoModel.getFullPath();
+ var path = this.fileInfoModel.getFullPath()
return $.ajax({
type: 'GET',
- url: this._getUrl('shares', {path: path, reshares: true})
- });
+ url: this._getUrl('shares', { path: path, reshares: true })
+ })
},
_fetchReshare: function() {
// only fetch original share once
if (!this._reshareFetched) {
- var path = this.fileInfoModel.getFullPath();
- this._reshareFetched = true;
+ var path = this.fileInfoModel.getFullPath()
+ this._reshareFetched = true
return $.ajax({
type: 'GET',
- url: this._getUrl('shares', {path: path, shared_with_me: true})
- });
+ url: this._getUrl('shares', { path: path, shared_with_me: true })
+ })
} else {
return $.Deferred().resolve([{
ocs: {
data: [this.get('reshare')]
}
- }]);
+ }])
}
},
@@ -695,58 +693,58 @@
* combines the permissions to be the most permissive.
*
* @param {Array} reshares
- * @return {Object} reshare
+ * @returns {Object} reshare
*/
_groupReshares: function(reshares) {
if (!reshares || !reshares.length) {
- return false;
+ return false
}
- var superShare = reshares.shift();
- var combinedPermissions = superShare.permissions;
+ var superShare = reshares.shift()
+ var combinedPermissions = superShare.permissions
_.each(reshares, function(reshare) {
// use share have higher priority than group share
if (reshare.share_type === OC.Share.SHARE_TYPE_USER && superShare.share_type === OC.Share.SHARE_TYPE_GROUP) {
- superShare = reshare;
+ superShare = reshare
}
- combinedPermissions |= reshare.permissions;
- });
+ combinedPermissions |= reshare.permissions
+ })
- superShare.permissions = combinedPermissions;
- return superShare;
+ superShare.permissions = combinedPermissions
+ return superShare
},
fetch: function(options) {
- var model = this;
- this.trigger('request', this);
+ var model = this
+ this.trigger('request', this)
var deferred = $.when(
this._fetchShares(),
this._fetchReshare()
- );
+ )
deferred.done(function(data1, data2) {
- model.trigger('sync', 'GET', this);
- var sharesMap = {};
+ model.trigger('sync', 'GET', this)
+ var sharesMap = {}
_.each(data1[0].ocs.data, function(shareItem) {
- sharesMap[shareItem.id] = shareItem;
- });
+ sharesMap[shareItem.id] = shareItem
+ })
- var reshare = false;
+ var reshare = false
if (data2[0].ocs.data.length) {
- reshare = model._groupReshares(data2[0].ocs.data);
+ reshare = model._groupReshares(data2[0].ocs.data)
}
model.set(model.parse({
shares: sharesMap,
reshare: reshare
- }));
+ }))
- if(!_.isUndefined(options) && _.isFunction(options.success)) {
- options.success();
+ if (!_.isUndefined(options) && _.isFunction(options.success)) {
+ options.success()
}
- });
+ })
- return deferred;
+ return deferred
},
/**
@@ -757,111 +755,110 @@
* in the file list.
*/
_legacyFillCurrentShares: function(shares) {
- var fileId = this.fileInfoModel.get('id');
+ var fileId = this.fileInfoModel.get('id')
if (!shares || !shares.length) {
- delete OC.Share.statuses[fileId];
- OC.Share.currentShares = {};
- OC.Share.itemShares = [];
- return;
+ delete OC.Share.statuses[fileId]
+ OC.Share.currentShares = {}
+ OC.Share.itemShares = []
+ return
}
- var currentShareStatus = OC.Share.statuses[fileId];
+ var currentShareStatus = OC.Share.statuses[fileId]
if (!currentShareStatus) {
- currentShareStatus = {link: false};
- OC.Share.statuses[fileId] = currentShareStatus;
+ currentShareStatus = { link: false }
+ OC.Share.statuses[fileId] = currentShareStatus
}
- currentShareStatus.link = false;
+ currentShareStatus.link = false
- OC.Share.currentShares = {};
- OC.Share.itemShares = [];
+ OC.Share.currentShares = {}
+ OC.Share.itemShares = []
_.each(shares,
/**
* @param {OC.Share.Types.ShareInfo} share
*/
function(share) {
if (share.share_type === OC.Share.SHARE_TYPE_LINK) {
- OC.Share.itemShares[share.share_type] = true;
- currentShareStatus.link = true;
+ OC.Share.itemShares[share.share_type] = true
+ currentShareStatus.link = true
} else {
if (!OC.Share.itemShares[share.share_type]) {
- OC.Share.itemShares[share.share_type] = [];
+ OC.Share.itemShares[share.share_type] = []
}
- OC.Share.itemShares[share.share_type].push(share.share_with);
+ OC.Share.itemShares[share.share_type].push(share.share_with)
}
}
- );
+ )
},
parse: function(data) {
- if(data === false) {
- console.warn('no data was returned');
- this.trigger('fetchError');
- return {};
+ if (data === false) {
+ console.warn('no data was returned')
+ this.trigger('fetchError')
+ return {}
}
- var permissions = this.fileInfoModel.get('permissions');
- if(!_.isUndefined(data.reshare) && !_.isUndefined(data.reshare.permissions) && data.reshare.uid_owner !== OC.currentUser) {
- permissions = permissions & data.reshare.permissions;
+ var permissions = this.fileInfoModel.get('permissions')
+ if (!_.isUndefined(data.reshare) && !_.isUndefined(data.reshare.permissions) && data.reshare.uid_owner !== OC.currentUser) {
+ permissions = permissions & data.reshare.permissions
}
- var allowPublicUploadStatus = false;
- if(!_.isUndefined(data.shares)) {
- $.each(data.shares, function (key, value) {
+ var allowPublicUploadStatus = false
+ if (!_.isUndefined(data.shares)) {
+ $.each(data.shares, function(key, value) {
if (value.share_type === OC.Share.SHARE_TYPE_LINK) {
- allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
- return true;
+ allowPublicUploadStatus = !!((value.permissions & OC.PERMISSION_CREATE))
+ return true
}
- });
+ })
}
- var allowPublicEditingStatus = true;
- if(!_.isUndefined(data.shares)) {
- $.each(data.shares, function (key, value) {
+ var allowPublicEditingStatus = true
+ if (!_.isUndefined(data.shares)) {
+ $.each(data.shares, function(key, value) {
if (value.share_type === OC.Share.SHARE_TYPE_LINK) {
- allowPublicEditingStatus = (value.permissions & OC.PERMISSION_UPDATE) ? true : false;
- return true;
+ allowPublicEditingStatus = !!((value.permissions & OC.PERMISSION_UPDATE))
+ return true
}
- });
+ })
}
-
- var hideFileListStatus = false;
- if(!_.isUndefined(data.shares)) {
- $.each(data.shares, function (key, value) {
+ var hideFileListStatus = false
+ if (!_.isUndefined(data.shares)) {
+ $.each(data.shares, function(key, value) {
if (value.share_type === OC.Share.SHARE_TYPE_LINK) {
- hideFileListStatus = (value.permissions & OC.PERMISSION_READ) ? false : true;
- return true;
+ hideFileListStatus = !((value.permissions & OC.PERMISSION_READ))
+ return true
}
- });
+ })
}
/** @type {OC.Share.Types.ShareInfo[]} **/
var shares = _.map(data.shares, function(share) {
// properly parse some values because sometimes the server
// returns integers as string...
- var i;
+ var i
for (i = 0; i < SHARE_RESPONSE_INT_PROPS.length; i++) {
- var prop = SHARE_RESPONSE_INT_PROPS[i];
+ var prop = SHARE_RESPONSE_INT_PROPS[i]
if (!_.isUndefined(share[prop])) {
- share[prop] = parseInt(share[prop], 10);
+ share[prop] = parseInt(share[prop], 10)
}
}
- return share;
- });
+ return share
+ })
- this._legacyFillCurrentShares(shares);
+ this._legacyFillCurrentShares(shares)
- var linkShares = [];
+ var linkShares = []
// filter out the share by link
shares = _.reject(shares,
/**
* @param {OC.Share.Types.ShareInfo} share
*/
function(share) {
- var isShareLink =
- share.share_type === OC.Share.SHARE_TYPE_LINK
- && ( share.file_source === this.get('itemSource')
- || share.item_source === this.get('itemSource'));
+ var isShareLink
+ = share.share_type === OC.Share.SHARE_TYPE_LINK
+ && (share.file_source === this.get('itemSource')
+ || share.item_source === this.get('itemSource'))
if (isShareLink) {
/**
@@ -869,20 +866,20 @@
* FIXME: Find a way to display properly
*/
if (share.uid_owner !== OC.currentUser) {
- return;
+ return
}
- var link = window.location.protocol + '//' + window.location.host;
+ var link = window.location.protocol + '//' + window.location.host
if (!share.token) {
// pre-token link
- var fullPath = this.fileInfoModel.get('path') + '/' +
- this.fileInfoModel.get('name');
- var location = '/' + OC.currentUser + '/files' + fullPath;
- var type = this.fileInfoModel.isDirectory() ? 'folder' : 'file';
- link += OC.linkTo('', 'public.php') + '?service=files&' +
- type + '=' + encodeURIComponent(location);
+ var fullPath = this.fileInfoModel.get('path') + '/'
+ + this.fileInfoModel.get('name')
+ var location = '/' + OC.currentUser + '/files' + fullPath
+ var type = this.fileInfoModel.isDirectory() ? 'folder' : 'file'
+ link += OC.linkTo('', 'public.php') + '?service=files&'
+ + type + '=' + encodeURIComponent(location)
} else {
- link += OC.generateUrl('/s/') + share.token;
+ link += OC.generateUrl('/s/') + share.token
}
linkShares.push(_.extend({}, share, {
// hide_download is returned as an int, so force it
@@ -890,13 +887,13 @@
hideDownload: !!share.hide_download,
password: share.share_with,
sendPasswordByTalk: share.send_password_by_talk
- }));
+ }))
- return share;
+ return share
}
},
this
- );
+ )
return {
reshare: data.reshare,
@@ -906,7 +903,7 @@
allowPublicUploadStatus: allowPublicUploadStatus,
allowPublicEditingStatus: allowPublicEditingStatus,
hideFileListStatus: hideFileListStatus
- };
+ }
},
/**
@@ -919,30 +916,30 @@
if (_.isString(time)) {
// skip empty strings and hex values
if (time === '' || (time.length > 1 && time[0] === '0' && time[1] === 'x')) {
- return null;
+ return null
}
- time = parseInt(time, 10);
- if(isNaN(time)) {
- time = null;
+ time = parseInt(time, 10)
+ if (isNaN(time)) {
+ time = null
}
}
- return time;
+ return time
},
/**
* Returns a list of share types from the existing shares.
*
- * @return {Array.} array of share types
+ * @returns {Array.} array of share types
*/
getShareTypes: function() {
- var result;
- result = _.pluck(this.getSharesWithCurrentItem(), 'share_type');
+ var result
+ result = _.pluck(this.getSharesWithCurrentItem(), 'share_type')
if (this.hasLinkShares()) {
- result.push(OC.Share.SHARE_TYPE_LINK);
+ result.push(OC.Share.SHARE_TYPE_LINK)
}
- return _.uniq(result);
+ return _.uniq(result)
}
- });
+ })
- OC.Share.ShareItemModel = ShareItemModel;
-})();
+ OC.Share.ShareItemModel = ShareItemModel
+})()
diff --git a/core/js/sharesocialmanager.js b/core/js/sharesocialmanager.js
index c0e10a4748..65fc4cd0f6 100644
--- a/core/js/sharesocialmanager.js
+++ b/core/js/sharesocialmanager.js
@@ -22,10 +22,10 @@
(function() {
if (!OC.Share) {
- OC.Share = {};
+ OC.Share = {}
}
- OC.Share.Social = {};
+ OC.Share.Social = {}
var SocialModel = OC.Backbone.Model.extend({
defaults: {
@@ -40,16 +40,15 @@
/** Open in new windows */
newWindow: true
}
- });
+ })
- OC.Share.Social.Model = SocialModel;
+ OC.Share.Social.Model = SocialModel
var SocialCollection = OC.Backbone.Collection.extend({
model: OC.Share.Social.Model,
comparator: 'key'
- });
+ })
-
- OC.Share.Social.Collection = new SocialCollection;
-})();
+ OC.Share.Social.Collection = new SocialCollection()
+})()
diff --git a/core/js/systemtags/systemtagmodel.js b/core/js/systemtags/systemtagmodel.js
index 72450a2abd..c51706944a 100644
--- a/core/js/systemtags/systemtagmodel.js
+++ b/core/js/systemtags/systemtagmodel.js
@@ -12,11 +12,11 @@
_.extend(OC.Files.Client, {
PROPERTY_FILEID: '{' + OC.Files.Client.NS_OWNCLOUD + '}id',
- PROPERTY_CAN_ASSIGN:'{' + OC.Files.Client.NS_OWNCLOUD + '}can-assign',
+ PROPERTY_CAN_ASSIGN: '{' + OC.Files.Client.NS_OWNCLOUD + '}can-assign',
PROPERTY_DISPLAYNAME: '{' + OC.Files.Client.NS_OWNCLOUD + '}display-name',
PROPERTY_USERVISIBLE: '{' + OC.Files.Client.NS_OWNCLOUD + '}user-visible',
- PROPERTY_USERASSIGNABLE:'{' + OC.Files.Client.NS_OWNCLOUD + '}user-assignable',
- });
+ PROPERTY_USERASSIGNABLE: '{' + OC.Files.Client.NS_OWNCLOUD + '}user-assignable'
+ })
/**
* @class OCA.SystemTags.SystemTagsCollection
@@ -27,34 +27,34 @@
*/
var SystemTagModel = OC.Backbone.Model.extend(
/** @lends OCA.SystemTags.SystemTagModel.prototype */ {
- sync: OC.Backbone.davSync,
+ sync: OC.Backbone.davSync,
- defaults: {
- userVisible: true,
- userAssignable: true,
- canAssign: true
- },
+ defaults: {
+ userVisible: true,
+ userAssignable: true,
+ canAssign: true
+ },
- davProperties: {
- 'id': OC.Files.Client.PROPERTY_FILEID,
- 'name': OC.Files.Client.PROPERTY_DISPLAYNAME,
- 'userVisible': OC.Files.Client.PROPERTY_USERVISIBLE,
- 'userAssignable': OC.Files.Client.PROPERTY_USERASSIGNABLE,
- // read-only, effective permissions computed by the server,
- 'canAssign': OC.Files.Client.PROPERTY_CAN_ASSIGN
- },
+ davProperties: {
+ 'id': OC.Files.Client.PROPERTY_FILEID,
+ 'name': OC.Files.Client.PROPERTY_DISPLAYNAME,
+ 'userVisible': OC.Files.Client.PROPERTY_USERVISIBLE,
+ 'userAssignable': OC.Files.Client.PROPERTY_USERASSIGNABLE,
+ // read-only, effective permissions computed by the server,
+ 'canAssign': OC.Files.Client.PROPERTY_CAN_ASSIGN
+ },
- parse: function(data) {
- return {
- id: data.id,
- name: data.name,
- userVisible: data.userVisible === true || data.userVisible === 'true',
- userAssignable: data.userAssignable === true || data.userAssignable === 'true',
- canAssign: data.canAssign === true || data.canAssign === 'true'
- };
- }
- });
+ parse: function(data) {
+ return {
+ id: data.id,
+ name: data.name,
+ userVisible: data.userVisible === true || data.userVisible === 'true',
+ userAssignable: data.userAssignable === true || data.userAssignable === 'true',
+ canAssign: data.canAssign === true || data.canAssign === 'true'
+ }
+ }
+ })
- OC.SystemTags = OC.SystemTags || {};
- OC.SystemTags.SystemTagModel = SystemTagModel;
-})(OC);
+ OC.SystemTags = OC.SystemTags || {}
+ OC.SystemTags.SystemTagModel = SystemTagModel
+})(OC)
diff --git a/core/js/systemtags/systemtags.js b/core/js/systemtags/systemtags.js
index 05ead6f3dc..3a39b55f73 100644
--- a/core/js/systemtags/systemtags.js
+++ b/core/js/systemtags/systemtags.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/*
* Copyright (c) 2016
*
@@ -16,11 +17,11 @@
/**
*
* @param {OC.SystemTags.SystemTagModel|Object|String} tag
- * @return {jQuery}
+ * @returns {jQuery}
*/
getDescriptiveTag: function(tag) {
if (_.isUndefined(tag.name) && !_.isUndefined(tag.toJSON)) {
- tag = tag.toJSON();
+ tag = tag.toJSON()
}
if (_.isUndefined(tag.name)) {
@@ -28,30 +29,29 @@
t('core', 'Non-existing tag #{tag}', {
tag: tag
})
- );
+ )
}
- var $span = $('');
- $span.append(escapeHTML(tag.name));
+ var $span = $('')
+ $span.append(escapeHTML(tag.name))
- var scope;
+ var scope
if (!tag.userAssignable) {
- scope = t('core', 'restricted');
+ scope = t('core', 'restricted')
}
if (!tag.userVisible) {
// invisible also implicitly means not assignable
- scope = t('core', 'invisible');
+ scope = t('core', 'invisible')
}
if (scope) {
- var $tag = $('').text(' ' +
- t('core', '({scope})', {
+ var $tag = $('').text(' '
+ + t('core', '({scope})', {
scope: scope
})
- );
- $span.append($tag);
+ )
+ $span.append($tag)
}
- return $span;
+ return $span
}
- };
-})(OC);
-
+ }
+})(OC)
diff --git a/core/js/systemtags/systemtagscollection.js b/core/js/systemtags/systemtagscollection.js
index 8a5d309bac..fe3f286855 100644
--- a/core/js/systemtags/systemtagscollection.js
+++ b/core/js/systemtags/systemtagscollection.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/*
* Copyright (c) 2015
*
@@ -11,7 +12,7 @@
(function(OC) {
function filterFunction(model, term) {
- return model.get('name').substr(0, term.length).toLowerCase() === term.toLowerCase();
+ return model.get('name').substr(0, term.length).toLowerCase() === term.toLowerCase()
}
/**
@@ -24,26 +25,26 @@
var SystemTagsCollection = OC.Backbone.Collection.extend(
/** @lends OC.SystemTags.SystemTagsCollection.prototype */ {
- sync: OC.Backbone.davSync,
+ sync: OC.Backbone.davSync,
- model: OC.SystemTags.SystemTagModel,
+ model: OC.SystemTags.SystemTagModel,
- url: function() {
- return OC.linkToRemote('dav') + '/systemtags/';
- },
+ url: function() {
+ return OC.linkToRemote('dav') + '/systemtags/'
+ },
- filterByName: function(name) {
- return this.filter(function(model) {
- return filterFunction(model, name);
- });
- },
+ filterByName: function(name) {
+ return this.filter(function(model) {
+ return filterFunction(model, name)
+ })
+ },
- reset: function() {
- this.fetched = false;
- return OC.Backbone.Collection.prototype.reset.apply(this, arguments);
- },
+ reset: function() {
+ this.fetched = false
+ return OC.Backbone.Collection.prototype.reset.apply(this, arguments)
+ },
- /**
+ /**
* Lazy fetch.
* Only fetches once, subsequent calls will directly call the success handler.
*
@@ -52,38 +53,37 @@
*
* @see Backbone.Collection#fetch
*/
- fetch: function(options) {
- var self = this;
- options = options || {};
- if (this.fetched || options.force) {
+ fetch: function(options) {
+ var self = this
+ options = options || {}
+ if (this.fetched || options.force) {
// directly call handler
- if (options.success) {
- options.success(this, null, options);
+ if (options.success) {
+ options.success(this, null, options)
+ }
+ // trigger sync event
+ this.trigger('sync', this, null, options)
+ return Promise.resolve()
}
- // trigger sync event
- this.trigger('sync', this, null, options);
- return Promise.resolve();
+
+ var success = options.success
+ options = _.extend({}, options)
+ options.success = function() {
+ self.fetched = true
+ if (success) {
+ return success.apply(this, arguments)
+ }
+ }
+
+ return OC.Backbone.Collection.prototype.fetch.call(this, options)
}
+ })
- var success = options.success;
- options = _.extend({}, options);
- options.success = function() {
- self.fetched = true;
- if (success) {
- return success.apply(this, arguments);
- }
- };
-
- return OC.Backbone.Collection.prototype.fetch.call(this, options);
- }
- });
-
- OC.SystemTags = OC.SystemTags || {};
- OC.SystemTags.SystemTagsCollection = SystemTagsCollection;
+ OC.SystemTags = OC.SystemTags || {}
+ OC.SystemTags.SystemTagsCollection = SystemTagsCollection
/**
* @type OC.SystemTags.SystemTagsCollection
*/
- OC.SystemTags.collection = new OC.SystemTags.SystemTagsCollection();
-})(OC);
-
+ OC.SystemTags.collection = new OC.SystemTags.SystemTagsCollection()
+})(OC)
diff --git a/core/js/systemtags/systemtagsinputfield.js b/core/js/systemtags/systemtagsinputfield.js
index 82fd659c72..6065b0e28d 100644
--- a/core/js/systemtags/systemtagsinputfield.js
+++ b/core/js/systemtags/systemtagsinputfield.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/*
* Copyright (c) 2015
*
@@ -22,19 +23,19 @@
var SystemTagsInputField = OC.Backbone.View.extend(
/** @lends OC.SystemTags.SystemTagsInputField.prototype */ {
- _rendered: false,
+ _rendered: false,
- _newTag: null,
+ _newTag: null,
- _lastUsedTags: [],
+ _lastUsedTags: [],
- className: 'systemTagsInputFieldContainer',
+ className: 'systemTagsInputFieldContainer',
- template: function(data) {
- return '';
- },
+ template: function(data) {
+ return ''
+ },
- /**
+ /**
* Creates a new SystemTagsInputField
*
* @param {Object} [options]
@@ -45,402 +46,401 @@
* @param {bool} [options.isAdmin=true] whether the user is an administrator
* @param {Function} options.initSelection function to convert selection to data
*/
- initialize: function(options) {
- options = options || {};
+ initialize: function(options) {
+ options = options || {}
- this._multiple = !!options.multiple;
- this._allowActions = _.isUndefined(options.allowActions) || !!options.allowActions;
- this._allowCreate = _.isUndefined(options.allowCreate) || !!options.allowCreate;
- this._isAdmin = !!options.isAdmin;
+ this._multiple = !!options.multiple
+ this._allowActions = _.isUndefined(options.allowActions) || !!options.allowActions
+ this._allowCreate = _.isUndefined(options.allowCreate) || !!options.allowCreate
+ this._isAdmin = !!options.isAdmin
- if (_.isFunction(options.initSelection)) {
- this._initSelection = options.initSelection;
- }
-
- this.collection = options.collection || OC.SystemTags.collection;
-
- var self = this;
- this.collection.on('change:name remove', function() {
- // refresh selection
- _.defer(self._refreshSelection);
- });
-
- _.defer(_.bind(this._getLastUsedTags, this));
-
- _.bindAll(
- this,
- '_refreshSelection',
- '_onClickRenameTag',
- '_onClickDeleteTag',
- '_onSelectTag',
- '_onDeselectTag',
- '_onSubmitRenameTag'
- );
- },
-
- _getLastUsedTags: function() {
- var self = this;
- $.ajax({
- type: 'GET',
- url: OC.generateUrl('/apps/systemtags/lastused'),
- success: function (response) {
- self._lastUsedTags = response;
+ if (_.isFunction(options.initSelection)) {
+ this._initSelection = options.initSelection
}
- });
- },
- /**
+ this.collection = options.collection || OC.SystemTags.collection
+
+ var self = this
+ this.collection.on('change:name remove', function() {
+ // refresh selection
+ _.defer(self._refreshSelection)
+ })
+
+ _.defer(_.bind(this._getLastUsedTags, this))
+
+ _.bindAll(
+ this,
+ '_refreshSelection',
+ '_onClickRenameTag',
+ '_onClickDeleteTag',
+ '_onSelectTag',
+ '_onDeselectTag',
+ '_onSubmitRenameTag'
+ )
+ },
+
+ _getLastUsedTags: function() {
+ var self = this
+ $.ajax({
+ type: 'GET',
+ url: OC.generateUrl('/apps/systemtags/lastused'),
+ success: function(response) {
+ self._lastUsedTags = response
+ }
+ })
+ },
+
+ /**
* Refreshes the selection, triggering a call to
* select2's initSelection
*/
- _refreshSelection: function() {
- this.$tagsField.select2('val', this.$tagsField.val());
- },
+ _refreshSelection: function() {
+ this.$tagsField.select2('val', this.$tagsField.val())
+ },
- /**
+ /**
* Event handler whenever the user clicked the "rename" action.
* This will display the rename field.
*/
- _onClickRenameTag: function(ev) {
- var $item = $(ev.target).closest('.systemtags-item');
- var tagId = $item.attr('data-id');
- var tagModel = this.collection.get(tagId);
+ _onClickRenameTag: function(ev) {
+ var $item = $(ev.target).closest('.systemtags-item')
+ var tagId = $item.attr('data-id')
+ var tagModel = this.collection.get(tagId)
- var oldName = tagModel.get('name');
- var $renameForm = $(OC.SystemTags.Templates['result_form']({
- cid: this.cid,
- name: oldName,
- deleteTooltip: t('core', 'Delete'),
- renameLabel: t('core', 'Rename'),
- isAdmin: this._isAdmin
- }));
- $item.find('.label').after($renameForm);
- $item.find('.label, .systemtags-actions').addClass('hidden');
- $item.closest('.select2-result').addClass('has-form');
+ var oldName = tagModel.get('name')
+ var $renameForm = $(OC.SystemTags.Templates['result_form']({
+ cid: this.cid,
+ name: oldName,
+ deleteTooltip: t('core', 'Delete'),
+ renameLabel: t('core', 'Rename'),
+ isAdmin: this._isAdmin
+ }))
+ $item.find('.label').after($renameForm)
+ $item.find('.label, .systemtags-actions').addClass('hidden')
+ $item.closest('.select2-result').addClass('has-form')
- $renameForm.find('[title]').tooltip({
- placement: 'bottom',
- container: 'body'
- });
- $renameForm.find('input').focus().selectRange(0, oldName.length);
- return false;
- },
+ $renameForm.find('[title]').tooltip({
+ placement: 'bottom',
+ container: 'body'
+ })
+ $renameForm.find('input').focus().selectRange(0, oldName.length)
+ return false
+ },
- /**
+ /**
* Event handler whenever the rename form has been submitted after
* the user entered a new tag name.
- * This will submit the change to the server.
+ * This will submit the change to the server.
*
* @param {Object} ev event
*/
- _onSubmitRenameTag: function(ev) {
- ev.preventDefault();
- var $form = $(ev.target);
- var $item = $form.closest('.systemtags-item');
- var tagId = $item.attr('data-id');
- var tagModel = this.collection.get(tagId);
- var newName = $(ev.target).find('input').val().trim();
- if (newName && newName !== tagModel.get('name')) {
- tagModel.save({'name': newName});
- // TODO: spinner, and only change text after finished saving
- $item.find('.label').text(newName);
- }
- $item.find('.label, .systemtags-actions').removeClass('hidden');
- $form.remove();
- $item.closest('.select2-result').removeClass('has-form');
- },
+ _onSubmitRenameTag: function(ev) {
+ ev.preventDefault()
+ var $form = $(ev.target)
+ var $item = $form.closest('.systemtags-item')
+ var tagId = $item.attr('data-id')
+ var tagModel = this.collection.get(tagId)
+ var newName = $(ev.target).find('input').val().trim()
+ if (newName && newName !== tagModel.get('name')) {
+ tagModel.save({ 'name': newName })
+ // TODO: spinner, and only change text after finished saving
+ $item.find('.label').text(newName)
+ }
+ $item.find('.label, .systemtags-actions').removeClass('hidden')
+ $form.remove()
+ $item.closest('.select2-result').removeClass('has-form')
+ },
- /**
+ /**
* Event handler whenever a tag must be deleted
*
* @param {Object} ev event
*/
- _onClickDeleteTag: function(ev) {
- var $item = $(ev.target).closest('.systemtags-item');
- var tagId = $item.attr('data-id');
- this.collection.get(tagId).destroy();
- $(ev.target).tooltip('hide');
- $item.closest('.select2-result').remove();
- // TODO: spinner
- return false;
- },
+ _onClickDeleteTag: function(ev) {
+ var $item = $(ev.target).closest('.systemtags-item')
+ var tagId = $item.attr('data-id')
+ this.collection.get(tagId).destroy()
+ $(ev.target).tooltip('hide')
+ $item.closest('.select2-result').remove()
+ // TODO: spinner
+ return false
+ },
- _addToSelect2Selection: function(selection) {
- var data = this.$tagsField.select2('data');
- data.push(selection);
- this.$tagsField.select2('data', data);
- },
+ _addToSelect2Selection: function(selection) {
+ var data = this.$tagsField.select2('data')
+ data.push(selection)
+ this.$tagsField.select2('data', data)
+ },
- /**
+ /**
* Event handler whenever a tag is selected.
* Also called whenever tag creation is requested through the dummy tag object.
*
* @param {Object} e event
*/
- _onSelectTag: function(e) {
- var self = this;
- var tag;
- if (e.object && e.object.isNew) {
+ _onSelectTag: function(e) {
+ var self = this
+ var tag
+ if (e.object && e.object.isNew) {
// newly created tag, check if existing
// create a new tag
- tag = this.collection.create({
- name: e.object.name.trim(),
- userVisible: true,
- userAssignable: true,
- canAssign: true
- }, {
- success: function(model) {
- self._addToSelect2Selection(model.toJSON());
- self._lastUsedTags.unshift(model.id);
- self.trigger('select', model);
- },
- error: function(model, xhr) {
- if (xhr.status === 409) {
+ tag = this.collection.create({
+ name: e.object.name.trim(),
+ userVisible: true,
+ userAssignable: true,
+ canAssign: true
+ }, {
+ success: function(model) {
+ self._addToSelect2Selection(model.toJSON())
+ self._lastUsedTags.unshift(model.id)
+ self.trigger('select', model)
+ },
+ error: function(model, xhr) {
+ if (xhr.status === 409) {
// re-fetch collection to get the missing tag
- self.collection.reset();
- self.collection.fetch({
- success: function(collection) {
+ self.collection.reset()
+ self.collection.fetch({
+ success: function(collection) {
// find the tag in the collection
- var model = collection.where({
- name: e.object.name.trim(),
- userVisible: true,
- userAssignable: true
- });
- if (model.length) {
- model = model[0];
- // the tag already exists or was already assigned,
- // add it to the list anyway
- self._addToSelect2Selection(model.toJSON());
- self.trigger('select', model);
+ var model = collection.where({
+ name: e.object.name.trim(),
+ userVisible: true,
+ userAssignable: true
+ })
+ if (model.length) {
+ model = model[0]
+ // the tag already exists or was already assigned,
+ // add it to the list anyway
+ self._addToSelect2Selection(model.toJSON())
+ self.trigger('select', model)
+ }
}
- }
- });
+ })
+ }
}
- }
- });
- this.$tagsField.select2('close');
- e.preventDefault();
- return false;
- } else {
- tag = this.collection.get(e.object.id);
- this._lastUsedTags.unshift(tag.id);
- }
- this._newTag = null;
- this.trigger('select', tag);
- },
+ })
+ this.$tagsField.select2('close')
+ e.preventDefault()
+ return false
+ } else {
+ tag = this.collection.get(e.object.id)
+ this._lastUsedTags.unshift(tag.id)
+ }
+ this._newTag = null
+ this.trigger('select', tag)
+ },
- /**
+ /**
* Event handler whenever a tag gets deselected.
*
* @param {Object} e event
*/
- _onDeselectTag: function(e) {
- this.trigger('deselect', e.choice.id);
- },
+ _onDeselectTag: function(e) {
+ this.trigger('deselect', e.choice.id)
+ },
- /**
+ /**
* Autocomplete function for dropdown results
*
* @param {Object} query select2 query object
*/
- _queryTagsAutocomplete: function(query) {
- var self = this;
- this.collection.fetch({
- success: function(collection) {
- var tagModels = collection.filterByName(query.term.trim());
- if (!self._isAdmin) {
- tagModels = _.filter(tagModels, function(tagModel) {
- return tagModel.get('canAssign');
- });
+ _queryTagsAutocomplete: function(query) {
+ var self = this
+ this.collection.fetch({
+ success: function(collection) {
+ var tagModels = collection.filterByName(query.term.trim())
+ if (!self._isAdmin) {
+ tagModels = _.filter(tagModels, function(tagModel) {
+ return tagModel.get('canAssign')
+ })
+ }
+ query.callback({
+ results: _.invoke(tagModels, 'toJSON')
+ })
}
- query.callback({
- results: _.invoke(tagModels, 'toJSON')
- });
- }
- });
- },
+ })
+ },
- _preventDefault: function(e) {
- e.stopPropagation();
- },
+ _preventDefault: function(e) {
+ e.stopPropagation()
+ },
- /**
+ /**
* Formats a single dropdown result
*
* @param {Object} data data to format
- * @return {string} HTML markup
+ * @returns {string} HTML markup
*/
- _formatDropDownResult: function(data) {
- return OC.SystemTags.Templates['result'](_.extend({
- renameTooltip: t('core', 'Rename'),
- allowActions: this._allowActions,
- tagMarkup: this._isAdmin ? OC.SystemTags.getDescriptiveTag(data)[0].innerHTML : null,
- isAdmin: this._isAdmin
- }, data));
- },
+ _formatDropDownResult: function(data) {
+ return OC.SystemTags.Templates['result'](_.extend({
+ renameTooltip: t('core', 'Rename'),
+ allowActions: this._allowActions,
+ tagMarkup: this._isAdmin ? OC.SystemTags.getDescriptiveTag(data)[0].innerHTML : null,
+ isAdmin: this._isAdmin
+ }, data))
+ },
- /**
+ /**
* Formats a single selection item
*
* @param {Object} data data to format
- * @return {string} HTML markup
+ * @returns {string} HTML markup
*/
- _formatSelection: function(data) {
- return OC.SystemTags.Templates['selection'](_.extend({
- tagMarkup: this._isAdmin ? OC.SystemTags.getDescriptiveTag(data)[0].innerHTML : null,
- isAdmin: this._isAdmin
- }, data));
- },
+ _formatSelection: function(data) {
+ return OC.SystemTags.Templates['selection'](_.extend({
+ tagMarkup: this._isAdmin ? OC.SystemTags.getDescriptiveTag(data)[0].innerHTML : null,
+ isAdmin: this._isAdmin
+ }, data))
+ },
- /**
+ /**
* Create new dummy choice for select2 when the user
* types an arbitrary string
*
* @param {string} term entered term
- * @return {Object} dummy tag
+ * @returns {Object} dummy tag
*/
- _createSearchChoice: function(term) {
- term = term.trim();
- if (this.collection.filter(function(entry) {
- return entry.get('name') === term;
+ _createSearchChoice: function(term) {
+ term = term.trim()
+ if (this.collection.filter(function(entry) {
+ return entry.get('name') === term
}).length) {
- return;
- }
- if (!this._newTag) {
- this._newTag = {
- id: -1,
- name: term,
- userAssignable: true,
- userVisible: true,
- canAssign: true,
- isNew: true
- };
- } else {
- this._newTag.name = term;
- }
+ return
+ }
+ if (!this._newTag) {
+ this._newTag = {
+ id: -1,
+ name: term,
+ userAssignable: true,
+ userVisible: true,
+ canAssign: true,
+ isNew: true
+ }
+ } else {
+ this._newTag.name = term
+ }
- return this._newTag;
- },
+ return this._newTag
+ },
- _initSelection: function(element, callback) {
- var self = this;
- var ids = $(element).val().split(',');
+ _initSelection: function(element, callback) {
+ var self = this
+ var ids = $(element).val().split(',')
- function modelToSelection(model) {
- var data = model.toJSON();
- if (!self._isAdmin && !data.canAssign) {
+ function modelToSelection(model) {
+ var data = model.toJSON()
+ if (!self._isAdmin && !data.canAssign) {
// lock static tags for non-admins
- data.locked = true;
+ data.locked = true
+ }
+ return data
}
- return data;
- }
- function findSelectedObjects(ids) {
- var selectedModels = self.collection.filter(function(model) {
- return ids.indexOf(model.id) >= 0 && (self._isAdmin || model.get('userVisible'));
- });
- return _.map(selectedModels, modelToSelection);
- }
-
- this.collection.fetch({
- success: function() {
- callback(findSelectedObjects(ids));
+ function findSelectedObjects(ids) {
+ var selectedModels = self.collection.filter(function(model) {
+ return ids.indexOf(model.id) >= 0 && (self._isAdmin || model.get('userVisible'))
+ })
+ return _.map(selectedModels, modelToSelection)
}
- });
- },
- /**
+ this.collection.fetch({
+ success: function() {
+ callback(findSelectedObjects(ids))
+ }
+ })
+ },
+
+ /**
* Renders this details view
*/
- render: function() {
- var self = this;
- this.$el.html(this.template());
+ render: function() {
+ var self = this
+ this.$el.html(this.template())
- this.$el.find('[title]').tooltip({placement: 'bottom'});
- this.$tagsField = this.$el.find('[name=tags]');
- this.$tagsField.select2({
- placeholder: t('core', 'Collaborative tags'),
- containerCssClass: 'systemtags-select2-container',
- dropdownCssClass: 'systemtags-select2-dropdown',
- closeOnSelect: false,
- allowClear: false,
- multiple: this._multiple,
- toggleSelect: this._multiple,
- query: _.bind(this._queryTagsAutocomplete, this),
- id: function(tag) {
- return tag.id;
- },
- initSelection: _.bind(this._initSelection, this),
- formatResult: _.bind(this._formatDropDownResult, this),
- formatSelection: _.bind(this._formatSelection, this),
- createSearchChoice: this._allowCreate ? _.bind(this._createSearchChoice, this) : undefined,
- sortResults: function(results) {
- var selectedItems = _.pluck(self.$tagsField.select2('data'), 'id');
- results.sort(function(a, b) {
- var aSelected = selectedItems.indexOf(a.id) >= 0;
- var bSelected = selectedItems.indexOf(b.id) >= 0;
- if (aSelected === bSelected) {
- var aLastUsed = self._lastUsedTags.indexOf(a.id);
- var bLastUsed = self._lastUsedTags.indexOf(b.id);
+ this.$el.find('[title]').tooltip({ placement: 'bottom' })
+ this.$tagsField = this.$el.find('[name=tags]')
+ this.$tagsField.select2({
+ placeholder: t('core', 'Collaborative tags'),
+ containerCssClass: 'systemtags-select2-container',
+ dropdownCssClass: 'systemtags-select2-dropdown',
+ closeOnSelect: false,
+ allowClear: false,
+ multiple: this._multiple,
+ toggleSelect: this._multiple,
+ query: _.bind(this._queryTagsAutocomplete, this),
+ id: function(tag) {
+ return tag.id
+ },
+ initSelection: _.bind(this._initSelection, this),
+ formatResult: _.bind(this._formatDropDownResult, this),
+ formatSelection: _.bind(this._formatSelection, this),
+ createSearchChoice: this._allowCreate ? _.bind(this._createSearchChoice, this) : undefined,
+ sortResults: function(results) {
+ var selectedItems = _.pluck(self.$tagsField.select2('data'), 'id')
+ results.sort(function(a, b) {
+ var aSelected = selectedItems.indexOf(a.id) >= 0
+ var bSelected = selectedItems.indexOf(b.id) >= 0
+ if (aSelected === bSelected) {
+ var aLastUsed = self._lastUsedTags.indexOf(a.id)
+ var bLastUsed = self._lastUsedTags.indexOf(b.id)
- if (aLastUsed !== bLastUsed) {
- if (bLastUsed === -1) {
- return -1;
+ if (aLastUsed !== bLastUsed) {
+ if (bLastUsed === -1) {
+ return -1
+ }
+ if (aLastUsed === -1) {
+ return 1
+ }
+ return aLastUsed < bLastUsed ? -1 : 1
}
- if (aLastUsed === -1) {
- return 1;
- }
- return aLastUsed < bLastUsed ? -1 : 1;
+
+ // Both not found
+ return OC.Util.naturalSortCompare(a.name, b.name)
}
+ if (aSelected && !bSelected) {
+ return -1
+ }
+ return 1
+ })
+ return results
+ },
+ formatNoMatches: function() {
+ return t('core', 'No tags found')
+ }
+ })
+ .on('select2-selecting', this._onSelectTag)
+ .on('select2-removing', this._onDeselectTag)
- // Both not found
- return OC.Util.naturalSortCompare(a.name, b.name);
- }
- if (aSelected && !bSelected) {
- return -1;
- }
- return 1;
- });
- return results;
- },
- formatNoMatches: function() {
- return t('core', 'No tags found');
+ var $dropDown = this.$tagsField.select2('dropdown')
+ // register events for inside the dropdown
+ $dropDown.on('mouseup', '.rename', this._onClickRenameTag)
+ $dropDown.on('mouseup', '.delete', this._onClickDeleteTag)
+ $dropDown.on('mouseup', '.select2-result-selectable.has-form', this._preventDefault)
+ $dropDown.on('submit', '.systemtags-rename-form', this._onSubmitRenameTag)
+
+ this.delegateEvents()
+ },
+
+ remove: function() {
+ if (this.$tagsField) {
+ this.$tagsField.select2('destroy')
}
- })
- .on('select2-selecting', this._onSelectTag)
- .on('select2-removing', this._onDeselectTag);
+ },
- var $dropDown = this.$tagsField.select2('dropdown');
- // register events for inside the dropdown
- $dropDown.on('mouseup', '.rename', this._onClickRenameTag);
- $dropDown.on('mouseup', '.delete', this._onClickDeleteTag);
- $dropDown.on('mouseup', '.select2-result-selectable.has-form', this._preventDefault);
- $dropDown.on('submit', '.systemtags-rename-form', this._onSubmitRenameTag);
+ getValues: function() {
+ this.$tagsField.select2('val')
+ },
- this.delegateEvents();
- },
+ setValues: function(values) {
+ this.$tagsField.select2('val', values)
+ },
- remove: function() {
- if (this.$tagsField) {
- this.$tagsField.select2('destroy');
+ setData: function(data) {
+ this.$tagsField.select2('data', data)
}
- },
+ })
- getValues: function() {
- this.$tagsField.select2('val');
- },
-
- setValues: function(values) {
- this.$tagsField.select2('val', values);
- },
-
- setData: function(data) {
- this.$tagsField.select2('data', data);
- }
- });
-
- OC.SystemTags = OC.SystemTags || {};
- OC.SystemTags.SystemTagsInputField = SystemTagsInputField;
-
-})(OC);
+ OC.SystemTags = OC.SystemTags || {}
+ OC.SystemTags.SystemTagsInputField = SystemTagsInputField
+})(OC)
diff --git a/core/js/systemtags/systemtagsmappingcollection.js b/core/js/systemtags/systemtagsmappingcollection.js
index f30a9dbd98..d3f1d0b873 100644
--- a/core/js/systemtags/systemtagsmappingcollection.js
+++ b/core/js/systemtags/systemtagsmappingcollection.js
@@ -19,69 +19,68 @@
var SystemTagsMappingCollection = OC.Backbone.Collection.extend(
/** @lends OC.SystemTags.SystemTagsMappingCollection.prototype */ {
- sync: OC.Backbone.davSync,
+ sync: OC.Backbone.davSync,
- /**
+ /**
* Use PUT instead of PROPPATCH
*/
- usePUT: true,
+ usePUT: true,
- /**
+ /**
* Id of the file for which to filter activities by
*
* @var int
*/
- _objectId: null,
+ _objectId: null,
- /**
+ /**
* Type of the object to filter by
*
* @var string
*/
- _objectType: 'files',
+ _objectType: 'files',
- model: OC.SystemTags.SystemTagModel,
+ model: OC.SystemTags.SystemTagModel,
- url: function() {
- return OC.linkToRemote('dav') + '/systemtags-relations/' + this._objectType + '/' + this._objectId;
- },
+ url: function() {
+ return OC.linkToRemote('dav') + '/systemtags-relations/' + this._objectType + '/' + this._objectId
+ },
- /**
+ /**
* Sets the object id to filter by or null for all.
*
* @param {int} objectId file id or null
*/
- setObjectId: function(objectId) {
- this._objectId = objectId;
- },
+ setObjectId: function(objectId) {
+ this._objectId = objectId
+ },
- /**
+ /**
* Sets the object type to filter by or null for all.
*
* @param {int} objectType file id or null
*/
- setObjectType: function(objectType) {
- this._objectType = objectType;
- },
+ setObjectType: function(objectType) {
+ this._objectType = objectType
+ },
- initialize: function(models, options) {
- options = options || {};
- if (!_.isUndefined(options.objectId)) {
- this._objectId = options.objectId;
+ initialize: function(models, options) {
+ options = options || {}
+ if (!_.isUndefined(options.objectId)) {
+ this._objectId = options.objectId
+ }
+ if (!_.isUndefined(options.objectType)) {
+ this._objectType = options.objectType
+ }
+ },
+
+ getTagIds: function() {
+ return this.map(function(model) {
+ return model.id
+ })
}
- if (!_.isUndefined(options.objectType)) {
- this._objectType = options.objectType;
- }
- },
-
- getTagIds: function() {
- return this.map(function(model) {
- return model.id;
- });
- }
- });
-
- OC.SystemTags = OC.SystemTags || {};
- OC.SystemTags.SystemTagsMappingCollection = SystemTagsMappingCollection;
-})(OC);
+ })
+ OC.SystemTags = OC.SystemTags || {}
+ OC.SystemTags.SystemTagsMappingCollection = SystemTagsMappingCollection
+})(OC)
diff --git a/core/search/js/search.js b/core/search/js/search.js
index 0822eee036..4f5499d03c 100644
--- a/core/search/js/search.js
+++ b/core/search/js/search.js
@@ -31,8 +31,8 @@
* This is a simple method. Register a new search with your function as references.
* The events will forward the search or reset directly
*
- * @param {function} searchCallback the function to run on a query search
- * @param {function} resetCallback the function to run when the user reset the form
+ * @param {Function} searchCallback the function to run on a query search
+ * @param {Function} resetCallback the function to run when the user reset the form
*/
var Search = function(searchCallback, resetCallback) {
this.initialize(searchCallback, resetCallback);
@@ -45,8 +45,8 @@
/**
* Initialize the search box
*
- * @param {function} searchCallback the function to run on a query search
- * @param {function} resetCallback the function to run when the user reset the form
+ * @param {Function} searchCallback the function to run on a query search
+ * @param {Function} resetCallback the function to run when the user reset the form
*/
initialize: function(searchCallback, resetCallback) {
diff --git a/core/src/OC/admin.js b/core/src/OC/admin.js
index 565af9946f..008016645d 100644
--- a/core/src/OC/admin.js
+++ b/core/src/OC/admin.js
@@ -24,7 +24,7 @@ const isAdmin = !!window._oc_isadmin
/**
* Returns whether the current user is an administrator
*
- * @return {bool} true if the user is an admin, false otherwise
+ * @returns {bool} true if the user is an admin, false otherwise
* @since 9.0.0
*/
export const isUserAdmin = () => isAdmin
diff --git a/core/src/OC/appconfig.js b/core/src/OC/appconfig.js
index 1248475ce7..37fc3ca420 100644
--- a/core/src/OC/appconfig.js
+++ b/core/src/OC/appconfig.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/**
* @copyright Copyright (c) 2016 Joas Schilling
*
@@ -18,7 +19,7 @@
*
*/
-import {getValue, setValue, getApps, getKeys, deleteKey} from '../OCP/appconfig'
+ import { getValue, setValue, getApps, getKeys, deleteKey } from '../OCP/appconfig'
export const appConfig = window.oc_appconfig || {}
@@ -30,42 +31,42 @@ export const AppConfig = {
/**
* @deprecated Use OCP.AppConfig.getValue() instead
*/
- getValue: function (app, key, defaultValue, callback) {
+ getValue: function(app, key, defaultValue, callback) {
getValue(app, key, defaultValue, {
success: callback
- });
+ })
},
/**
* @deprecated Use OCP.AppConfig.setValue() instead
*/
- setValue: function (app, key, value) {
- setValue(app, key, value);
+ setValue: function(app, key, value) {
+ setValue(app, key, value)
},
/**
* @deprecated Use OCP.AppConfig.getApps() instead
*/
- getApps: function (callback) {
+ getApps: function(callback) {
getApps({
success: callback
- });
+ })
},
/**
* @deprecated Use OCP.AppConfig.getKeys() instead
*/
- getKeys: function (app, callback) {
+ getKeys: function(app, callback) {
getKeys(app, {
success: callback
- });
+ })
},
/**
* @deprecated Use OCP.AppConfig.deleteKey() instead
*/
- deleteKey: function (app, key) {
- deleteKey(app, key);
+ deleteKey: function(app, key) {
+ deleteKey(app, key)
}
-};
+}
diff --git a/core/src/OC/apps.js b/core/src/OC/apps.js
index d476e74c81..f94059a421 100644
--- a/core/src/OC/apps.js
+++ b/core/src/OC/apps.js
@@ -8,26 +8,26 @@
* @copyright Bernhard Posselt 2014
*/
-import $ from 'jquery';
+import $ from 'jquery'
-var dynamicSlideToggleEnabled = false;
+var dynamicSlideToggleEnabled = false
const Apps = {
- enableDynamicSlideToggle: function () {
- dynamicSlideToggleEnabled = true;
+ enableDynamicSlideToggle: function() {
+ dynamicSlideToggleEnabled = true
}
-};
+}
/**
* Shows the #app-sidebar and add .with-app-sidebar to subsequent siblings
*
* @param {Object} [$el] sidebar element to show, defaults to $('#app-sidebar')
*/
-Apps.showAppSidebar = function ($el) {
- var $appSidebar = $el || $('#app-sidebar');
- $appSidebar.removeClass('disappear').show();
- $('#app-content').trigger(new $.Event('appresized'));
-};
+Apps.showAppSidebar = function($el) {
+ var $appSidebar = $el || $('#app-sidebar')
+ $appSidebar.removeClass('disappear').show()
+ $('#app-content').trigger(new $.Event('appresized'))
+}
/**
* Shows the #app-sidebar and removes .with-app-sidebar from subsequent
@@ -35,11 +35,11 @@ Apps.showAppSidebar = function ($el) {
*
* @param {Object} [$el] sidebar element to hide, defaults to $('#app-sidebar')
*/
-Apps.hideAppSidebar = function ($el) {
- var $appSidebar = $el || $('#app-sidebar');
- $appSidebar.hide().addClass('disappear');
- $('#app-content').trigger(new $.Event('appresized'));
-};
+Apps.hideAppSidebar = function($el) {
+ var $appSidebar = $el || $('#app-sidebar')
+ $appSidebar.hide().addClass('disappear')
+ $('#app-content').trigger(new $.Event('appresized'))
+}
/**
* Provides a way to slide down a target area through a button and slide it
@@ -51,40 +51,40 @@ Apps.hideAppSidebar = function ($el) {
*
*/
export const registerAppsSlideToggle = () => {
- var buttons = $('[data-apps-slide-toggle]');
+ var buttons = $('[data-apps-slide-toggle]')
if (buttons.length === 0) {
- $('#app-navigation').addClass('without-app-settings');
+ $('#app-navigation').addClass('without-app-settings')
}
- $(document).click(function (event) {
+ $(document).click(function(event) {
if (dynamicSlideToggleEnabled) {
- buttons = $('[data-apps-slide-toggle]');
+ buttons = $('[data-apps-slide-toggle]')
}
- buttons.each(function (index, button) {
+ buttons.each(function(index, button) {
- var areaSelector = $(button).data('apps-slide-toggle');
- var area = $(areaSelector);
+ var areaSelector = $(button).data('apps-slide-toggle')
+ var area = $(areaSelector)
- function hideArea () {
- area.slideUp(OC.menuSpeed * 4, function () {
- area.trigger(new $.Event('hide'));
- });
- area.removeClass('opened');
- $(button).removeClass('opened');
+ function hideArea() {
+ area.slideUp(OC.menuSpeed * 4, function() {
+ area.trigger(new $.Event('hide'))
+ })
+ area.removeClass('opened')
+ $(button).removeClass('opened')
}
- function showArea () {
- area.slideDown(OC.menuSpeed * 4, function () {
- area.trigger(new $.Event('show'));
- });
- area.addClass('opened');
- $(button).addClass('opened');
- var input = $(areaSelector + ' [autofocus]');
+ function showArea() {
+ area.slideDown(OC.menuSpeed * 4, function() {
+ area.trigger(new $.Event('show'))
+ })
+ area.addClass('opened')
+ $(button).addClass('opened')
+ var input = $(areaSelector + ' [autofocus]')
if (input.length === 1) {
- input.focus();
+ input.focus()
}
}
@@ -94,23 +94,23 @@ export const registerAppsSlideToggle = () => {
// button toggles the area
if ($(button).is($(event.target).closest('[data-apps-slide-toggle]'))) {
if (area.is(':visible')) {
- hideArea();
+ hideArea()
} else {
- showArea();
+ showArea()
}
// all other areas that have not been clicked but are open
// should be slid up
} else {
- var closest = $(event.target).closest(areaSelector);
+ var closest = $(event.target).closest(areaSelector)
if (area.is(':visible') && closest[0] !== area[0]) {
- hideArea();
+ hideArea()
}
}
}
- });
+ })
- });
-};
+ })
+}
-export default Apps;
+export default Apps
diff --git a/core/src/OC/appsettings.js b/core/src/OC/appsettings.js
index b62af5c592..7665d93fb7 100644
--- a/core/src/OC/appsettings.js
+++ b/core/src/OC/appsettings.js
@@ -1,4 +1,5 @@
-/*
+/* eslint-disable */
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -18,9 +19,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see
*
* @author 2019 Christoph Wurst
@@ -19,15 +19,15 @@
* along with this program. If not, see
*
* @author 2019 Christoph Wurst
@@ -19,7 +19,7 @@
* along with this program. If not see
@@ -22,10 +22,10 @@
*
*/
-import $ from 'jquery';
-import {Collection, Model, View} from 'backbone';
+import $ from 'jquery'
+import { Collection, Model, View } from 'backbone'
-import OC from './index';
+import OC from './index'
/**
* @class Contact
@@ -43,18 +43,18 @@ const Contact = Model.extend({
/**
* @returns {undefined}
*/
- initialize: function () {
+ initialize: function() {
// Add needed property for easier template rendering
if (this.get('actions').length === 0) {
- this.set('hasOneAction', true);
+ this.set('hasOneAction', true)
} else if (this.get('actions').length === 1) {
- this.set('hasTwoActions', true);
- this.set('secondAction', this.get('actions')[0]);
+ this.set('hasTwoActions', true)
+ this.set('secondAction', this.get('actions')[0])
} else {
- this.set('hasManyActions', true);
+ this.set('hasManyActions', true)
}
}
-});
+})
/**
* @class ContactCollection
@@ -62,7 +62,7 @@ const Contact = Model.extend({
*/
const ContactCollection = Collection.extend({
model: Contact
-});
+})
/**
* @class ContactsListView
@@ -80,29 +80,29 @@ const ContactsListView = View.extend({
* @param {object} options
* @returns {undefined}
*/
- initialize: function (options) {
- this._collection = options.collection;
+ initialize: function(options) {
+ this._collection = options.collection
},
/**
* @returns {self}
*/
- render: function () {
- var self = this;
- self.$el.html('');
- self._subViews = [];
+ render: function() {
+ var self = this
+ self.$el.html('')
+ self._subViews = []
- self._collection.forEach(function (contact) {
+ self._collection.forEach(function(contact) {
var item = new ContactsListItemView({
model: contact
- });
- item.render();
- self.$el.append(item.$el);
- item.on('toggle:actionmenu', self._onChildActionMenuToggle, self);
- self._subViews.push(item);
- });
+ })
+ item.render()
+ self.$el.append(item.$el)
+ item.on('toggle:actionmenu', self._onChildActionMenuToggle, self)
+ self._subViews.push(item)
+ })
- return self;
+ return self
},
/**
@@ -111,12 +111,12 @@ const ContactsListView = View.extend({
* @param {type} $src
* @returns {undefined}
*/
- _onChildActionMenuToggle: function ($src) {
- this._subViews.forEach(function (view) {
- view.trigger('parent:toggle:actionmenu', $src);
- });
+ _onChildActionMenuToggle: function($src) {
+ this._subViews.forEach(function(view) {
+ view.trigger('parent:toggle:actionmenu', $src)
+ })
}
-});
+})
/**
* @class ContactsListItemView
@@ -146,37 +146,37 @@ const ContactsListItemView = View.extend({
* @param {object} data
* @returns {undefined}
*/
- template: function (data) {
- return this.contactTemplate(data);
+ template: function(data) {
+ return this.contactTemplate(data)
},
/**
* @param {object} options
* @returns {undefined}
*/
- initialize: function (options) {
- this._model = options.model;
- this.on('parent:toggle:actionmenu', this._onOtherActionMenuOpened, this);
+ initialize: function(options) {
+ this._model = options.model
+ this.on('parent:toggle:actionmenu', this._onOtherActionMenuOpened, this)
},
/**
* @returns {self}
*/
- render: function () {
+ render: function() {
this.$el.html(this.template({
contact: this._model.toJSON()
- }));
- this.delegateEvents();
+ }))
+ this.delegateEvents()
// Show placeholder if no avatar is available (avatar is rendered as img, not div)
- this.$('div.avatar').imageplaceholder(this._model.get('fullName'));
+ this.$('div.avatar').imageplaceholder(this._model.get('fullName'))
// Show tooltip for top action
- this.$('.top-action').tooltip({placement: 'left'});
+ this.$('.top-action').tooltip({ placement: 'left' })
// Show tooltip for second action
- this.$('.second-action').tooltip({placement: 'left'});
+ this.$('.second-action').tooltip({ placement: 'left' })
- return this;
+ return this
},
/**
@@ -185,14 +185,14 @@ const ContactsListItemView = View.extend({
* @private
* @returns {undefined}
*/
- _onToggleActionsMenu: function () {
- this._actionMenuShown = !this._actionMenuShown;
+ _onToggleActionsMenu: function() {
+ this._actionMenuShown = !this._actionMenuShown
if (this._actionMenuShown) {
- this.$('.menu').show();
+ this.$('.menu').show()
} else {
- this.$('.menu').hide();
+ this.$('.menu').hide()
}
- this.trigger('toggle:actionmenu', this.$el);
+ this.trigger('toggle:actionmenu', this.$el)
},
/**
@@ -200,15 +200,15 @@ const ContactsListItemView = View.extend({
* @argument {jQuery} $src
* @returns {undefined}
*/
- _onOtherActionMenuOpened: function ($src) {
+ _onOtherActionMenuOpened: function($src) {
if (this.$el.is($src)) {
// Ignore
- return;
+ return
}
- this._actionMenuShown = false;
- this.$('.menu').hide();
+ this._actionMenuShown = false
+ this.$('.menu').hide()
}
-});
+})
/**
* @class ContactsMenuView
@@ -248,15 +248,15 @@ const ContactsMenuView = View.extend({
/**
* @returns {undefined}
*/
- _onSearch: _.debounce(function (e) {
- var searchTerm = this.$('#contactsmenu-search').val();
+ _onSearch: _.debounce(function(e) {
+ var searchTerm = this.$('#contactsmenu-search').val()
// IE11 triggers an 'input' event after the view has been rendered
// resulting in an endless loading loop. To prevent this, we remember
// the last search term to savely ignore some events
// See https://github.com/nextcloud/server/issues/5281
if (searchTerm !== this._searchTerm) {
- this.trigger('search', this.$('#contactsmenu-search').val());
- this._searchTerm = searchTerm;
+ this.trigger('search', this.$('#contactsmenu-search').val())
+ this._searchTerm = searchTerm
}
}, 700),
@@ -264,75 +264,75 @@ const ContactsMenuView = View.extend({
* @param {object} data
* @returns {string}
*/
- loadingTemplate: function (data) {
- return this.templates.loading(data);
+ loadingTemplate: function(data) {
+ return this.templates.loading(data)
},
/**
* @param {object} data
* @returns {string}
*/
- errorTemplate: function (data) {
+ errorTemplate: function(data) {
return this.templates.error(
_.extend({
couldNotLoadText: t('core', 'Could not load your contacts')
}, data)
- );
+ )
},
/**
* @param {object} data
* @returns {string}
*/
- contentTemplate: function (data) {
+ contentTemplate: function(data) {
return this.templates.menu(
_.extend({
searchContactsText: t('core', 'Search contacts …')
}, data)
- );
+ )
},
/**
* @param {object} data
* @returns {string}
*/
- contactsTemplate: function (data) {
+ contactsTemplate: function(data) {
return this.templates.list(
_.extend({
noContactsFoundText: t('core', 'No contacts found'),
showAllContactsText: t('core', 'Show all contacts …'),
contactsAppMgmtText: t('core', 'Install the Contacts app')
}, data)
- );
+ )
},
/**
* @param {object} options
* @returns {undefined}
*/
- initialize: function (options) {
- this.options = options;
+ initialize: function(options) {
+ this.options = options
},
/**
* @param {string} text
* @returns {undefined}
*/
- showLoading: function (text) {
- this.render();
- this._contacts = undefined;
+ showLoading: function(text) {
+ this.render()
+ this._contacts = undefined
this.$('.content').html(this.loadingTemplate({
loadingText: text
- }));
+ }))
},
/**
* @returns {undefined}
*/
- showError: function () {
- this.render();
- this._contacts = undefined;
- this.$('.content').html(this.errorTemplate());
+ showError: function() {
+ this.render()
+ this._contacts = undefined
+ this.$('.content').html(this.errorTemplate())
},
/**
@@ -340,16 +340,16 @@ const ContactsMenuView = View.extend({
* @param {string} searchTerm
* @returns {undefined}
*/
- showContacts: function (viewData, searchTerm) {
- this._contacts = viewData.contacts;
+ showContacts: function(viewData, searchTerm) {
+ this._contacts = viewData.contacts
this.render({
contacts: viewData.contacts
- });
+ })
var list = new ContactsListView({
collection: viewData.contacts
- });
- list.render();
+ })
+ list.render()
this.$('.content').html(this.contactsTemplate({
contacts: viewData.contacts,
searchTerm: searchTerm,
@@ -357,25 +357,25 @@ const ContactsMenuView = View.extend({
contactsAppURL: OC.generateUrl('/apps/contacts'),
canInstallApp: OC.isUserAdmin(),
contactsAppMgmtURL: OC.generateUrl('/settings/apps/social/contacts')
- }));
- this.$('#contactsmenu-contacts').html(list.$el);
+ }))
+ this.$('#contactsmenu-contacts').html(list.$el)
},
/**
* @param {object} data
* @returns {self}
*/
- render: function (data) {
- var searchVal = this.$('#contactsmenu-search').val();
- this.$el.html(this.contentTemplate(data));
+ render: function(data) {
+ var searchVal = this.$('#contactsmenu-search').val()
+ this.$el.html(this.contentTemplate(data))
// Focus search
- this.$('#contactsmenu-search').val(searchVal);
- this.$('#contactsmenu-search').focus();
- return this;
+ this.$('#contactsmenu-search').val(searchVal)
+ this.$('#contactsmenu-search').focus()
+ return this
}
-});
+})
/**
* @param {Object} options
@@ -384,9 +384,9 @@ const ContactsMenuView = View.extend({
* @class ContactsMenu
* @memberOf OC
*/
-const ContactsMenu = function (options) {
- this.initialize(options);
-};
+const ContactsMenu = function(options) {
+ this.initialize(options)
+}
ContactsMenu.prototype = {
/** @type {jQuery} */
@@ -407,23 +407,23 @@ ContactsMenu.prototype = {
* @param {jQuery} options.trigger - the element to click on to open the menu
* @returns {undefined}
*/
- initialize: function (options) {
- this.$el = options.el;
- this._$trigger = options.trigger;
+ initialize: function(options) {
+ this.$el = options.el
+ this._$trigger = options.trigger
this._view = new ContactsMenuView({
el: this.$el
- });
- this._view.on('search', function (searchTerm) {
- this._loadContacts(searchTerm);
- }, this);
+ })
+ this._view.on('search', function(searchTerm) {
+ this._loadContacts(searchTerm)
+ }, this)
- OC.registerMenu(this._$trigger, this.$el, function () {
- this._toggleVisibility(true);
- }.bind(this), true);
- this.$el.on('beforeHide', function () {
- this._toggleVisibility(false);
- }.bind(this));
+ OC.registerMenu(this._$trigger, this.$el, function() {
+ this._toggleVisibility(true)
+ }.bind(this), true)
+ this.$el.on('beforeHide', function() {
+ this._toggleVisibility(false)
+ }.bind(this))
},
/**
@@ -431,12 +431,12 @@ ContactsMenu.prototype = {
* @param {boolean} show
* @returns {Promise}
*/
- _toggleVisibility: function (show) {
+ _toggleVisibility: function(show) {
if (show) {
- return this._loadContacts();
+ return this._loadContacts()
} else {
- this.$el.html('');
- return Promise.resolve();
+ this.$el.html('')
+ return Promise.resolve()
}
},
@@ -445,48 +445,48 @@ ContactsMenu.prototype = {
* @param {string|undefined} searchTerm
* @returns {Promise}
*/
- _getContacts: function (searchTerm) {
- var url = OC.generateUrl('/contactsmenu/contacts');
+ _getContacts: function(searchTerm) {
+ var url = OC.generateUrl('/contactsmenu/contacts')
return Promise.resolve($.ajax(url, {
method: 'POST',
data: {
filter: searchTerm
}
- }));
+ }))
},
/**
* @param {string|undefined} searchTerm
* @returns {undefined}
*/
- _loadContacts: function (searchTerm) {
- var self = this;
+ _loadContacts: function(searchTerm) {
+ var self = this
if (!self._contactsPromise) {
- self._contactsPromise = self._getContacts(searchTerm);
+ self._contactsPromise = self._getContacts(searchTerm)
}
if (_.isUndefined(searchTerm) || searchTerm === '') {
- self._view.showLoading(t('core', 'Loading your contacts …'));
+ self._view.showLoading(t('core', 'Loading your contacts …'))
} else {
self._view.showLoading(t('core', 'Looking for {term} …', {
term: searchTerm
- }));
+ }))
}
- return self._contactsPromise.then(function (data) {
+ return self._contactsPromise.then(function(data) {
// Convert contact entries to Backbone collection
- data.contacts = new ContactCollection(data.contacts);
+ data.contacts = new ContactCollection(data.contacts)
- self._view.showContacts(data, searchTerm);
- }, function (e) {
- self._view.showError();
- console.error('There was an error loading your contacts', e);
- }).then(function () {
+ self._view.showContacts(data, searchTerm)
+ }, function(e) {
+ self._view.showError()
+ console.error('There was an error loading your contacts', e)
+ }).then(function() {
// Delete promise, so that contacts are fetched again when the
// menu is opened the next time.
- delete self._contactsPromise;
- }).catch(console.error.bind(this));
+ delete self._contactsPromise
+ }).catch(console.error.bind(this))
}
-};
+}
-export default ContactsMenu;
+export default ContactsMenu
diff --git a/core/src/OC/currentuser.js b/core/src/OC/currentuser.js
index 061abba89d..c8f9d59c1e 100644
--- a/core/src/OC/currentuser.js
+++ b/core/src/OC/currentuser.js
@@ -31,6 +31,6 @@ export const currentUser = rawUid !== undefined ? rawUid : false
export const getCurrentUser = () => {
return {
uid: currentUser,
- displayName,
+ displayName
}
}
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js
index b5a2c2c01b..abc5b3e1c3 100644
--- a/core/src/OC/dialogs.js
+++ b/core/src/OC/dialogs.js
@@ -1,5 +1,5 @@
/* global alert */
-
+/* eslint-disable */
/*
* @copyright 2019 Christoph Wurst
*
@@ -42,14 +42,15 @@ const Dialogs = {
// used to name each dialog
dialogsCounter: 0,
+
/**
* displays alert dialog
- * @param text content of dialog
- * @param title dialog title
- * @param callback which will be triggered when user presses OK
- * @param modal make the dialog modal
+ * @param {string} text content of dialog
+ * @param {string} title dialog title
+ * @param {function} callback which will be triggered when user presses OK
+ * @param {boolean} [modal] make the dialog modal
*/
- alert: function (text, title, callback, modal) {
+ alert: function(text, title, callback, modal) {
this.message(
text,
title,
@@ -57,27 +58,28 @@ const Dialogs = {
Dialogs.OK_BUTTON,
callback,
modal
- );
+ )
},
/**
* displays info dialog
- * @param text content of dialog
- * @param title dialog title
- * @param callback which will be triggered when user presses OK
- * @param modal make the dialog modal
+ * @param {string} text content of dialog
+ * @param {string} title dialog title
+ * @param {function} callback which will be triggered when user presses OK
+ * @param {boolean} [modal] make the dialog modal
*/
- info: function (text, title, callback, modal) {
- this.message(text, title, 'info', Dialogs.OK_BUTTON, callback, modal);
+ info: function(text, title, callback, modal) {
+ this.message(text, title, 'info', Dialogs.OK_BUTTON, callback, modal)
},
+
/**
* displays confirmation dialog
- * @param text content of dialog
- * @param title dialog title
- * @param callback which will be triggered when user presses YES or NO
- * (true or false would be passed to callback respectively)
- * @param modal make the dialog modal
+ * @param {string} text content of dialog
+ * @param {string} title dialog title
+ * @param {function} callback which will be triggered when user presses OK (true or false would be passed to callback respectively)
+ * @param {boolean} [modal] make the dialog modal
+ * @returns {Promise}
*/
- confirm: function (text, title, callback, modal) {
+ confirm: function(text, title, callback, modal) {
return this.message(
text,
title,
@@ -85,17 +87,17 @@ const Dialogs = {
Dialogs.YES_NO_BUTTONS,
callback,
modal
- );
+ )
},
/**
* displays confirmation dialog
- * @param text content of dialog
- * @param title dialog title
- * @param callback which will be triggered when user presses YES or NO
- * (true or false would be passed to callback respectively)
- * @param modal make the dialog modal
+ * @param {string} text content of dialog
+ * @param {string} title dialog title
+ * @param {function} callback which will be triggered when user presses OK (true or false would be passed to callback respectively)
+ * @param {boolean} [modal] make the dialog modal
+ * @returns {Promise}
*/
- confirmHtml: function (text, title, callback, modal) {
+ confirmHtml: function(text, title, callback, modal) {
return this.message(
text,
title,
@@ -104,79 +106,81 @@ const Dialogs = {
callback,
modal,
true
- );
+ )
},
/**
* displays prompt dialog
- * @param text content of dialog
- * @param title dialog title
- * @param callback which will be triggered when user presses YES or NO
- * (true or false would be passed to callback respectively)
- * @param modal make the dialog modal
- * @param name name of the input field
- * @param password whether the input should be a password input
+ * @param {string} text content of dialog
+ * @param {string} title dialog title
+ * @param {function} callback which will be triggered when user presses OK (true or false would be passed to callback respectively)
+ * @param {boolean} [modal] make the dialog modal
+ * @param {string} name name of the input field
+ * @param {boolean} password whether the input should be a password input
+ * @returns {Promise}
*/
- prompt: function (text, title, callback, modal, name, password) {
- return $.when(this._getMessageTemplate()).then(function ($tmpl) {
- var dialogName = 'oc-dialog-' + Dialogs.dialogsCounter + '-content';
- var dialogId = '#' + dialogName;
+ prompt: function(text, title, callback, modal, name, password) {
+ return $.when(this._getMessageTemplate()).then(function($tmpl) {
+ var dialogName = 'oc-dialog-' + Dialogs.dialogsCounter + '-content'
+ var dialogId = '#' + dialogName
var $dlg = $tmpl.octemplate({
dialog_name: dialogName,
title: title,
message: text,
type: 'notice'
- });
- var input = $('');
- input.attr('type', password ? 'password' : 'text').attr('id', dialogName + '-input').attr('placeholder', name);
- var label = $('').attr('for', dialogName + '-input').text(name + ': ');
- $dlg.append(label);
- $dlg.append(input);
+ })
+ var input = $('')
+ input.attr('type', password ? 'password' : 'text').attr('id', dialogName + '-input').attr('placeholder', name)
+ var label = $('').attr('for', dialogName + '-input').text(name + ': ')
+ $dlg.append(label)
+ $dlg.append(input)
if (modal === undefined) {
- modal = false;
+ modal = false
}
- $('body').append($dlg);
+ $('body').append($dlg)
// wrap callback in _.once():
// only call callback once and not twice (button handler and close
// event) but call it for the close event, if ESC or the x is hit
if (callback !== undefined) {
- callback = _.once(callback);
+ callback = _.once(callback)
}
var buttonlist = [{
text: t('core', 'No'),
- click: function () {
+ click: function() {
if (callback !== undefined) {
- callback(false, input.val());
+ // eslint-disable-next-line standard/no-callback-literal
+ callback(false, input.val())
}
- $(dialogId).ocdialog('close');
+ $(dialogId).ocdialog('close')
}
}, {
text: t('core', 'Yes'),
- click: function () {
+ click: function() {
if (callback !== undefined) {
- callback(true, input.val());
+ // eslint-disable-next-line standard/no-callback-literal
+ callback(true, input.val())
}
- $(dialogId).ocdialog('close');
+ $(dialogId).ocdialog('close')
},
defaultButton: true
- }
- ];
+ }]
$(dialogId).ocdialog({
closeOnEscape: true,
modal: modal,
buttons: buttonlist,
- close: function () {
+ close: function() {
// callback is already fired if Yes/No is clicked directly
if (callback !== undefined) {
- callback(false, input.val());
+ // eslint-disable-next-line standard/no-callback-literal
+ callback(false, input.val())
}
}
- });
- input.focus();
- Dialogs.dialogsCounter++;
- });
+ })
+ input.focus()
+ Dialogs.dialogsCounter++
+ })
},
/**
* show a file picker to pick a file from
@@ -188,56 +192,56 @@ const Dialogs = {
* be able to select both files and folders "['*', 'httpd/unix-directory']"
* should be used instead.
*
- * @param title dialog title
- * @param callback which will be triggered when user presses Choose
- * @param multiselect whether it should be possible to select multiple files
- * @param mimetypeFilter mimetype to filter by - directories will always be included
- * @param modal make the dialog modal
- * @param type Type of file picker : Choose, copy, move, copy and move
- * @param path path to the folder that the the file can be picket from
- * @param options additonal options that need to be set
+ * @param {string} title dialog title
+ * @param {function} callback which will be triggered when user presses Choose
+ * @param {boolean} [multiselect] whether it should be possible to select multiple files
+ * @param {string[]} [mimetypeFilter] mimetype to filter by - directories will always be included
+ * @param {boolean} [modal] make the dialog modal
+ * @param {string} [type] Type of file picker : Choose, copy, move, copy and move
+ * @param {string} [path] path to the folder that the the file can be picket from
+ * @param {Object} [options] additonal options that need to be set
*/
- filepicker: function (title, callback, multiselect, mimetypeFilter, modal, type, path, options) {
- var self = this;
+ filepicker: function(title, callback, multiselect, mimetypeFilter, modal, type, path, options) {
+ var self = this
- this.filepicker.sortField = 'name';
- this.filepicker.sortOrder = 'asc';
+ this.filepicker.sortField = 'name'
+ this.filepicker.sortOrder = 'asc'
// avoid opening the picker twice
if (this.filepicker.loading) {
- return;
+ return
}
if (type === undefined) {
- type = this.FILEPICKER_TYPE_CHOOSE;
+ type = this.FILEPICKER_TYPE_CHOOSE
}
- var emptyText = t('core', 'No files in here');
- var newText = t('files', 'New folder');
+ var emptyText = t('core', 'No files in here')
+ var newText = t('files', 'New folder')
if (type === this.FILEPICKER_TYPE_COPY || type === this.FILEPICKER_TYPE_MOVE || type === this.FILEPICKER_TYPE_COPY_MOVE) {
- emptyText = t('core', 'No more subfolders in here');
+ emptyText = t('core', 'No more subfolders in here')
}
- this.filepicker.loading = true;
- this.filepicker.filesClient = (OCA.Sharing && OCA.Sharing.PublicApp && OCA.Sharing.PublicApp.fileList) ? OCA.Sharing.PublicApp.fileList.filesClient : OC.Files.getClient();
+ this.filepicker.loading = true
+ this.filepicker.filesClient = (OCA.Sharing && OCA.Sharing.PublicApp && OCA.Sharing.PublicApp.fileList) ? OCA.Sharing.PublicApp.fileList.filesClient : OC.Files.getClient()
- this.filelist = null;
- path = path || '';
+ this.filelist = null
+ path = path || ''
options = Object.assign({
allowDirectoryChooser: false
}, options)
- $.when(this._getFilePickerTemplate()).then(function ($tmpl) {
- self.filepicker.loading = false;
- var dialogName = 'oc-dialog-filepicker-content';
+ $.when(this._getFilePickerTemplate()).then(function($tmpl) {
+ self.filepicker.loading = false
+ var dialogName = 'oc-dialog-filepicker-content'
if (self.$filePicker) {
- self.$filePicker.ocdialog('close');
+ self.$filePicker.ocdialog('close')
}
if (mimetypeFilter === undefined || mimetypeFilter === null) {
- mimetypeFilter = [];
+ mimetypeFilter = []
}
- if (typeof (mimetypeFilter) === "string") {
- mimetypeFilter = [mimetypeFilter];
+ if (typeof (mimetypeFilter) === 'string') {
+ mimetypeFilter = [mimetypeFilter]
}
self.$filePicker = $tmpl.octemplate({
@@ -251,190 +255,190 @@ const Dialogs = {
}).data('path', path).data('multiselect', multiselect).data('mimetype', mimetypeFilter).data('allowDirectoryChooser', options.allowDirectoryChooser)
if (modal === undefined) {
- modal = false;
+ modal = false
}
if (multiselect === undefined) {
- multiselect = false;
+ multiselect = false
}
// No grid for IE!
if (OC.Util.isIE()) {
- self.$filePicker.find('#picker-view-toggle').remove();
- self.$filePicker.find('#picker-filestable').removeClass('view-grid');
+ self.$filePicker.find('#picker-view-toggle').remove()
+ self.$filePicker.find('#picker-filestable').removeClass('view-grid')
}
- $('body').append(self.$filePicker);
+ $('body').append(self.$filePicker)
- self.$showGridView = $('input#picker-showgridview');
- self.$showGridView.on('change', _.bind(self._onGridviewChange, self));
+ self.$showGridView = $('input#picker-showgridview')
+ self.$showGridView.on('change', _.bind(self._onGridviewChange, self))
if (!OC.Util.isIE()) {
- self._getGridSettings();
+ self._getGridSettings()
}
- var newButton = self.$filePicker.find('.actions.creatable .button-add');
+ var newButton = self.$filePicker.find('.actions.creatable .button-add')
if (type === self.FILEPICKER_TYPE_CHOOSE) {
- newButton.hide();
+ newButton.hide()
}
- newButton.on('focus', function () {
- self.$filePicker.ocdialog('setEnterCallback', function () {
- event.stopImmediatePropagation();
- event.preventDefault();
- newButton.click();
- });
- });
- newButton.on('blur', function () {
- self.$filePicker.ocdialog('unsetEnterCallback');
- });
+ newButton.on('focus', function() {
+ self.$filePicker.ocdialog('setEnterCallback', function() {
+ event.stopImmediatePropagation()
+ event.preventDefault()
+ newButton.click()
+ })
+ })
+ newButton.on('blur', function() {
+ self.$filePicker.ocdialog('unsetEnterCallback')
+ })
- OC.registerMenu(newButton, self.$filePicker.find('.menu'), function () {
- $input.focus();
- self.$filePicker.ocdialog('setEnterCallback', function () {
- event.stopImmediatePropagation();
- event.preventDefault();
- self.$form.submit();
- });
- var newName = $input.val();
- var lastPos = newName.lastIndexOf('.');
+ OC.registerMenu(newButton, self.$filePicker.find('.menu'), function() {
+ $input.focus()
+ self.$filePicker.ocdialog('setEnterCallback', function() {
+ event.stopImmediatePropagation()
+ event.preventDefault()
+ self.$form.submit()
+ })
+ var newName = $input.val()
+ var lastPos = newName.lastIndexOf('.')
if (lastPos === -1) {
- lastPos = newName.length;
+ lastPos = newName.length
}
- $input.selectRange(0, lastPos);
- });
- var $form = self.$filePicker.find('.filenameform');
- var $input = $form.find('input[type=\'text\']');
- var $submit = $form.find('input[type=\'submit\']');
- $submit.on('click', function (event) {
- event.stopImmediatePropagation();
- event.preventDefault();
- $form.submit();
- });
+ $input.selectRange(0, lastPos)
+ })
+ var $form = self.$filePicker.find('.filenameform')
+ var $input = $form.find('input[type=\'text\']')
+ var $submit = $form.find('input[type=\'submit\']')
+ $submit.on('click', function(event) {
+ event.stopImmediatePropagation()
+ event.preventDefault()
+ $form.submit()
+ })
- var checkInput = function () {
- var filename = $input.val();
+ var checkInput = function() {
+ var filename = $input.val()
try {
if (!Files.isFileNameValid(filename)) {
// Files.isFileNameValid(filename) throws an exception itself
- } else if (self.filelist.find(function (file) {
- return file.name === this;
+ } else if (self.filelist.find(function(file) {
+ return file.name === this
}, filename)) {
- throw t('files', '{newName} already exists', {newName: filename}, undefined, {
+ throw t('files', '{newName} already exists', { newName: filename }, undefined, {
escape: false
- });
+ })
} else {
- return true;
+ return true
}
} catch (error) {
- $input.attr('title', error);
+ $input.attr('title', error)
$input.tooltip({
placement: 'right',
trigger: 'manual',
'container': '.newFolderMenu'
- });
- $input.tooltip('fixTitle');
- $input.tooltip('show');
- $input.addClass('error');
+ })
+ $input.tooltip('fixTitle')
+ $input.tooltip('show')
+ $input.addClass('error')
}
- return false;
- };
+ return false
+ }
- $form.on('submit', function (event) {
- event.stopPropagation();
- event.preventDefault();
+ $form.on('submit', function(event) {
+ event.stopPropagation()
+ event.preventDefault()
if (checkInput()) {
- var newname = $input.val();
+ var newname = $input.val()
self.filepicker.filesClient.createDirectory(self.$filePicker.data('path') + "/" + newname).always(function (status) {
- self._fillFilePicker(self.$filePicker.data('path') + "/" + newname);
- });
- OC.hideMenus();
- self.$filePicker.ocdialog('unsetEnterCallback');
- self.$filePicker.click();
- $input.val(newText);
+ self._fillFilePicker(self.$filePicker.data('path') + "/" + newname)
+ })
+ OC.hideMenus()
+ self.$filePicker.ocdialog('unsetEnterCallback')
+ self.$filePicker.click()
+ $input.val(newText)
}
- });
- $input.keypress(function (event) {
+ })
+ $input.keypress(function(event) {
if (event.keyCode === 13 || event.which === 13) {
- event.stopImmediatePropagation();
- event.preventDefault();
- $form.submit();
+ event.stopImmediatePropagation()
+ event.preventDefault()
+ $form.submit()
}
- });
+ })
- self.$filePicker.ready(function () {
- self.$fileListHeader = self.$filePicker.find('.filelist thead tr');
- self.$filelist = self.$filePicker.find('.filelist tbody');
- self.$filelistContainer = self.$filePicker.find('.filelist-container');
- self.$dirTree = self.$filePicker.find('.dirtree');
- self.$dirTree.on('click', 'div:not(:last-child)', self, function (event) {
- self._handleTreeListSelect(event, type);
- });
- self.$filelist.on('click', 'tr', function (event) {
- self._handlePickerClick(event, $(this), type);
- });
- self.$fileListHeader.on('click', 'a', function (event) {
- var dir = self.$filePicker.data('path');
- self.filepicker.sortField = $(event.currentTarget).data('sort');
- self.filepicker.sortOrder = self.filepicker.sortOrder === 'asc' ? 'desc' : 'asc';
- self._fillFilePicker(dir);
- });
- self._fillFilePicker(path);
- });
+ self.$filePicker.ready(function() {
+ self.$fileListHeader = self.$filePicker.find('.filelist thead tr')
+ self.$filelist = self.$filePicker.find('.filelist tbody')
+ self.$filelistContainer = self.$filePicker.find('.filelist-container')
+ self.$dirTree = self.$filePicker.find('.dirtree')
+ self.$dirTree.on('click', 'div:not(:last-child)', self, function(event) {
+ self._handleTreeListSelect(event, type)
+ })
+ self.$filelist.on('click', 'tr', function(event) {
+ self._handlePickerClick(event, $(this), type)
+ })
+ self.$fileListHeader.on('click', 'a', function(event) {
+ var dir = self.$filePicker.data('path')
+ self.filepicker.sortField = $(event.currentTarget).data('sort')
+ self.filepicker.sortOrder = self.filepicker.sortOrder === 'asc' ? 'desc' : 'asc'
+ self._fillFilePicker(dir)
+ })
+ self._fillFilePicker(path)
+ })
// build buttons
- var functionToCall = function (returnType) {
+ var functionToCall = function(returnType) {
if (callback !== undefined) {
- var datapath;
+ var datapath
if (multiselect === true) {
- datapath = [];
- self.$filelist.find('tr.filepicker_element_selected').each(function (index, element) {
- datapath.push(self.$filePicker.data('path') + '/' + $(element).data('entryname'));
- });
+ datapath = []
+ self.$filelist.find('tr.filepicker_element_selected').each(function(index, element) {
+ datapath.push(self.$filePicker.data('path') + '/' + $(element).data('entryname'))
+ })
} else {
- datapath = self.$filePicker.data('path');
- var selectedName = self.$filelist.find('tr.filepicker_element_selected').data('entryname');
+ datapath = self.$filePicker.data('path')
+ var selectedName = self.$filelist.find('tr.filepicker_element_selected').data('entryname')
if (selectedName) {
- datapath += '/' + selectedName;
+ datapath += '/' + selectedName
}
}
- callback(datapath, returnType);
- self.$filePicker.ocdialog('close');
+ callback(datapath, returnType)
+ self.$filePicker.ocdialog('close')
}
- };
+ }
- var chooseCallback = function () {
- functionToCall(Dialogs.FILEPICKER_TYPE_CHOOSE);
- };
+ var chooseCallback = function() {
+ functionToCall(Dialogs.FILEPICKER_TYPE_CHOOSE)
+ }
- var copyCallback = function () {
- functionToCall(Dialogs.FILEPICKER_TYPE_COPY);
- };
+ var copyCallback = function() {
+ functionToCall(Dialogs.FILEPICKER_TYPE_COPY)
+ }
- var moveCallback = function () {
- functionToCall(Dialogs.FILEPICKER_TYPE_MOVE);
- };
+ var moveCallback = function() {
+ functionToCall(Dialogs.FILEPICKER_TYPE_MOVE)
+ }
- var buttonlist = [];
+ var buttonlist = []
if (type === Dialogs.FILEPICKER_TYPE_CHOOSE) {
buttonlist.push({
text: t('core', 'Choose'),
click: chooseCallback,
defaultButton: true
- });
+ })
} else {
if (type === Dialogs.FILEPICKER_TYPE_COPY || type === Dialogs.FILEPICKER_TYPE_COPY_MOVE) {
buttonlist.push({
text: t('core', 'Copy'),
click: copyCallback,
defaultButton: false
- });
+ })
}
if (type === Dialogs.FILEPICKER_TYPE_MOVE || type === Dialogs.FILEPICKER_TYPE_COPY_MOVE) {
buttonlist.push({
text: t('core', 'Move'),
click: moveCallback,
defaultButton: true
- });
+ })
}
}
@@ -446,108 +450,108 @@ const Dialogs = {
modal: modal,
buttons: buttonlist,
style: {
- buttons: 'aside',
+ buttons: 'aside'
},
- close: function () {
+ close: function() {
try {
- $(this).ocdialog('destroy').remove();
+ $(this).ocdialog('destroy').remove()
} catch (e) {
}
- self.$filePicker = null;
+ self.$filePicker = null
}
- });
+ })
// We can access primary class only from oc-dialog.
// Hence this is one of the approach to get the choose button.
- var getOcDialog = self.$filePicker.closest('.oc-dialog');
- var buttonEnableDisable = getOcDialog.find('.primary');
- if (self.$filePicker.data('mimetype').indexOf("httpd/unix-directory") !== -1 && !self.$filePicker.data('.allowDirectoryChooser')) {
- buttonEnableDisable.prop("disabled", false);
+ var getOcDialog = self.$filePicker.closest('.oc-dialog')
+ var buttonEnableDisable = getOcDialog.find('.primary')
+ if (self.$filePicker.data('mimetype').indexOf('httpd/unix-directory') !== -1 && !self.$filePicker.data('.allowDirectoryChooser')) {
+ buttonEnableDisable.prop('disabled', false)
} else {
- buttonEnableDisable.prop("disabled", true);
+ buttonEnableDisable.prop('disabled', true)
}
})
- .fail(function (status, error) {
+ .fail(function(status, error) {
// If the method is called while navigating away
// from the page, it is probably not needed ;)
- self.filepicker.loading = false;
+ self.filepicker.loading = false
if (status !== 0) {
- alert(t('core', 'Error loading file picker template: {error}', {error: error}));
+ alert(t('core', 'Error loading file picker template: {error}', { error: error }))
}
- });
+ })
},
/**
* Displays raw dialog
* You better use a wrapper instead ...
*/
- message: function (content, title, dialogType, buttons, callback, modal, allowHtml) {
- return $.when(this._getMessageTemplate()).then(function ($tmpl) {
- var dialogName = 'oc-dialog-' + Dialogs.dialogsCounter + '-content';
- var dialogId = '#' + dialogName;
+ message: function(content, title, dialogType, buttons, callback, modal, allowHtml) {
+ return $.when(this._getMessageTemplate()).then(function($tmpl) {
+ var dialogName = 'oc-dialog-' + Dialogs.dialogsCounter + '-content'
+ var dialogId = '#' + dialogName
var $dlg = $tmpl.octemplate({
dialog_name: dialogName,
title: title,
message: content,
type: dialogType
- }, allowHtml ? {escapeFunction: ''} : {});
+ }, allowHtml ? { escapeFunction: '' } : {})
if (modal === undefined) {
- modal = false;
+ modal = false
}
- $('body').append($dlg);
- var buttonlist = [];
+ $('body').append($dlg)
+ var buttonlist = []
switch (buttons) {
- case Dialogs.YES_NO_BUTTONS:
- buttonlist = [{
- text: t('core', 'No'),
- click: function () {
- if (callback !== undefined) {
- callback(false);
- }
- $(dialogId).ocdialog('close');
- }
- },
- {
- text: t('core', 'Yes'),
- click: function () {
- if (callback !== undefined) {
- callback(true);
- }
- $(dialogId).ocdialog('close');
- },
- defaultButton: true
- }];
- break;
- case Dialogs.OK_BUTTON:
- var functionToCall = function () {
- $(dialogId).ocdialog('close');
+ case Dialogs.YES_NO_BUTTONS:
+ buttonlist = [{
+ text: t('core', 'No'),
+ click: function() {
if (callback !== undefined) {
- callback();
+ callback(false)
}
- };
- buttonlist[0] = {
- text: t('core', 'OK'),
- click: functionToCall,
- defaultButton: true
- };
- break;
+ $(dialogId).ocdialog('close')
+ }
+ },
+ {
+ text: t('core', 'Yes'),
+ click: function() {
+ if (callback !== undefined) {
+ callback(true)
+ }
+ $(dialogId).ocdialog('close')
+ },
+ defaultButton: true
+ }]
+ break
+ case Dialogs.OK_BUTTON:
+ var functionToCall = function() {
+ $(dialogId).ocdialog('close')
+ if (callback !== undefined) {
+ callback()
+ }
+ }
+ buttonlist[0] = {
+ text: t('core', 'OK'),
+ click: functionToCall,
+ defaultButton: true
+ }
+ break
}
$(dialogId).ocdialog({
closeOnEscape: true,
modal: modal,
buttons: buttonlist
- });
- Dialogs.dialogsCounter++;
+ })
+ Dialogs.dialogsCounter++
})
- .fail(function (status, error) {
+ .fail(function(status, error) {
// If the method is called while navigating away from
// the page, we still want to deliver the message.
if (status === 0) {
- alert(title + ': ' + content);
+ alert(title + ': ' + content)
} else {
- alert(t('core', 'Error loading message template: {error}', {error: error}));
+ alert(t('core', 'Error loading message template: {error}', { error: error }))
}
- });
+ })
},
_fileexistsshown: false,
/**
@@ -556,64 +560,64 @@ const Dialogs = {
* @param {object} original file with name, size and mtime
* @param {object} replacement file with name, size and mtime
* @param {object} controller with onCancel, onSkip, onReplace and onRename methods
- * @return {Promise} jquery promise that resolves after the dialog template was loaded
+ * @returns {Promise} jquery promise that resolves after the dialog template was loaded
*/
- fileexists: function (data, original, replacement, controller) {
- var self = this;
- var dialogDeferred = new $.Deferred();
+ fileexists: function(data, original, replacement, controller) {
+ var self = this
+ var dialogDeferred = new $.Deferred()
- var getCroppedPreview = function (file) {
- var deferred = new $.Deferred();
+ var getCroppedPreview = function(file) {
+ var deferred = new $.Deferred()
// Only process image files.
- var type = file.type && file.type.split('/').shift();
+ var type = file.type && file.type.split('/').shift()
if (window.FileReader && type === 'image') {
- var reader = new FileReader();
- reader.onload = function (e) {
- var blob = new Blob([e.target.result]);
- window.URL = window.URL || window.webkitURL;
- var originalUrl = window.URL.createObjectURL(blob);
- var image = new Image();
- image.src = originalUrl;
- image.onload = function () {
- var url = crop(image);
- deferred.resolve(url);
- };
- };
- reader.readAsArrayBuffer(file);
+ var reader = new FileReader()
+ reader.onload = function(e) {
+ var blob = new Blob([e.target.result])
+ window.URL = window.URL || window.webkitURL
+ var originalUrl = window.URL.createObjectURL(blob)
+ var image = new Image()
+ image.src = originalUrl
+ image.onload = function() {
+ var url = crop(image)
+ deferred.resolve(url)
+ }
+ }
+ reader.readAsArrayBuffer(file)
} else {
- deferred.reject();
+ deferred.reject()
}
- return deferred;
- };
+ return deferred
+ }
- var crop = function (img) {
- var canvas = document.createElement('canvas'),
- targetSize = 96,
- width = img.width,
- height = img.height,
- x, y, size;
+ var crop = function(img) {
+ var canvas = document.createElement('canvas')
+ var targetSize = 96
+ var width = img.width
+ var height = img.height
+ var x; var y; var size
// Calculate the width and height, constraining the proportions
if (width > height) {
- y = 0;
- x = (width - height) / 2;
+ y = 0
+ x = (width - height) / 2
} else {
- y = (height - width) / 2;
- x = 0;
+ y = (height - width) / 2
+ x = 0
}
- size = Math.min(width, height);
+ size = Math.min(width, height)
// Set canvas size to the cropped area
- canvas.width = size;
- canvas.height = size;
- var ctx = canvas.getContext("2d");
- ctx.drawImage(img, x, y, size, size, 0, 0, size, size);
+ canvas.width = size
+ canvas.height = size
+ var ctx = canvas.getContext('2d')
+ ctx.drawImage(img, x, y, size, size, 0, 0, size, size)
// Resize the canvas to match the destination (right size uses 96px)
- resampleHermite(canvas, size, size, targetSize, targetSize);
+ resampleHermite(canvas, size, size, targetSize, targetSize)
- return canvas.toDataURL("image/png", 0.7);
- };
+ return canvas.toDataURL('image/png', 0.7)
+ }
/**
* Fast image resize/resample using Hermite filter with JavaScript.
@@ -626,130 +630,129 @@ const Dialogs = {
* @param {number} W2
* @param {number} H2
*/
- var resampleHermite = function (canvas, W, H, W2, H2) {
- W2 = Math.round(W2);
- H2 = Math.round(H2);
- var img = canvas.getContext("2d").getImageData(0, 0, W, H);
- var img2 = canvas.getContext("2d").getImageData(0, 0, W2, H2);
- var data = img.data;
- var data2 = img2.data;
- var ratio_w = W / W2;
- var ratio_h = H / H2;
- var ratio_w_half = Math.ceil(ratio_w / 2);
- var ratio_h_half = Math.ceil(ratio_h / 2);
+ var resampleHermite = function(canvas, W, H, W2, H2) {
+ W2 = Math.round(W2)
+ H2 = Math.round(H2)
+ var img = canvas.getContext('2d').getImageData(0, 0, W, H)
+ var img2 = canvas.getContext('2d').getImageData(0, 0, W2, H2)
+ var data = img.data
+ var data2 = img2.data
+ var ratio_w = W / W2
+ var ratio_h = H / H2
+ var ratio_w_half = Math.ceil(ratio_w / 2)
+ var ratio_h_half = Math.ceil(ratio_h / 2)
for (var j = 0; j < H2; j++) {
for (var i = 0; i < W2; i++) {
- var x2 = (i + j * W2) * 4;
- var weight = 0;
- var weights = 0;
- var weights_alpha = 0;
- var gx_r = 0;
- var gx_g = 0;
- var gx_b = 0;
- var gx_a = 0;
- var center_y = (j + 0.5) * ratio_h;
+ var x2 = (i + j * W2) * 4
+ var weight = 0
+ var weights = 0
+ var weights_alpha = 0
+ var gx_r = 0
+ var gx_g = 0
+ var gx_b = 0
+ var gx_a = 0
+ var center_y = (j + 0.5) * ratio_h
for (var yy = Math.floor(j * ratio_h); yy < (j + 1) * ratio_h; yy++) {
- var dy = Math.abs(center_y - (yy + 0.5)) / ratio_h_half;
- var center_x = (i + 0.5) * ratio_w;
- var w0 = dy * dy; //pre-calc part of w
+ var dy = Math.abs(center_y - (yy + 0.5)) / ratio_h_half
+ var center_x = (i + 0.5) * ratio_w
+ var w0 = dy * dy // pre-calc part of w
for (var xx = Math.floor(i * ratio_w); xx < (i + 1) * ratio_w; xx++) {
- var dx = Math.abs(center_x - (xx + 0.5)) / ratio_w_half;
- var w = Math.sqrt(w0 + dx * dx);
+ var dx = Math.abs(center_x - (xx + 0.5)) / ratio_w_half
+ var w = Math.sqrt(w0 + dx * dx)
if (w >= -1 && w <= 1) {
- //hermite filter
- weight = 2 * w * w * w - 3 * w * w + 1;
+ // hermite filter
+ weight = 2 * w * w * w - 3 * w * w + 1
if (weight > 0) {
- dx = 4 * (xx + yy * W);
- //alpha
- gx_a += weight * data[dx + 3];
- weights_alpha += weight;
- //colors
- if (data[dx + 3] < 255)
- weight = weight * data[dx + 3] / 250;
- gx_r += weight * data[dx];
- gx_g += weight * data[dx + 1];
- gx_b += weight * data[dx + 2];
- weights += weight;
+ dx = 4 * (xx + yy * W)
+ // alpha
+ gx_a += weight * data[dx + 3]
+ weights_alpha += weight
+ // colors
+ if (data[dx + 3] < 255) { weight = weight * data[dx + 3] / 250 }
+ gx_r += weight * data[dx]
+ gx_g += weight * data[dx + 1]
+ gx_b += weight * data[dx + 2]
+ weights += weight
}
}
}
}
- data2[x2] = gx_r / weights;
- data2[x2 + 1] = gx_g / weights;
- data2[x2 + 2] = gx_b / weights;
- data2[x2 + 3] = gx_a / weights_alpha;
+ data2[x2] = gx_r / weights
+ data2[x2 + 1] = gx_g / weights
+ data2[x2 + 2] = gx_b / weights
+ data2[x2 + 3] = gx_a / weights_alpha
}
}
- canvas.getContext("2d").clearRect(0, 0, Math.max(W, W2), Math.max(H, H2));
- canvas.width = W2;
- canvas.height = H2;
- canvas.getContext("2d").putImageData(img2, 0, 0);
- };
+ canvas.getContext('2d').clearRect(0, 0, Math.max(W, W2), Math.max(H, H2))
+ canvas.width = W2
+ canvas.height = H2
+ canvas.getContext('2d').putImageData(img2, 0, 0)
+ }
- var addConflict = function ($conflicts, original, replacement) {
+ var addConflict = function($conflicts, original, replacement) {
- var $conflict = $conflicts.find('.template').clone().removeClass('template').addClass('conflict');
- var $originalDiv = $conflict.find('.original');
- var $replacementDiv = $conflict.find('.replacement');
+ var $conflict = $conflicts.find('.template').clone().removeClass('template').addClass('conflict')
+ var $originalDiv = $conflict.find('.original')
+ var $replacementDiv = $conflict.find('.replacement')
- $conflict.data('data', data);
+ $conflict.data('data', data)
- $conflict.find('.filename').text(original.name);
- $originalDiv.find('.size').text(humanFileSize(original.size));
- $originalDiv.find('.mtime').text(formatDate(original.mtime));
+ $conflict.find('.filename').text(original.name)
+ $originalDiv.find('.size').text(humanFileSize(original.size))
+ $originalDiv.find('.mtime').text(formatDate(original.mtime))
// ie sucks
if (replacement.size && replacement.lastModifiedDate) {
- $replacementDiv.find('.size').text(humanFileSize(replacement.size));
- $replacementDiv.find('.mtime').text(formatDate(replacement.lastModifiedDate));
+ $replacementDiv.find('.size').text(humanFileSize(replacement.size))
+ $replacementDiv.find('.mtime').text(formatDate(replacement.lastModifiedDate))
}
- var path = original.directory + '/' + original.name;
+ var path = original.directory + '/' + original.name
var urlSpec = {
file: path,
x: 96,
y: 96,
c: original.etag,
forceIcon: 0
- };
- var previewpath = Files.generatePreviewUrl(urlSpec);
+ }
+ var previewpath = Files.generatePreviewUrl(urlSpec)
// Escaping single quotes
- previewpath = previewpath.replace(/'/g, "%27");
- $originalDiv.find('.icon').css({"background-image": "url('" + previewpath + "')"});
+ previewpath = previewpath.replace(/'/g, '%27')
+ $originalDiv.find('.icon').css({ 'background-image': "url('" + previewpath + "')" })
getCroppedPreview(replacement).then(
- function (path) {
- $replacementDiv.find('.icon').css('background-image', 'url(' + path + ')');
- }, function () {
- path = OC.MimeType.getIconUrl(replacement.type);
- $replacementDiv.find('.icon').css('background-image', 'url(' + path + ')');
+ function(path) {
+ $replacementDiv.find('.icon').css('background-image', 'url(' + path + ')')
+ }, function() {
+ path = OC.MimeType.getIconUrl(replacement.type)
+ $replacementDiv.find('.icon').css('background-image', 'url(' + path + ')')
}
- );
+ )
// connect checkboxes with labels
- var checkboxId = $conflicts.find('.conflict').length;
- $originalDiv.find('input:checkbox').attr('id', 'checkbox_original_' + checkboxId);
- $replacementDiv.find('input:checkbox').attr('id', 'checkbox_replacement_' + checkboxId);
+ var checkboxId = $conflicts.find('.conflict').length
+ $originalDiv.find('input:checkbox').attr('id', 'checkbox_original_' + checkboxId)
+ $replacementDiv.find('input:checkbox').attr('id', 'checkbox_replacement_' + checkboxId)
- $conflicts.append($conflict);
+ $conflicts.append($conflict)
- //set more recent mtime bold
+ // set more recent mtime bold
// ie sucks
if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() > original.mtime) {
- $replacementDiv.find('.mtime').css('font-weight', 'bold');
+ $replacementDiv.find('.mtime').css('font-weight', 'bold')
} else if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() < original.mtime) {
- $originalDiv.find('.mtime').css('font-weight', 'bold');
+ $originalDiv.find('.mtime').css('font-weight', 'bold')
} else {
- //TODO add to same mtime collection?
+ // TODO add to same mtime collection?
}
// set bigger size bold
if (replacement.size && replacement.size > original.size) {
- $replacementDiv.find('.size').css('font-weight', 'bold');
+ $replacementDiv.find('.size').css('font-weight', 'bold')
} else if (replacement.size && replacement.size < original.size) {
- $originalDiv.find('.size').css('font-weight', 'bold');
+ $originalDiv.find('.size').css('font-weight', 'bold')
} else {
- //TODO add to same size collection?
+ // TODO add to same size collection?
}
- //TODO show skip action for files with same size and mtime in bottom row
+ // TODO show skip action for files with same size and mtime in bottom row
// always keep readonly files
@@ -758,40 +761,40 @@ const Dialogs = {
.addClass('readonly')
.find('input[type="checkbox"]')
.prop('checked', true)
- .prop('disabled', true);
+ .prop('disabled', true)
$originalDiv.find('.message')
- .text(t('core', 'read-only'));
+ .text(t('core', 'read-only'))
}
- };
- //var selection = controller.getSelection(data.originalFiles);
- //if (selection.defaultAction) {
+ }
+ // var selection = controller.getSelection(data.originalFiles);
+ // if (selection.defaultAction) {
// controller[selection.defaultAction](data);
- //} else {
- var dialogName = 'oc-dialog-fileexists-content';
- var dialogId = '#' + dialogName;
+ // } else {
+ var dialogName = 'oc-dialog-fileexists-content'
+ var dialogId = '#' + dialogName
if (this._fileexistsshown) {
// add conflict
- var $conflicts = $(dialogId + ' .conflicts');
- addConflict($conflicts, original, replacement);
+ var $conflicts = $(dialogId + ' .conflicts')
+ addConflict($conflicts, original, replacement)
- var count = $(dialogId + ' .conflict').length;
+ var count = $(dialogId + ' .conflict').length
var title = n('core',
'{count} file conflict',
'{count} file conflicts',
count,
- {count: count}
- );
- $(dialogId).parent().children('.oc-dialog-title').text(title);
+ { count: count }
+ )
+ $(dialogId).parent().children('.oc-dialog-title').text(title)
- //recalculate dimensions
- $(window).trigger('resize');
- dialogDeferred.resolve();
+ // recalculate dimensions
+ $(window).trigger('resize')
+ dialogDeferred.resolve()
} else {
- //create dialog
- this._fileexistsshown = true;
- $.when(this._getFileExistsTemplate()).then(function ($tmpl) {
- var title = t('core', 'One file conflict');
+ // create dialog
+ this._fileexistsshown = true
+ $.when(this._getFileExistsTemplate()).then(function($tmpl) {
+ var title = t('core', 'One file conflict')
var $dlg = $tmpl.octemplate({
dialog_name: dialogName,
title: title,
@@ -802,34 +805,34 @@ const Dialogs = {
why: t('core', 'Which files do you want to keep?'),
what: t('core', 'If you select both versions, the copied file will have a number added to its name.')
- });
- $('body').append($dlg);
+ })
+ $('body').append($dlg)
if (original && replacement) {
- var $conflicts = $dlg.find('.conflicts');
- addConflict($conflicts, original, replacement);
+ var $conflicts = $dlg.find('.conflicts')
+ addConflict($conflicts, original, replacement)
}
var buttonlist = [{
text: t('core', 'Cancel'),
classes: 'cancel',
- click: function () {
+ click: function() {
if (typeof controller.onCancel !== 'undefined') {
- controller.onCancel(data);
+ controller.onCancel(data)
}
- $(dialogId).ocdialog('close');
+ $(dialogId).ocdialog('close')
}
},
- {
- text: t('core', 'Continue'),
- classes: 'continue',
- click: function () {
- if (typeof controller.onContinue !== 'undefined') {
- controller.onContinue($(dialogId + ' .conflict'));
- }
- $(dialogId).ocdialog('close');
+ {
+ text: t('core', 'Continue'),
+ classes: 'continue',
+ click: function() {
+ if (typeof controller.onContinue !== 'undefined') {
+ controller.onContinue($(dialogId + ' .conflict'))
}
- }];
+ $(dialogId).ocdialog('close')
+ }
+ }]
$(dialogId).ocdialog({
width: 500,
@@ -837,157 +840,157 @@ const Dialogs = {
modal: true,
buttons: buttonlist,
closeButton: null,
- close: function () {
- self._fileexistsshown = false;
- $(this).ocdialog('destroy').remove();
+ close: function() {
+ self._fileexistsshown = false
+ $(this).ocdialog('destroy').remove()
}
- });
+ })
- $(dialogId).css('height', 'auto');
+ $(dialogId).css('height', 'auto')
- var $primaryButton = $dlg.closest('.oc-dialog').find('button.continue');
- $primaryButton.prop('disabled', true);
+ var $primaryButton = $dlg.closest('.oc-dialog').find('button.continue')
+ $primaryButton.prop('disabled', true)
- function updatePrimaryButton () {
- var checkedCount = $dlg.find('.conflicts .checkbox:checked').length;
- $primaryButton.prop('disabled', checkedCount === 0);
+ function updatePrimaryButton() {
+ var checkedCount = $dlg.find('.conflicts .checkbox:checked').length
+ $primaryButton.prop('disabled', checkedCount === 0)
}
- //add checkbox toggling actions
- $(dialogId).find('.allnewfiles').on('click', function () {
- var $checkboxes = $(dialogId).find('.conflict .replacement input[type="checkbox"]');
- $checkboxes.prop('checked', $(this).prop('checked'));
- });
- $(dialogId).find('.allexistingfiles').on('click', function () {
- var $checkboxes = $(dialogId).find('.conflict .original:not(.readonly) input[type="checkbox"]');
- $checkboxes.prop('checked', $(this).prop('checked'));
- });
- $(dialogId).find('.conflicts').on('click', '.replacement,.original:not(.readonly)', function () {
- var $checkbox = $(this).find('input[type="checkbox"]');
- $checkbox.prop('checked', !$checkbox.prop('checked'));
- });
- $(dialogId).find('.conflicts').on('click', '.replacement input[type="checkbox"],.original:not(.readonly) input[type="checkbox"]', function () {
- var $checkbox = $(this);
- $checkbox.prop('checked', !$checkbox.prop('checked'));
- });
+ // add checkbox toggling actions
+ $(dialogId).find('.allnewfiles').on('click', function() {
+ var $checkboxes = $(dialogId).find('.conflict .replacement input[type="checkbox"]')
+ $checkboxes.prop('checked', $(this).prop('checked'))
+ })
+ $(dialogId).find('.allexistingfiles').on('click', function() {
+ var $checkboxes = $(dialogId).find('.conflict .original:not(.readonly) input[type="checkbox"]')
+ $checkboxes.prop('checked', $(this).prop('checked'))
+ })
+ $(dialogId).find('.conflicts').on('click', '.replacement,.original:not(.readonly)', function() {
+ var $checkbox = $(this).find('input[type="checkbox"]')
+ $checkbox.prop('checked', !$checkbox.prop('checked'))
+ })
+ $(dialogId).find('.conflicts').on('click', '.replacement input[type="checkbox"],.original:not(.readonly) input[type="checkbox"]', function() {
+ var $checkbox = $(this)
+ $checkbox.prop('checked', !$checkbox.prop('checked'))
+ })
- //update counters
- $(dialogId).on('click', '.replacement,.allnewfiles', function () {
- var count = $(dialogId).find('.conflict .replacement input[type="checkbox"]:checked').length;
+ // update counters
+ $(dialogId).on('click', '.replacement,.allnewfiles', function() {
+ var count = $(dialogId).find('.conflict .replacement input[type="checkbox"]:checked').length
if (count === $(dialogId + ' .conflict').length) {
- $(dialogId).find('.allnewfiles').prop('checked', true);
- $(dialogId).find('.allnewfiles + .count').text(t('core', '(all selected)'));
+ $(dialogId).find('.allnewfiles').prop('checked', true)
+ $(dialogId).find('.allnewfiles + .count').text(t('core', '(all selected)'))
} else if (count > 0) {
- $(dialogId).find('.allnewfiles').prop('checked', false);
- $(dialogId).find('.allnewfiles + .count').text(t('core', '({count} selected)', {count: count}));
+ $(dialogId).find('.allnewfiles').prop('checked', false)
+ $(dialogId).find('.allnewfiles + .count').text(t('core', '({count} selected)', { count: count }))
} else {
- $(dialogId).find('.allnewfiles').prop('checked', false);
- $(dialogId).find('.allnewfiles + .count').text('');
+ $(dialogId).find('.allnewfiles').prop('checked', false)
+ $(dialogId).find('.allnewfiles + .count').text('')
}
- updatePrimaryButton();
- });
- $(dialogId).on('click', '.original,.allexistingfiles', function () {
- var count = $(dialogId).find('.conflict .original input[type="checkbox"]:checked').length;
+ updatePrimaryButton()
+ })
+ $(dialogId).on('click', '.original,.allexistingfiles', function() {
+ var count = $(dialogId).find('.conflict .original input[type="checkbox"]:checked').length
if (count === $(dialogId + ' .conflict').length) {
- $(dialogId).find('.allexistingfiles').prop('checked', true);
- $(dialogId).find('.allexistingfiles + .count').text(t('core', '(all selected)'));
+ $(dialogId).find('.allexistingfiles').prop('checked', true)
+ $(dialogId).find('.allexistingfiles + .count').text(t('core', '(all selected)'))
} else if (count > 0) {
- $(dialogId).find('.allexistingfiles').prop('checked', false);
+ $(dialogId).find('.allexistingfiles').prop('checked', false)
$(dialogId).find('.allexistingfiles + .count')
- .text(t('core', '({count} selected)', {count: count}));
+ .text(t('core', '({count} selected)', { count: count }))
} else {
- $(dialogId).find('.allexistingfiles').prop('checked', false);
- $(dialogId).find('.allexistingfiles + .count').text('');
+ $(dialogId).find('.allexistingfiles').prop('checked', false)
+ $(dialogId).find('.allexistingfiles + .count').text('')
}
- updatePrimaryButton();
- });
+ updatePrimaryButton()
+ })
- dialogDeferred.resolve();
+ dialogDeferred.resolve()
})
- .fail(function () {
- dialogDeferred.reject();
- alert(t('core', 'Error loading file exists template'));
- });
+ .fail(function() {
+ dialogDeferred.reject()
+ alert(t('core', 'Error loading file exists template'))
+ })
}
- //}
- return dialogDeferred.promise();
+ // }
+ return dialogDeferred.promise()
},
// get the gridview setting and set the input accordingly
- _getGridSettings: function () {
- var self = this;
- $.get(OC.generateUrl('/apps/files/api/v1/showgridview'), function (response) {
- self.$showGridView.get(0).checked = response.gridview;
+ _getGridSettings: function() {
+ var self = this
+ $.get(OC.generateUrl('/apps/files/api/v1/showgridview'), function(response) {
+ self.$showGridView.get(0).checked = response.gridview
self.$showGridView.next('#picker-view-toggle')
.removeClass('icon-toggle-filelist icon-toggle-pictures')
.addClass(response.gridview ? 'icon-toggle-filelist' : 'icon-toggle-pictures')
- $('.list-container').toggleClass('view-grid', response.gridview);
- });
+ $('.list-container').toggleClass('view-grid', response.gridview)
+ })
},
- _onGridviewChange: function () {
- var show = this.$showGridView.is(':checked');
+ _onGridviewChange: function() {
+ var show = this.$showGridView.is(':checked')
// only save state if user is logged in
if (OC.currentUser) {
$.post(OC.generateUrl('/apps/files/api/v1/showgridview'), {
show: show
- });
+ })
}
this.$showGridView.next('#picker-view-toggle')
.removeClass('icon-toggle-filelist icon-toggle-pictures')
.addClass(show ? 'icon-toggle-filelist' : 'icon-toggle-pictures')
- $('.list-container').toggleClass('view-grid', show);
+ $('.list-container').toggleClass('view-grid', show)
},
- _getFilePickerTemplate: function () {
- var defer = $.Deferred();
+ _getFilePickerTemplate: function() {
+ var defer = $.Deferred()
if (!this.$filePickerTemplate) {
- var self = this;
- $.get(OC.filePath('core', 'templates', 'filepicker.html'), function (tmpl) {
- self.$filePickerTemplate = $(tmpl);
- self.$listTmpl = self.$filePickerTemplate.find('.filelist tbody tr:first-child').detach();
- defer.resolve(self.$filePickerTemplate);
+ var self = this
+ $.get(OC.filePath('core', 'templates', 'filepicker.html'), function(tmpl) {
+ self.$filePickerTemplate = $(tmpl)
+ self.$listTmpl = self.$filePickerTemplate.find('.filelist tbody tr:first-child').detach()
+ defer.resolve(self.$filePickerTemplate)
})
- .fail(function (jqXHR, textStatus, errorThrown) {
- defer.reject(jqXHR.status, errorThrown);
- });
+ .fail(function(jqXHR, textStatus, errorThrown) {
+ defer.reject(jqXHR.status, errorThrown)
+ })
} else {
- defer.resolve(this.$filePickerTemplate);
+ defer.resolve(this.$filePickerTemplate)
}
- return defer.promise();
+ return defer.promise()
},
- _getMessageTemplate: function () {
- var defer = $.Deferred();
+ _getMessageTemplate: function() {
+ var defer = $.Deferred()
if (!this.$messageTemplate) {
- var self = this;
- $.get(OC.filePath('core', 'templates', 'message.html'), function (tmpl) {
- self.$messageTemplate = $(tmpl);
- defer.resolve(self.$messageTemplate);
+ var self = this
+ $.get(OC.filePath('core', 'templates', 'message.html'), function(tmpl) {
+ self.$messageTemplate = $(tmpl)
+ defer.resolve(self.$messageTemplate)
})
- .fail(function (jqXHR, textStatus, errorThrown) {
- defer.reject(jqXHR.status, errorThrown);
- });
+ .fail(function(jqXHR, textStatus, errorThrown) {
+ defer.reject(jqXHR.status, errorThrown)
+ })
} else {
- defer.resolve(this.$messageTemplate);
+ defer.resolve(this.$messageTemplate)
}
- return defer.promise();
+ return defer.promise()
},
- _getFileExistsTemplate: function () {
- var defer = $.Deferred();
+ _getFileExistsTemplate: function() {
+ var defer = $.Deferred()
if (!this.$fileexistsTemplate) {
- var self = this;
- $.get(OC.filePath('files', 'templates', 'fileexists.html'), function (tmpl) {
- self.$fileexistsTemplate = $(tmpl);
- defer.resolve(self.$fileexistsTemplate);
+ var self = this
+ $.get(OC.filePath('files', 'templates', 'fileexists.html'), function(tmpl) {
+ self.$fileexistsTemplate = $(tmpl)
+ defer.resolve(self.$fileexistsTemplate)
})
- .fail(function () {
- defer.reject();
- });
+ .fail(function() {
+ defer.reject()
+ })
} else {
- defer.resolve(this.$fileexistsTemplate);
+ defer.resolve(this.$fileexistsTemplate)
}
- return defer.promise();
+ return defer.promise()
},
- _getFileList: function (dir, mimeType) { //this is only used by the spreedme app atm
- if (typeof (mimeType) === "string") {
- mimeType = [mimeType];
+ _getFileList: function(dir, mimeType) { // this is only used by the spreedme app atm
+ if (typeof (mimeType) === 'string') {
+ mimeType = [mimeType]
}
return $.getJSON(
@@ -996,88 +999,88 @@ const Dialogs = {
dir: dir,
mimetypes: JSON.stringify(mimeType)
}
- );
+ )
},
/**
* fills the filepicker with files
*/
- _fillFilePicker: function (dir) {
- var self = this;
- this.$filelist.empty();
- this.$filePicker.find('.emptycontent').hide();
- this.$filelistContainer.addClass('icon-loading');
- this.$filePicker.data('path', dir);
- var filter = this.$filePicker.data('mimetype');
- if (typeof (filter) === "string") {
- filter = [filter];
+ _fillFilePicker: function(dir) {
+ var self = this
+ this.$filelist.empty()
+ this.$filePicker.find('.emptycontent').hide()
+ this.$filelistContainer.addClass('icon-loading')
+ this.$filePicker.data('path', dir)
+ var filter = this.$filePicker.data('mimetype')
+ if (typeof (filter) === 'string') {
+ filter = [filter]
}
- self.$fileListHeader.find('.sort-indicator').addClass('hidden').removeClass('icon-triangle-n').removeClass('icon-triangle-s');
- self.$fileListHeader.find('[data-sort=' + self.filepicker.sortField + '] .sort-indicator').removeClass('hidden');
+ self.$fileListHeader.find('.sort-indicator').addClass('hidden').removeClass('icon-triangle-n').removeClass('icon-triangle-s')
+ self.$fileListHeader.find('[data-sort=' + self.filepicker.sortField + '] .sort-indicator').removeClass('hidden')
if (self.filepicker.sortOrder === 'asc') {
- self.$fileListHeader.find('[data-sort=' + self.filepicker.sortField + '] .sort-indicator').addClass('icon-triangle-n');
+ self.$fileListHeader.find('[data-sort=' + self.filepicker.sortField + '] .sort-indicator').addClass('icon-triangle-n')
} else {
- self.$fileListHeader.find('[data-sort=' + self.filepicker.sortField + '] .sort-indicator').addClass('icon-triangle-s');
+ self.$fileListHeader.find('[data-sort=' + self.filepicker.sortField + '] .sort-indicator').addClass('icon-triangle-s')
}
- self.filepicker.filesClient.getFolderContents(dir).then(function (status, files) {
- self.filelist = files;
+ self.filepicker.filesClient.getFolderContents(dir).then(function(status, files) {
+ self.filelist = files
if (filter && filter.length > 0 && filter.indexOf('*') === -1) {
- files = files.filter(function (file) {
- return file.type === 'dir' || filter.indexOf(file.mimetype) !== -1;
- });
+ files = files.filter(function(file) {
+ return file.type === 'dir' || filter.indexOf(file.mimetype) !== -1
+ })
}
var Comparators = {
- name: function (fileInfo1, fileInfo2) {
+ name: function(fileInfo1, fileInfo2) {
if (fileInfo1.type === 'dir' && fileInfo2.type !== 'dir') {
- return -1;
+ return -1
}
if (fileInfo1.type !== 'dir' && fileInfo2.type === 'dir') {
- return 1;
+ return 1
}
- return OC.Util.naturalSortCompare(fileInfo1.name, fileInfo2.name);
+ return OC.Util.naturalSortCompare(fileInfo1.name, fileInfo2.name)
},
- size: function (fileInfo1, fileInfo2) {
- return fileInfo1.size - fileInfo2.size;
+ size: function(fileInfo1, fileInfo2) {
+ return fileInfo1.size - fileInfo2.size
},
- mtime: function (fileInfo1, fileInfo2) {
- return fileInfo1.mtime - fileInfo2.mtime;
+ mtime: function(fileInfo1, fileInfo2) {
+ return fileInfo1.mtime - fileInfo2.mtime
+ }
+ }
+ var comparator = Comparators[self.filepicker.sortField] || Comparators.name
+ files = files.sort(function(file1, file2) {
+ var isFavorite = function(fileInfo) {
+ return fileInfo.tags && fileInfo.tags.indexOf(OC.TAG_FAVORITE) >= 0
}
- };
- var comparator = Comparators[self.filepicker.sortField] || Comparators.name;
- files = files.sort(function (file1, file2) {
- var isFavorite = function (fileInfo) {
- return fileInfo.tags && fileInfo.tags.indexOf(OC.TAG_FAVORITE) >= 0;
- };
if (isFavorite(file1) && !isFavorite(file2)) {
- return -1;
+ return -1
} else if (!isFavorite(file1) && isFavorite(file2)) {
- return 1;
+ return 1
}
- return self.filepicker.sortOrder === 'asc' ? comparator(file1, file2) : -comparator(file1, file2);
- });
+ return self.filepicker.sortOrder === 'asc' ? comparator(file1, file2) : -comparator(file1, file2)
+ })
- self._fillSlug();
+ self._fillSlug()
if (files.length === 0) {
- self.$filePicker.find('.emptycontent').show();
- self.$fileListHeader.hide();
+ self.$filePicker.find('.emptycontent').show()
+ self.$fileListHeader.hide()
} else {
- self.$filePicker.find('.emptycontent').hide();
- self.$fileListHeader.show();
+ self.$filePicker.find('.emptycontent').hide()
+ self.$fileListHeader.show()
}
- $.each(files, function (idx, entry) {
- entry.icon = OC.MimeType.getIconUrl(entry.mimetype);
- var simpleSize, sizeColor;
+ $.each(files, function(idx, entry) {
+ entry.icon = OC.MimeType.getIconUrl(entry.mimetype)
+ var simpleSize, sizeColor
if (typeof (entry.size) !== 'undefined' && entry.size >= 0) {
- simpleSize = humanFileSize(parseInt(entry.size, 10), true);
- sizeColor = Math.round(160 - Math.pow((entry.size / (1024 * 1024)), 2));
+ simpleSize = humanFileSize(parseInt(entry.size, 10), true)
+ sizeColor = Math.round(160 - Math.pow((entry.size / (1024 * 1024)), 2))
} else {
- simpleSize = t('files', 'Pending');
- sizeColor = 80;
+ simpleSize = t('files', 'Pending')
+ sizeColor = 80
}
// split the filename in half if the size is bigger than 20 char
@@ -1102,90 +1105,90 @@ const Dialogs = {
size: simpleSize,
sizeColor: sizeColor,
icon: entry.icon
- });
+ })
if (entry.type === 'file') {
var urlSpec = {
file: dir + '/' + entry.name,
x: 100,
y: 100
- };
- var img = new Image();
- var previewUrl = OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
- img.onload = function () {
+ }
+ var img = new Image()
+ var previewUrl = OC.generateUrl('/core/preview.png?') + $.param(urlSpec)
+ img.onload = function() {
if (img.width > 5) {
- $row.find('td.filename').attr('style', 'background-image:url(' + previewUrl + ')');
+ $row.find('td.filename').attr('style', 'background-image:url(' + previewUrl + ')')
}
- };
- img.src = previewUrl;
+ }
+ img.src = previewUrl
}
- self.$filelist.append($row);
- });
+ self.$filelist.append($row)
+ })
- self.$filelistContainer.removeClass('icon-loading');
- });
+ self.$filelistContainer.removeClass('icon-loading')
+ })
},
/**
* fills the tree list with directories
*/
- _fillSlug: function () {
- this.$dirTree.empty();
- var self = this;
- var dir;
- var path = this.$filePicker.data('path');
- var $template = $('').addClass('crumb');
+ _fillSlug: function() {
+ this.$dirTree.empty()
+ var self = this
+ var dir
+ var path = this.$filePicker.data('path')
+ var $template = $('').addClass('crumb')
if (path) {
- var paths = path.split('/');
- $.each(paths, function (index, dir) {
- dir = paths.pop();
+ var paths = path.split('/')
+ $.each(paths, function(index, dir) {
+ dir = paths.pop()
if (dir === '') {
- return false;
+ return false
}
self.$dirTree.prepend($template.octemplate({
dir: paths.join('/') + '/' + dir,
name: dir
- }));
- });
+ }))
+ })
}
$template.octemplate({
dir: '',
name: '' // Ugly but works ;)
- }, {escapeFunction: null}).prependTo(this.$dirTree);
+ }, { escapeFunction: null }).prependTo(this.$dirTree)
},
/**
* handle selection made in the tree list
*/
- _handleTreeListSelect: function (event, type) {
- var self = event.data;
- var dir = $(event.target).closest('.crumb').data('dir');
- self._fillFilePicker(dir);
- var getOcDialog = (event.target).closest('.oc-dialog');
- var buttonEnableDisable = $('.primary', getOcDialog);
- this._changeButtonsText(type, dir.split(/[/]+/).pop());
- if (this.$filePicker.data('mimetype').indexOf("httpd/unix-directory") !== -1) {
- buttonEnableDisable.prop("disabled", false);
+ _handleTreeListSelect: function(event, type) {
+ var self = event.data
+ var dir = $(event.target).closest('.crumb').data('dir')
+ self._fillFilePicker(dir)
+ var getOcDialog = (event.target).closest('.oc-dialog')
+ var buttonEnableDisable = $('.primary', getOcDialog)
+ this._changeButtonsText(type, dir.split(/[/]+/).pop())
+ if (this.$filePicker.data('mimetype').indexOf('httpd/unix-directory') !== -1) {
+ buttonEnableDisable.prop('disabled', false)
} else {
- buttonEnableDisable.prop("disabled", true);
+ buttonEnableDisable.prop('disabled', true)
}
},
/**
* handle clicks made in the filepicker
*/
- _handlePickerClick: function (event, $element, type) {
- var getOcDialog = this.$filePicker.closest('.oc-dialog');
- var buttonEnableDisable = getOcDialog.find('.primary');
+ _handlePickerClick: function(event, $element, type) {
+ var getOcDialog = this.$filePicker.closest('.oc-dialog')
+ var buttonEnableDisable = getOcDialog.find('.primary')
if ($element.data('type') === 'file') {
if (this.$filePicker.data('multiselect') !== true || !event.ctrlKey) {
- this.$filelist.find('.filepicker_element_selected').removeClass('filepicker_element_selected');
+ this.$filelist.find('.filepicker_element_selected').removeClass('filepicker_element_selected')
}
- $element.toggleClass('filepicker_element_selected');
- buttonEnableDisable.prop("disabled", false);
+ $element.toggleClass('filepicker_element_selected')
+ buttonEnableDisable.prop('disabled', false)
} else if ($element.data('type') === 'dir') {
- this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname'));
- this._changeButtonsText(type, $element.data('entryname'));
- if (this.$filePicker.data('mimetype').indexOf("httpd/unix-directory") !== -1 || this.$filePicker.data('allowDirectoryChooser')) {
- buttonEnableDisable.prop("disabled", false);
+ this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname'))
+ this._changeButtonsText(type, $element.data('entryname'))
+ if (this.$filePicker.data('mimetype').indexOf('httpd/unix-directory') !== -1 || this.$filePicker.data('allowDirectoryChooser')) {
+ buttonEnableDisable.prop('disabled', false)
} else {
- buttonEnableDisable.prop("disabled", true);
+ buttonEnableDisable.prop('disabled', true)
}
}
},
@@ -1196,23 +1199,23 @@ const Dialogs = {
* @param dir on which to change buttons text
* @private
*/
- _changeButtonsText: function (type, dir) {
- var copyText = dir === '' ? t('core', 'Copy') : t('core', 'Copy to {folder}', {folder: dir});
- var moveText = dir === '' ? t('core', 'Move') : t('core', 'Move to {folder}', {folder: dir});
- var buttons = $('.oc-dialog-buttonrow button');
+ _changeButtonsText: function(type, dir) {
+ var copyText = dir === '' ? t('core', 'Copy') : t('core', 'Copy to {folder}', { folder: dir })
+ var moveText = dir === '' ? t('core', 'Move') : t('core', 'Move to {folder}', { folder: dir })
+ var buttons = $('.oc-dialog-buttonrow button')
switch (type) {
- case this.FILEPICKER_TYPE_CHOOSE:
- break;
- case this.FILEPICKER_TYPE_COPY:
- buttons.text(copyText);
- break;
- case this.FILEPICKER_TYPE_MOVE:
- buttons.text(moveText);
- break;
- case this.FILEPICKER_TYPE_COPY_MOVE:
- buttons.eq(0).text(copyText);
- buttons.eq(1).text(moveText);
- break;
+ case this.FILEPICKER_TYPE_CHOOSE:
+ break
+ case this.FILEPICKER_TYPE_COPY:
+ buttons.text(copyText)
+ break
+ case this.FILEPICKER_TYPE_MOVE:
+ buttons.text(moveText)
+ break
+ case this.FILEPICKER_TYPE_COPY_MOVE:
+ buttons.eq(0).text(copyText)
+ buttons.eq(1).text(moveText)
+ break
}
}
}
diff --git a/core/src/OC/eventsource.js b/core/src/OC/eventsource.js
index ec70e66501..cc576d8655 100644
--- a/core/src/OC/eventsource.js
+++ b/core/src/OC/eventsource.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/**
* ownCloud
*
@@ -32,7 +33,7 @@
import $ from 'jquery'
-import {getToken} from './requesttoken'
+import { getToken } from './requesttoken'
/**
* Create a new event source
@@ -41,62 +42,62 @@ import {getToken} from './requesttoken'
*
* @constructs OCEventSource
*/
-const OCEventSource = function (src, data) {
- var dataStr = '';
- var name;
- var joinChar;
- this.typelessListeners = [];
- this.closed = false;
- this.listeners = {};
+const OCEventSource = function(src, data) {
+ var dataStr = ''
+ var name
+ var joinChar
+ this.typelessListeners = []
+ this.closed = false
+ this.listeners = {}
if (data) {
for (name in data) {
- dataStr += name + '=' + encodeURIComponent(data[name]) + '&';
+ dataStr += name + '=' + encodeURIComponent(data[name]) + '&'
}
}
- dataStr += 'requesttoken=' + encodeURIComponent(getToken());
+ dataStr += 'requesttoken=' + encodeURIComponent(getToken())
if (!this.useFallBack && typeof EventSource !== 'undefined') {
- joinChar = '&';
+ joinChar = '&'
if (src.indexOf('?') === -1) {
- joinChar = '?';
+ joinChar = '?'
}
- this.source = new EventSource(src + joinChar + dataStr);
- this.source.onmessage = function (e) {
+ this.source = new EventSource(src + joinChar + dataStr)
+ this.source.onmessage = function(e) {
for (var i = 0; i < this.typelessListeners.length; i++) {
- this.typelessListeners[i](JSON.parse(e.data));
+ this.typelessListeners[i](JSON.parse(e.data))
}
- }.bind(this);
+ }.bind(this)
} else {
- var iframeId = 'oc_eventsource_iframe_' + OCEventSource.iframeCount;
- OCEventSource.fallBackSources[OCEventSource.iframeCount] = this;
- this.iframe = $('');
- this.iframe.attr('id', iframeId);
- this.iframe.hide();
+ var iframeId = 'oc_eventsource_iframe_' + OCEventSource.iframeCount
+ OCEventSource.fallBackSources[OCEventSource.iframeCount] = this
+ this.iframe = $('')
+ this.iframe.attr('id', iframeId)
+ this.iframe.hide()
- joinChar = '&';
+ joinChar = '&'
if (src.indexOf('?') === -1) {
- joinChar = '?';
+ joinChar = '?'
}
- this.iframe.attr('src', src + joinChar + 'fallback=true&fallback_id=' + OCEventSource.iframeCount + '&' + dataStr);
- $('body').append(this.iframe);
- this.useFallBack = true;
- OCEventSource.iframeCount++;
+ this.iframe.attr('src', src + joinChar + 'fallback=true&fallback_id=' + OCEventSource.iframeCount + '&' + dataStr)
+ $('body').append(this.iframe)
+ this.useFallBack = true
+ OCEventSource.iframeCount++
}
- //add close listener
- this.listen('__internal__', function (data) {
+ // add close listener
+ this.listen('__internal__', function(data) {
if (data === 'close') {
- this.close();
+ this.close()
}
- }.bind(this));
-};
-OCEventSource.fallBackSources = [];
-OCEventSource.iframeCount = 0;//number of fallback iframes
-OCEventSource.fallBackCallBack = function (id, type, data) {
- OCEventSource.fallBackSources[id].fallBackCallBack(type, data);
-};
+ }.bind(this))
+}
+OCEventSource.fallBackSources = []
+OCEventSource.iframeCount = 0// number of fallback iframes
+OCEventSource.fallBackCallBack = function(id, type, data) {
+ OCEventSource.fallBackSources[id].fallBackCallBack(type, data)
+}
OCEventSource.prototype = {
typelessListeners: [],
iframe: null,
- listeners: {},//only for fallback
+ listeners: {}, // only for fallback
useFallBack: false,
/**
* Fallback callback for browsers that don't have the
@@ -108,63 +109,63 @@ OCEventSource.prototype = {
* @param {String} type event type
* @param {Object} data received data
*/
- fallBackCallBack: function (type, data) {
- var i;
+ fallBackCallBack: function(type, data) {
+ var i
// ignore messages that might appear after closing
if (this.closed) {
- return;
+ return
}
if (type) {
if (typeof this.listeners.done !== 'undefined') {
for (i = 0; i < this.listeners[type].length; i++) {
- this.listeners[type][i](data);
+ this.listeners[type][i](data)
}
}
} else {
for (i = 0; i < this.typelessListeners.length; i++) {
- this.typelessListeners[i](data);
+ this.typelessListeners[i](data)
}
}
},
- lastLength: 0,//for fallback
+ lastLength: 0, // for fallback
/**
* Listen to a given type of events.
*
* @param {String} type event type
* @param {Function} callback event callback
*/
- listen: function (type, callback) {
+ listen: function(type, callback) {
if (callback && callback.call) {
if (type) {
if (this.useFallBack) {
if (!this.listeners[type]) {
- this.listeners[type] = [];
+ this.listeners[type] = []
}
- this.listeners[type].push(callback);
+ this.listeners[type].push(callback)
} else {
- this.source.addEventListener(type, function (e) {
+ this.source.addEventListener(type, function(e) {
if (typeof e.data !== 'undefined') {
- callback(JSON.parse(e.data));
+ callback(JSON.parse(e.data))
} else {
- callback('');
+ callback('')
}
- }, false);
+ }, false)
}
} else {
- this.typelessListeners.push(callback);
+ this.typelessListeners.push(callback)
}
}
},
/**
* Closes this event source.
*/
- close: function () {
- this.closed = true;
+ close: function() {
+ this.closed = true
if (typeof this.source !== 'undefined') {
- this.source.close();
+ this.source.close()
}
}
-};
+}
-export default OCEventSource;
+export default OCEventSource
diff --git a/core/src/OC/get_set.js b/core/src/OC/get_set.js
index 9fafe12138..bf45ce85fc 100644
--- a/core/src/OC/get_set.js
+++ b/core/src/OC/get_set.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -21,8 +21,8 @@
/**
* Get a variable by name
- * @param {string} name
- * @return {*}
+ * @param {string} context context
+ * @returns {Function} getter
*/
export const get = context => name => {
const namespaces = name.split('.')
@@ -39,11 +39,11 @@ export const get = context => name => {
/**
* Set a variable by name
- * @param {string} name
- * @param {*} value
+ * @param {string} context context
+ * @returns {Function} setter
*/
export const set = context => (name, value) => {
- const namespaces = name.split(".")
+ const namespaces = name.split('.')
const tail = namespaces.pop()
for (let i = 0; i < namespaces.length; i++) {
@@ -53,4 +53,5 @@ export const set = context => (name, value) => {
context = context[namespaces[i]]
}
context[tail] = value
+ return value
}
diff --git a/core/src/OC/host.js b/core/src/OC/host.js
index ac02c63a72..f90ca65b4d 100644
--- a/core/src/OC/host.js
+++ b/core/src/OC/host.js
@@ -21,7 +21,7 @@
/**
* Protocol that is used to access this Nextcloud instance
- * @return {string} Used protocol
+ * @returns {string} Used protocol
* @deprecated 17.0.0 use window.location.protocol directly
*/
export const getProtocol = () => window.location.protocol.split(':')[0]
@@ -35,7 +35,7 @@ export const getProtocol = () => window.location.protocol.split(':')[0]
* https://example.com => example.com
* http://example.com:8080 => example.com:8080
*
- * @return {string} host
+ * @returns {string} host
*
* @since 8.2
* @deprecated 17.0.0 use window.location.host directly
@@ -46,7 +46,7 @@ export const getHost = () => window.location.host
* Returns the hostname used to access this Nextcloud instance
* The hostname is always stripped of the port
*
- * @return {string} hostname
+ * @returns {string} hostname
* @since 9.0
* @deprecated 17.0.0 use window.location.hostname directly
*/
@@ -55,7 +55,7 @@ export const getHostName = () => window.location.hostname
/**
* Returns the port number used to access this Nextcloud instance
*
- * @return {int} port number
+ * @returns {int} port number
*
* @since 8.2
* @deprecated 17.0.0 use window.location.port directly
diff --git a/core/src/OC/index.js b/core/src/OC/index.js
index 461e016052..0c95fe3e95 100644
--- a/core/src/OC/index.js
+++ b/core/src/OC/index.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -19,15 +19,15 @@
* along with this program. If not, see
*
* @author 2019 Christoph Wurst
@@ -24,9 +24,9 @@ window._oc_l10n_registry_translations = window._oc_l10n_registry_translations ||
window._oc_l10n_registry_plural_functions = window._oc_l10n_registry_plural_functions || {}
/**
- * @param {String} appId
- * @param {Object} translations
- * @param {Function} pluralFunction
+ * @param {String} appId the app id
+ * @param {Object} translations the translations list
+ * @param {Function} pluralFunction the translations list
*/
const register = (appId, translations, pluralFunction) => {
window._oc_l10n_registry_translations[appId] = translations
@@ -34,9 +34,9 @@ const register = (appId, translations, pluralFunction) => {
}
/**
- * @param {String} appId
- * @param {Object} translations
- * @param {Function} pluralFunction
+ * @param {String} appId the app id
+ * @param {Object} translations the translations list
+ * @param {Function} pluralFunction the translations list
*/
const extend = (appId, translations, pluralFunction) => {
window._oc_l10n_registry_translations[appId] = Object.assign(
@@ -47,9 +47,9 @@ const extend = (appId, translations, pluralFunction) => {
}
/**
- * @param {String} appId
- * @param {Object} translations
- * @param {Function} pluralFunction
+ * @param {String} appId the app id
+ * @param {Object} translations the translations list
+ * @param {Function} pluralFunction the translations list
*/
export const registerAppTranslations = (appId, translations, pluralFunction) => {
if (!hasAppTranslations(appId)) {
@@ -60,7 +60,7 @@ export const registerAppTranslations = (appId, translations, pluralFunction) =>
}
/**
- * @param {String} appId
+ * @param {String} appId the app id
*/
export const unregisterAppTranslations = appId => {
delete window._oc_l10n_registry_translations[appId]
@@ -68,8 +68,8 @@ export const unregisterAppTranslations = appId => {
}
/**
- * @param {String} appId
- * @return {Boolean}
+ * @param {String} appId the app id
+ * @returns {Boolean}
*/
export const hasAppTranslations = appId => {
return window._oc_l10n_registry_translations[appId] !== undefined
@@ -77,12 +77,12 @@ export const hasAppTranslations = appId => {
}
/**
- * @param {String} appId
- * @return {Object}
+ * @param {String} appId the app id
+ * @returns {Object}
*/
export const getAppTranslations = appId => {
return {
translations: window._oc_l10n_registry_translations[appId] || {},
- pluralFunction: window._oc_l10n_registry_plural_functions[appId],
+ pluralFunction: window._oc_l10n_registry_plural_functions[appId]
}
}
diff --git a/core/src/OC/l10n.js b/core/src/OC/l10n.js
index 769d55326b..fd81d3282d 100644
--- a/core/src/OC/l10n.js
+++ b/core/src/OC/l10n.js
@@ -34,39 +34,39 @@ const L10n = {
* @param {String} appName name of the app
* @param {Function} callback callback to be called when
* the translations are loaded
- * @return {Promise} promise
+ * @returns {Promise} promise
*/
load: function(appName, callback) {
// already available ?
if (hasAppTranslations(appName) || OC.getLocale() === 'en') {
- var deferred = $.Deferred();
- var promise = deferred.promise();
- promise.then(callback);
- deferred.resolve();
- return promise;
+ var deferred = $.Deferred()
+ var promise = deferred.promise()
+ promise.then(callback)
+ deferred.resolve()
+ return promise
}
- var self = this;
- var url = OC.filePath(appName, 'l10n', OC.getLocale() + '.json');
+ var self = this
+ var url = OC.filePath(appName, 'l10n', OC.getLocale() + '.json')
// load JSON translation bundle per AJAX
return $.get(url)
.then(
function(result) {
if (result.translations) {
- self.register(appName, result.translations, result.pluralForm);
+ self.register(appName, result.translations, result.pluralForm)
}
})
- .then(callback);
+ .then(callback)
},
/**
* Register an app's translation bundle.
*
* @param {String} appName name of the app
- * @param {Object} bundle
+ * @param {Object} bundle bundle
*/
- register: function(appName, bundle, pluralForm) {
+ register: function(appName, bundle) {
registerAppTranslations(appName, bundle, this._getPlural)
},
@@ -79,49 +79,49 @@ const L10n = {
* Translate a string
* @param {string} app the id of the app for which to translate the string
* @param {string} text the string to translate
- * @param [vars] map of placeholder key to value
+ * @param {Object} [vars] map of placeholder key to value
* @param {number} [count] number to replace %n with
* @param {array} [options] options array
* @param {bool} [options.escape=true] enable/disable auto escape of placeholders (by default enabled)
- * @return {string}
+ * @returns {string}
*/
translate: function(app, text, vars, count, options) {
var defaultOptions = {
- escape: true
- },
- allOptions = options || {};
- _.defaults(allOptions, defaultOptions);
+ escape: true
+ }
+ var allOptions = options || {}
+ _.defaults(allOptions, defaultOptions)
// TODO: cache this function to avoid inline recreation
// of the same function over and over again in case
// translate() is used in a loop
- var _build = function (text, vars, count) {
+ var _build = function(text, vars, count) {
return text.replace(/%n/g, count).replace(/{([^{}]*)}/g,
- function (a, b) {
- var r = vars[b];
- if(typeof r === 'string' || typeof r === 'number') {
- if(allOptions.escape) {
- return DOMPurify.sanitize(escapeHTML(r));
+ function(a, b) {
+ var r = vars[b]
+ if (typeof r === 'string' || typeof r === 'number') {
+ if (allOptions.escape) {
+ return DOMPurify.sanitize(escapeHTML(r))
} else {
- return DOMPurify.sanitize(r);
+ return DOMPurify.sanitize(r)
}
} else {
- return DOMPurify.sanitize(a);
+ return DOMPurify.sanitize(a)
}
}
- );
- };
- var translation = text;
- var bundle = getAppTranslations(app);
- var value = bundle.translations[text];
- if( typeof(value) !== 'undefined' ){
- translation = value;
+ )
+ }
+ var translation = text
+ var bundle = getAppTranslations(app)
+ var value = bundle.translations[text]
+ if (typeof (value) !== 'undefined') {
+ translation = value
}
- if(typeof vars === 'object' || count !== undefined ) {
- return DOMPurify.sanitize(_build(translation, vars, count));
+ if (typeof vars === 'object' || count !== undefined) {
+ return DOMPurify.sanitize(_build(translation, vars, count))
} else {
- return DOMPurify.sanitize(translation);
+ return DOMPurify.sanitize(translation)
}
},
@@ -131,50 +131,50 @@ const L10n = {
* @param {string} textSingular the string to translate for exactly one object
* @param {string} textPlural the string to translate for n objects
* @param {number} count number to determine whether to use singular or plural
- * @param [vars] map of placeholder key to value
+ * @param {Object} [vars] map of placeholder key to value
* @param {array} [options] options array
* @param {bool} [options.escape=true] enable/disable auto escape of placeholders (by default enabled)
- * @return {string} Translated string
+ * @returns {string} Translated string
*/
translatePlural: function(app, textSingular, textPlural, count, vars, options) {
- const identifier = '_' + textSingular + '_::_' + textPlural + '_';
- const bundle = getAppTranslations(app);
- const value = bundle.translations[identifier];
- if( typeof(value) !== 'undefined' ){
- var translation = value;
+ const identifier = '_' + textSingular + '_::_' + textPlural + '_'
+ const bundle = getAppTranslations(app)
+ const value = bundle.translations[identifier]
+ if (typeof (value) !== 'undefined') {
+ var translation = value
if ($.isArray(translation)) {
- var plural = bundle.pluralFunction(count);
- return this.translate(app, translation[plural], vars, count, options);
+ var plural = bundle.pluralFunction(count)
+ return this.translate(app, translation[plural], vars, count, options)
}
}
if (count === 1) {
- return this.translate(app, textSingular, vars, count, options);
+ return this.translate(app, textSingular, vars, count, options)
} else {
- return this.translate(app, textPlural, vars, count, options);
+ return this.translate(app, textPlural, vars, count, options)
}
},
/**
* The plural function taken from symfony
*
- * @param {number} number
+ * @param {number} number the number of elements
* @returns {number}
* @private
*/
_getPlural: function(number) {
- var language = OC.getLanguage();
- if ('pt_BR' === language) {
+ var language = OC.getLanguage()
+ if (language === 'pt_BR') {
// temporary set a locale for brazilian
- language = 'xbr';
+ language = 'xbr'
}
if (typeof language === 'undefined' || language === '') {
- return (1 == number) ? 0 : 1;
+ return (number === 1) ? 0 : 1
}
if (language.length > 3) {
- language = language.substring(0, language.lastIndexOf('_'));
+ language = language.substring(0, language.lastIndexOf('_'))
}
/*
@@ -183,146 +183,146 @@ const L10n = {
* Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
*/
switch (language) {
- case 'az':
- case 'bo':
- case 'dz':
- case 'id':
- case 'ja':
- case 'jv':
- case 'ka':
- case 'km':
- case 'kn':
- case 'ko':
- case 'ms':
- case 'th':
- case 'tr':
- case 'vi':
- case 'zh':
- return 0;
+ case 'az':
+ case 'bo':
+ case 'dz':
+ case 'id':
+ case 'ja':
+ case 'jv':
+ case 'ka':
+ case 'km':
+ case 'kn':
+ case 'ko':
+ case 'ms':
+ case 'th':
+ case 'tr':
+ case 'vi':
+ case 'zh':
+ return 0
- case 'af':
- case 'bn':
- case 'bg':
- case 'ca':
- case 'da':
- case 'de':
- case 'el':
- case 'en':
- case 'eo':
- case 'es':
- case 'et':
- case 'eu':
- case 'fa':
- case 'fi':
- case 'fo':
- case 'fur':
- case 'fy':
- case 'gl':
- case 'gu':
- case 'ha':
- case 'he':
- case 'hu':
- case 'is':
- case 'it':
- case 'ku':
- case 'lb':
- case 'ml':
- case 'mn':
- case 'mr':
- case 'nah':
- case 'nb':
- case 'ne':
- case 'nl':
- case 'nn':
- case 'no':
- case 'oc':
- case 'om':
- case 'or':
- case 'pa':
- case 'pap':
- case 'ps':
- case 'pt':
- case 'so':
- case 'sq':
- case 'sv':
- case 'sw':
- case 'ta':
- case 'te':
- case 'tk':
- case 'ur':
- case 'zu':
- return (1 == number) ? 0 : 1;
+ case 'af':
+ case 'bn':
+ case 'bg':
+ case 'ca':
+ case 'da':
+ case 'de':
+ case 'el':
+ case 'en':
+ case 'eo':
+ case 'es':
+ case 'et':
+ case 'eu':
+ case 'fa':
+ case 'fi':
+ case 'fo':
+ case 'fur':
+ case 'fy':
+ case 'gl':
+ case 'gu':
+ case 'ha':
+ case 'he':
+ case 'hu':
+ case 'is':
+ case 'it':
+ case 'ku':
+ case 'lb':
+ case 'ml':
+ case 'mn':
+ case 'mr':
+ case 'nah':
+ case 'nb':
+ case 'ne':
+ case 'nl':
+ case 'nn':
+ case 'no':
+ case 'oc':
+ case 'om':
+ case 'or':
+ case 'pa':
+ case 'pap':
+ case 'ps':
+ case 'pt':
+ case 'so':
+ case 'sq':
+ case 'sv':
+ case 'sw':
+ case 'ta':
+ case 'te':
+ case 'tk':
+ case 'ur':
+ case 'zu':
+ return (number === 1) ? 0 : 1
- case 'am':
- case 'bh':
- case 'fil':
- case 'fr':
- case 'gun':
- case 'hi':
- case 'hy':
- case 'ln':
- case 'mg':
- case 'nso':
- case 'xbr':
- case 'ti':
- case 'wa':
- return ((0 == number) || (1 == number)) ? 0 : 1;
+ case 'am':
+ case 'bh':
+ case 'fil':
+ case 'fr':
+ case 'gun':
+ case 'hi':
+ case 'hy':
+ case 'ln':
+ case 'mg':
+ case 'nso':
+ case 'xbr':
+ case 'ti':
+ case 'wa':
+ return ((number === 0) || (number === 1)) ? 0 : 1
- case 'be':
- case 'bs':
- case 'hr':
- case 'ru':
- case 'sh':
- case 'sr':
- case 'uk':
- return ((1 == number % 10) && (11 != number % 100)) ? 0 : (((number % 10 >= 2) && (number % 10 <= 4) && ((number % 100 < 10) || (number % 100 >= 20))) ? 1 : 2);
+ case 'be':
+ case 'bs':
+ case 'hr':
+ case 'ru':
+ case 'sh':
+ case 'sr':
+ case 'uk':
+ return ((number % 10 === 1) && (number % 100 !== 11)) ? 0 : (((number % 10 >= 2) && (number % 10 <= 4) && ((number % 100 < 10) || (number % 100 >= 20))) ? 1 : 2)
- case 'cs':
- case 'sk':
- return (1 == number) ? 0 : (((number >= 2) && (number <= 4)) ? 1 : 2);
+ case 'cs':
+ case 'sk':
+ return (number === 1) ? 0 : (((number >= 2) && (number <= 4)) ? 1 : 2)
- case 'ga':
- return (1 == number) ? 0 : ((2 == number) ? 1 : 2);
+ case 'ga':
+ return (number === 1) ? 0 : ((number === 2) ? 1 : 2)
- case 'lt':
- return ((1 == number % 10) && (11 != number % 100)) ? 0 : (((number % 10 >= 2) && ((number % 100 < 10) || (number % 100 >= 20))) ? 1 : 2);
+ case 'lt':
+ return ((number % 10 === 1) && (number % 100 !== 11)) ? 0 : (((number % 10 >= 2) && ((number % 100 < 10) || (number % 100 >= 20))) ? 1 : 2)
- case 'sl':
- return (1 == number % 100) ? 0 : ((2 == number % 100) ? 1 : (((3 == number % 100) || (4 == number % 100)) ? 2 : 3));
+ case 'sl':
+ return (number % 100 === 1) ? 0 : ((number % 100 === 2) ? 1 : (((number % 100 === 3) || (number % 100 === 4)) ? 2 : 3))
- case 'mk':
- return (1 == number % 10) ? 0 : 1;
+ case 'mk':
+ return (number % 10 === 1) ? 0 : 1
- case 'mt':
- return (1 == number) ? 0 : (((0 == number) || ((number % 100 > 1) && (number % 100 < 11))) ? 1 : (((number % 100 > 10) && (number % 100 < 20)) ? 2 : 3));
+ case 'mt':
+ return (number === 1) ? 0 : (((number === 0) || ((number % 100 > 1) && (number % 100 < 11))) ? 1 : (((number % 100 > 10) && (number % 100 < 20)) ? 2 : 3))
- case 'lv':
- return (0 == number) ? 0 : (((1 == number % 10) && (11 != number % 100)) ? 1 : 2);
+ case 'lv':
+ return (number === 0) ? 0 : (((number % 10 === 1) && (number % 100 !== 11)) ? 1 : 2)
- case 'pl':
- return (1 == number) ? 0 : (((number % 10 >= 2) && (number % 10 <= 4) && ((number % 100 < 12) || (number % 100 > 14))) ? 1 : 2);
+ case 'pl':
+ return (number === 1) ? 0 : (((number % 10 >= 2) && (number % 10 <= 4) && ((number % 100 < 12) || (number % 100 > 14))) ? 1 : 2)
- case 'cy':
- return (1 == number) ? 0 : ((2 == number) ? 1 : (((8 == number) || (11 == number)) ? 2 : 3));
+ case 'cy':
+ return (number === 1) ? 0 : ((number === 2) ? 1 : (((number === 8) || (number === 11)) ? 2 : 3))
- case 'ro':
- return (1 == number) ? 0 : (((0 == number) || ((number % 100 > 0) && (number % 100 < 20))) ? 1 : 2);
+ case 'ro':
+ return (number === 1) ? 0 : (((number === 0) || ((number % 100 > 0) && (number % 100 < 20))) ? 1 : 2)
- case 'ar':
- return (0 == number) ? 0 : ((1 == number) ? 1 : ((2 == number) ? 2 : (((number % 100 >= 3) && (number % 100 <= 10)) ? 3 : (((number % 100 >= 11) && (number % 100 <= 99)) ? 4 : 5))));
+ case 'ar':
+ return (number === 0) ? 0 : ((number === 1) ? 1 : ((number === 2) ? 2 : (((number % 100 >= 3) && (number % 100 <= 10)) ? 3 : (((number % 100 >= 11) && (number % 100 <= 99)) ? 4 : 5))))
- default:
- return 0;
+ default:
+ return 0
}
}
-};
+}
-export default L10n;
+export default L10n
/**
* Returns the user's locale as a BCP 47 compliant language tag
*
- * @return {String} locale string
+ * @returns {String} locale string
*/
export const getCanonicalLocale = () => {
const locale = getLocale()
@@ -332,7 +332,7 @@ export const getCanonicalLocale = () => {
/**
* Returns the user's locale
*
- * @return {String} locale string
+ * @returns {String} locale string
*/
export const getLocale = () => $('html').data('locale')
@@ -344,6 +344,5 @@ export const getLocale = () => $('html').data('locale')
export const getLanguage = () => $('html').prop('lang')
Handlebars.registerHelper('t', function(app, text) {
- return L10n.translate(app, text);
-});
-
+ return L10n.translate(app, text)
+})
diff --git a/core/src/OC/legacy-loader.js b/core/src/OC/legacy-loader.js
index a2c76c2e3a..ece9f3c3fc 100644
--- a/core/src/OC/legacy-loader.js
+++ b/core/src/OC/legacy-loader.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -29,7 +29,8 @@ const loadedStyles = []
* the event handler will be called directly
* @param {string} app the app id to which the script belongs
* @param {string} script the filename of the script
- * @param ready event handler to be called when the script is loaded
+ * @param {Function} ready event handler to be called when the script is loaded
+ * @returns {jQuery.Deferred}
* @deprecated 16.0.0 Use OCP.Loader.loadScript
*/
export const addScript = (app, script, ready) => {
diff --git a/core/src/OC/menu.js b/core/src/OC/menu.js
index 04d0e078b9..82cde9e862 100644
--- a/core/src/OC/menu.js
+++ b/core/src/OC/menu.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -22,33 +22,32 @@
import _ from 'underscore'
import $ from 'jquery'
-import {menuSpeed} from './constants'
+import { menuSpeed } from './constants'
-let currentMenu = null
-let currentMenuToggle = null
+export let currentMenu = null
+export let currentMenuToggle = null
/**
* For menu toggling
*
- * @param {jQuery} $toggle
- * @param {jQuery} $menuEl
+ * @param {jQuery} $toggle the toggle element
+ * @param {jQuery} $menuEl the menu container element
* @param {function|undefined} toggle callback invoked everytime the menu is opened
* @param {boolean} headerMenu is this a top right header menu?
* @returns {undefined}
*/
-export const registerMenu = ($toggle, $menuEl, toggle, headerMenu) => {
+export const registerMenu = function($toggle, $menuEl, toggle, headerMenu) {
$menuEl.addClass('menu')
+ const isClickableElement = $toggle.prop('tagName') === 'A' || $toggle.prop('tagName') === 'BUTTON'
// On link and button, the enter key trigger a click event
// Only use the click to avoid two fired events
- $toggle.on(($toggle.prop('tagName') === 'A' || $toggle.prop('tagName') === 'BUTTON')
- ? 'click.menu'
- : 'click.menu keyup.menu', function (event) {
+ $toggle.on(isClickableElement ? 'click.menu' : 'click.menu keyup.menu', function(event) {
// prevent the link event (append anchor to URL)
event.preventDefault()
// allow enter key as a trigger
- if (event.key && event.key !== "Enter") {
+ if (event.key && event.key !== 'Enter') {
return
}
@@ -75,7 +74,10 @@ export const registerMenu = ($toggle, $menuEl, toggle, headerMenu) => {
}
/**
- * @todo Write documentation
+ * Unregister a previously registered menu
+ *
+ * @param {jQuery} $toggle the toggle element
+ * @param {jQuery} $menuEl the menu container element
*/
export const unregisterMenu = ($toggle, $menuEl) => {
// close menu if opened
@@ -95,7 +97,7 @@ export const hideMenus = function(complete) {
if (currentMenu) {
const lastMenu = currentMenu
currentMenu.trigger(new $.Event('beforeHide'))
- currentMenu.slideUp(menuSpeed, function () {
+ currentMenu.slideUp(menuSpeed, function() {
lastMenu.trigger(new $.Event('afterHide'))
if (complete) {
complete.apply(this, arguments)
diff --git a/core/src/OC/msg.js b/core/src/OC/msg.js
index 1d43b4375e..e210f32bb1 100644
--- a/core/src/OC/msg.js
+++ b/core/src/OC/msg.js
@@ -21,7 +21,7 @@
* along with this program. If not, see
*
* @author 2019 Christoph Wurst
@@ -24,10 +24,10 @@
* @param {string} targetURL URL to redirect to
* @deprecated 17.0.0 use window.location directly
*/
-export const redirect = targetURL => window.location = targetURL
+export const redirect = targetURL => { window.location = targetURL }
/**
* Reloads the current page
* @deprecated 17.0.0 use window.location.reload directly
*/
-export const reload = () => window.location.reload()
+export const reload = () => { window.location.reload() }
diff --git a/core/src/OC/notification.js b/core/src/OC/notification.js
index f31b37e4ba..b56fb6b14d 100644
--- a/core/src/OC/notification.js
+++ b/core/src/OC/notification.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -21,7 +21,6 @@
import _ from 'underscore'
import $ from 'jquery'
-import Toastify from 'toastify-js'
/**
* @todo Write documentation
@@ -35,11 +34,11 @@ export default {
getDefaultNotificationFunction: null,
/**
- * @param callback
+ * @param {Function} callback callback function
* @deprecated 17.0.0 use OCP.Toast
*/
- setDefault: function (callback) {
- this.getDefaultNotificationFunction = callback;
+ setDefault: function(callback) {
+ this.getDefaultNotificationFunction = callback
},
/**
@@ -52,23 +51,20 @@ export default {
* @param {Function} [callback] callback
* @deprecated 17.0.0 use OCP.Toast
*/
- hide: function ($row, callback) {
- var self = this;
- var $notification = $('#content');
-
+ hide: function($row, callback) {
if (_.isFunction($row)) {
// first arg is the callback
- callback = $row;
- $row = undefined;
+ callback = $row
+ $row = undefined
}
if (!$row) {
- console.error('Missing argument $row in OC.Notification.hide() call, caller needs to be adjusted to only dismiss its own notification');
- return;
+ console.error('Missing argument $row in OC.Notification.hide() call, caller needs to be adjusted to only dismiss its own notification')
+ return
}
// remove the row directly
- $row.each(function () {
+ $row.each(function() {
$(this)[0].toastify.hideToast()
if (this === this.updatableNotification) {
this.updatableNotification = null
@@ -91,10 +87,10 @@ export default {
* @param {Object} [options] options
* @param {string} [options.type] notification type
* @param {int} [options.timeout=0] timeout value, defaults to 0 (permanent)
- * @return {jQuery} jQuery element for notification row
+ * @returns {jQuery} jQuery element for notification row
* @deprecated 17.0.0 use OCP.Toast
*/
- showHtml: function (html, options) {
+ showHtml: function(html, options) {
options = options || {}
options.isHTML = true
options.timeout = (!options.timeout) ? -1 : options.timeout
@@ -109,29 +105,29 @@ export default {
* @param {Object} [options] options
* @param {string} [options.type] notification type
* @param {int} [options.timeout=0] timeout value, defaults to 0 (permanent)
- * @return {jQuery} jQuery element for notification row
+ * @returns {jQuery} jQuery element for notification row
* @deprecated 17.0.0 use OCP.Toast
*/
- show: function (text, options) {
- options = options || {};
- options.timeout = (!options.timeout) ? -1 : options.timeout;
- const toast = window.OCP.Toast.message(text, options);
- return $(toast.toastElement);
+ show: function(text, options) {
+ options = options || {}
+ options.timeout = (!options.timeout) ? -1 : options.timeout
+ const toast = window.OCP.Toast.message(text, options)
+ return $(toast.toastElement)
},
/**
* Updates (replaces) a sanitized notification.
*
* @param {string} text Message to display
- * @return {jQuery} JQuery element for notificaiton row
+ * @returns {jQuery} JQuery element for notificaiton row
* @deprecated 17.0.0 use OCP.Toast
*/
- showUpdate: function (text) {
+ showUpdate: function(text) {
if (this.updatableNotification) {
- this.updatableNotification.hideToast();
+ this.updatableNotification.hideToast()
}
- this.updatableNotification = OCP.Toast.message(text, {timeout: -1})
- return $(this.updatableNotification.toastElement);
+ this.updatableNotification = OCP.Toast.message(text, { timeout: -1 })
+ return $(this.updatableNotification.toastElement)
},
/**
@@ -143,21 +139,22 @@ export default {
* @param {int} [options.timeout=7] timeout in seconds, if this is 0 it will show the message permanently
* @param {boolean} [options.isHTML=false] an indicator for HTML notifications (true) or text (false)
* @param {string} [options.type] notification type
+ * @returns {JQuery} the toast element
* @deprecated 17.0.0 use OCP.Toast
*/
- showTemporary: function (text, options) {
+ showTemporary: function(text, options) {
options = options || {}
- options.timeout = options.timeout || 7;
- const toast = window.OCP.Toast.message(text, options);
- return $(toast.toastElement);
+ options.timeout = options.timeout || 7
+ const toast = window.OCP.Toast.message(text, options)
+ return $(toast.toastElement)
},
/**
* Returns whether a notification is hidden.
- * @return {boolean}
+ * @returns {boolean}
* @deprecated 17.0.0 use OCP.Toast
*/
- isHidden: function () {
- return !$('#content').find('.toastify').length;
+ isHidden: function() {
+ return !$('#content').find('.toastify').length
}
}
diff --git a/core/src/OC/password-confirmation.js b/core/src/OC/password-confirmation.js
index a38f32b4b5..e303d70bf5 100644
--- a/core/src/OC/password-confirmation.js
+++ b/core/src/OC/password-confirmation.js
@@ -1,6 +1,4 @@
-/* global nc_pageLoad */
-
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -35,24 +33,26 @@ export default {
pageLoadTime: null,
- init: function () {
- $('.password-confirm-required').on('click', _.bind(this.requirePasswordConfirmation, this));
- this.pageLoadTime = moment.now();
+ init: function() {
+ $('.password-confirm-required').on('click', _.bind(this.requirePasswordConfirmation, this))
+ this.pageLoadTime = moment.now()
},
- requiresPasswordConfirmation: function () {
- var serverTimeDiff = this.pageLoadTime - (nc_pageLoad * 1000);
- var timeSinceLogin = moment.now() - (serverTimeDiff + (nc_lastLogin * 1000));
+ requiresPasswordConfirmation: function() {
+ var serverTimeDiff = this.pageLoadTime - (window.nc_pageLoad * 1000)
+ var timeSinceLogin = moment.now() - (serverTimeDiff + (window.nc_lastLogin * 1000))
// if timeSinceLogin > 30 minutes and user backend allows password confirmation
- return (backendAllowsPasswordConfirmation && timeSinceLogin > 30 * 60 * 1000);
+ return (window.backendAllowsPasswordConfirmation && timeSinceLogin > 30 * 60 * 1000)
},
/**
- * @param {function} callback
+ * @param {Function} callback success callback function
+ * @param {Object} options options
+ * @param {Function} rejectCallback error callback function
*/
- requirePasswordConfirmation: function (callback, options, rejectCallback) {
- options = typeof options !== 'undefined' ? options : {};
+ requirePasswordConfirmation: function(callback, options, rejectCallback) {
+ options = typeof options !== 'undefined' ? options : {}
var defaults = {
title: t('core', 'Authentication required'),
text: t(
@@ -61,20 +61,20 @@ export default {
),
confirm: t('core', 'Confirm'),
label: t('core', 'Password'),
- error: '',
- };
+ error: ''
+ }
- var config = _.extend(defaults, options);
+ var config = _.extend(defaults, options)
- var self = this;
+ var self = this
if (this.requiresPasswordConfirmation()) {
OC.dialogs.prompt(
config.text,
config.title,
- function (result, password) {
+ function(result, password) {
if (result && password !== '') {
- self._confirmPassword(password, config);
+ self._confirmPassword(password, config)
} else if (_.isFunction(rejectCallback)) {
rejectCallback()
}
@@ -82,27 +82,27 @@ export default {
true,
config.label,
true
- ).then(function () {
- var $dialog = $('.oc-dialog:visible');
- $dialog.find('.ui-icon').remove();
- $dialog.addClass('password-confirmation');
+ ).then(function() {
+ var $dialog = $('.oc-dialog:visible')
+ $dialog.find('.ui-icon').remove()
+ $dialog.addClass('password-confirmation')
if (config.error !== '') {
- var $error = $('').addClass('msg warning').text(config.error);
+ var $error = $('').addClass('msg warning').text(config.error)
}
- $dialog.find('.oc-dialog-content').append($error);
- $dialog.find('.oc-dialog-buttonrow').addClass('aside');
+ $dialog.find('.oc-dialog-content').append($error)
+ $dialog.find('.oc-dialog-buttonrow').addClass('aside')
- var $buttons = $dialog.find('button');
- $buttons.eq(0).hide();
- $buttons.eq(1).text(config.confirm);
- });
+ var $buttons = $dialog.find('button')
+ $buttons.eq(0).hide()
+ $buttons.eq(1).text(config.confirm)
+ })
}
- this.callback = callback;
+ this.callback = callback
},
- _confirmPassword: function (password, config) {
- var self = this;
+ _confirmPassword: function(password, config) {
+ var self = this
$.ajax({
url: OC.generateUrl('/login/confirm'),
@@ -110,17 +110,17 @@ export default {
password: password
},
type: 'POST',
- success: function (response) {
- nc_lastLogin = response.lastLogin;
+ success: function(response) {
+ window.nc_lastLogin = response.lastLogin
if (_.isFunction(self.callback)) {
- self.callback();
+ self.callback()
}
},
- error: function () {
- config.error = t('core', 'Failed to authenticate, try again');
- OC.PasswordConfirmation.requirePasswordConfirmation(self.callback, config);
+ error: function() {
+ config.error = t('core', 'Failed to authenticate, try again')
+ OC.PasswordConfirmation.requirePasswordConfirmation(self.callback, config)
}
- });
+ })
}
-};
+}
diff --git a/core/src/OC/path.js b/core/src/OC/path.js
index ef58caf485..145c90d1e5 100644
--- a/core/src/OC/path.js
+++ b/core/src/OC/path.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -22,8 +22,8 @@
/**
* URI-Encodes a file path but keep the path slashes.
*
- * @param {String} path
- * @return {String} encoded path
+ * @param {String} path path
+ * @returns {String} encoded path
*/
export const encodePath = path => {
if (!path) {
@@ -41,8 +41,8 @@ export const encodePath = path => {
* Returns the base name of the given path.
* For example for "/abc/somefile.txt" it will return "somefile.txt"
*
- * @param {String} path
- * @return {String} base name
+ * @param {String} path path
+ * @returns {String} base name
*/
export const basename = path => path.replace(/\\/g, '/').replace(/.*\//, '')
@@ -50,10 +50,10 @@ export const basename = path => path.replace(/\\/g, '/').replace(/.*\//, '')
* Returns the dir name of the given path.
* For example for "/abc/somefile.txt" it will return "/abc"
*
- * @param {String} path
- * @return {String} dir name
+ * @param {String} path path
+ * @returns {String} dir name
*/
-export const dirname = path => path.replace(/\\/g, '/').replace(/\/[^\/]*$/, '')
+export const dirname = path => path.replace(/\\/g, '/').replace(/\/[^/]*$/, '')
/**
* Returns whether the given paths are the same, without
@@ -62,7 +62,7 @@ export const dirname = path => path.replace(/\\/g, '/').replace(/\/[^\/]*$/, '')
*
* @param {String} path1 first path
* @param {String} path2 second path
- * @return {bool} true if the paths are the same
+ * @returns {bool} true if the paths are the same
*
* @since 9.0
*/
@@ -80,13 +80,13 @@ export const isSamePath = (path1, path2) => {
*
* @param {...String} path sections
*
- * @return {String} joined path, any leading or trailing slash
+ * @returns {String} joined path, any leading or trailing slash
* will be kept
*
* @since 8.2
*/
export const joinPaths = (...args) => {
- if (arguments.length < 1) {
+ if (args.length < 1) {
return ''
}
@@ -98,7 +98,7 @@ export const joinPaths = (...args) => {
const lastArg = nonEmptyArgs[nonEmptyArgs.length - 1]
const leadingSlash = nonEmptyArgs[0].charAt(0) === '/'
- const trailingSlash = lastArg.charAt(lastArg.length - 1) === '/';
+ const trailingSlash = lastArg.charAt(lastArg.length - 1) === '/'
const sections = nonEmptyArgs.reduce((acc, section) => acc.concat(section.split('/')), [])
let first = !leadingSlash
diff --git a/core/src/OC/plugins.js b/core/src/OC/plugins.js
index dd25610c2d..124116b9a5 100644
--- a/core/src/OC/plugins.js
+++ b/core/src/OC/plugins.js
@@ -33,14 +33,14 @@ export default {
* Register plugin
*
* @param {String} targetName app name / class name to hook into
- * @param {OC.Plugin} plugin
+ * @param {OC.Plugin} plugin plugin
*/
- register: function (targetName, plugin) {
- var plugins = this._plugins[targetName];
+ register: function(targetName, plugin) {
+ var plugins = this._plugins[targetName]
if (!plugins) {
- plugins = this._plugins[targetName] = [];
+ plugins = this._plugins[targetName] = []
}
- plugins.push(plugin);
+ plugins.push(plugin)
},
/**
@@ -48,24 +48,24 @@ export default {
* name / app name / class name.
*
* @param {String} targetName app name / class name to hook into
- * @return {Array.} array of plugins
+ * @returns {Array.} array of plugins
*/
- getPlugins: function (targetName) {
- return this._plugins[targetName] || [];
+ getPlugins: function(targetName) {
+ return this._plugins[targetName] || []
},
/**
* Call attach() on all plugins registered to the given target name.
*
* @param {String} targetName app name / class name
- * @param {Object} object to be extended
+ * @param {Object} targetObject to be extended
* @param {Object} [options] options
*/
- attach: function (targetName, targetObject, options) {
- var plugins = this.getPlugins(targetName);
+ attach: function(targetName, targetObject, options) {
+ var plugins = this.getPlugins(targetName)
for (var i = 0; i < plugins.length; i++) {
if (plugins[i].attach) {
- plugins[i].attach(targetObject, options);
+ plugins[i].attach(targetObject, options)
}
}
},
@@ -74,16 +74,16 @@ export default {
* Call detach() on all plugins registered to the given target name.
*
* @param {String} targetName app name / class name
- * @param {Object} object to be extended
+ * @param {Object} targetObject to be extended
* @param {Object} [options] options
*/
- detach: function (targetName, targetObject, options) {
- var plugins = this.getPlugins(targetName);
+ detach: function(targetName, targetObject, options) {
+ var plugins = this.getPlugins(targetName)
for (var i = 0; i < plugins.length; i++) {
if (plugins[i].detach) {
- plugins[i].detach(targetObject, options);
+ plugins[i].detach(targetObject, options)
}
}
}
-}
\ No newline at end of file
+}
diff --git a/core/src/OC/query-string.js b/core/src/OC/query-string.js
index 973412de57..a814177790 100644
--- a/core/src/OC/query-string.js
+++ b/core/src/OC/query-string.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -22,15 +22,14 @@
/**
* Parses a URL query string into a JS map
* @param {string} queryString query string in the format param1=1234¶m2=abcde¶m3=xyz
- * @return {Object.} map containing key/values matching the URL parameters
+ * @returns {Object.} map containing key/values matching the URL parameters
*/
export const parse = queryString => {
- let parts,
- pos,
- components,
- result = {},
- key,
- value
+ let parts
+ let pos
+ let components
+ let result = {}
+ let key
if (!queryString) {
return null
}
@@ -73,13 +72,13 @@ export const parse = queryString => {
/**
* Builds a URL query from a JS map.
* @param {Object.} params map containing key/values matching the URL parameters
- * @return {string} String containing a URL query (without question) mark
+ * @returns {string} String containing a URL query (without question) mark
*/
export const build = params => {
if (!params) {
return ''
}
- return $.map(params, function (value, key) {
+ return $.map(params, function(value, key) {
var s = encodeURIComponent(key)
if (value !== null && typeof (value) !== 'undefined') {
s += '=' + encodeURIComponent(value)
diff --git a/core/src/OC/requesttoken.js b/core/src/OC/requesttoken.js
index 3c4a185f1c..a92eb16957 100644
--- a/core/src/OC/requesttoken.js
+++ b/core/src/OC/requesttoken.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -19,25 +19,24 @@
* along with this program. If not, see
*
* @author 2019 Christoph Wurst
@@ -22,27 +22,27 @@
import _ from 'underscore'
import OC from './index'
-import {coreApps} from './constants'
+import { coreApps } from './constants'
/**
* Get an absolute url to a file in an app
* @param {string} app the id of the app the file belongs to
* @param {string} file the file path relative to the app folder
- * @return {string} Absolute URL to a file
+ * @returns {string} Absolute URL to a file
*/
export const linkTo = (app, file) => filePath(app, '', file)
/**
* Creates a relative url for remote use
* @param {string} service id
- * @return {string} the url
+ * @returns {string} the url
*/
export const linkToRemoteBase = service => getRootPath() + '/remote.php/' + service
/**
* @brief Creates an absolute url for remote use
* @param {string} service id
- * @return {string} the url
+ * @returns {string} the url
*/
export const linkToRemote = service => window.location.protocol + '//' + window.location.host + linkToRemoteBase(service)
@@ -50,7 +50,7 @@ export const linkToRemote = service => window.location.protocol + '//' + window.
* Gets the base path for the given OCS API service.
* @param {string} service name
* @param {int} version OCS API version
- * @return {string} OCS API base path
+ * @returns {string} OCS API base path
*/
export const linkToOCS = (service, version) => {
version = (version !== 2) ? 1 : 2
@@ -60,42 +60,42 @@ export const linkToOCS = (service, version) => {
/**
* Generates the absolute url for the given relative url, which can contain parameters.
* Parameters will be URL encoded automatically.
- * @param {string} url
- * @param [params] params
- * @param [options] options
+ * @param {string} url the url
+ * @param {Object} [params] params
+ * @param {Object} [options] destructuring object
* @param {bool} [options.escape=true] enable/disable auto escape of placeholders (by default enabled)
- * @return {string} Absolute URL for the given relative URL
+ * @returns {string} Absolute URL for the given relative URL
*/
export const generateUrl = (url, params, options) => {
const defaultOptions = {
- escape: true
- },
- allOptions = options || {};
- _.defaults(allOptions, defaultOptions);
+ escape: true
+ }
+ const allOptions = options || {}
+ _.defaults(allOptions, defaultOptions)
- const _build = function (text, vars) {
- vars = vars || [];
+ const _build = function(text, vars) {
+ vars = vars || []
return text.replace(/{([^{}]*)}/g,
- function (a, b) {
- var r = (vars[b]);
+ function(a, b) {
+ var r = (vars[b])
if (allOptions.escape) {
- return (typeof r === 'string' || typeof r === 'number') ? encodeURIComponent(r) : encodeURIComponent(a);
+ return (typeof r === 'string' || typeof r === 'number') ? encodeURIComponent(r) : encodeURIComponent(a)
} else {
- return (typeof r === 'string' || typeof r === 'number') ? r : a;
+ return (typeof r === 'string' || typeof r === 'number') ? r : a
}
}
- );
- };
+ )
+ }
if (url.charAt(0) !== '/') {
- url = '/' + url;
+ url = '/' + url
}
if (OC.config.modRewriteWorking === true) {
- return getRootPath() + _build(url, params);
+ return getRootPath() + _build(url, params)
}
- return getRootPath() + '/index.php' + _build(url, params);
+ return getRootPath() + '/index.php' + _build(url, params)
}
/**
@@ -105,11 +105,11 @@ export const generateUrl = (url, params, options) => {
*
* @param {string} app the app id to which the image belongs
* @param {string} file the name of the image file
- * @return {string}
+ * @returns {string}
*/
export const imagePath = (app, file) => {
if (file.indexOf('.') === -1) {
- //if no extension is given, use svg
+ // if no extension is given, use svg
return filePath(app, 'img', file + '.svg')
}
@@ -121,13 +121,13 @@ export const imagePath = (app, file) => {
* @param {string} app the id of the app
* @param {string} type the type of the file to link to (e.g. css,img,ajax.template)
* @param {string} file the filename
- * @return {string} Absolute URL for a file in an app
+ * @returns {string} Absolute URL for a file in an app
*/
export const filePath = (app, type, file) => {
const isCore = coreApps.indexOf(app) !== -1
let link = getRootPath()
if (file.substring(file.length - 3) === 'php' && !isCore) {
- link += '/index.php/apps/' + app;
+ link += '/index.php/apps/' + app
if (file !== 'index.php') {
link += '/'
if (type) {
@@ -136,7 +136,7 @@ export const filePath = (app, type, file) => {
link += file
}
} else if (file.substring(file.length - 3) !== 'php' && !isCore) {
- link = OC.appswebroots[app];
+ link = OC.appswebroots[app]
if (type) {
link += '/' + type + '/'
}
@@ -170,7 +170,7 @@ export const filePath = (app, type, file) => {
* is accessible, with a leading slash.
* For example "/nextcloud".
*
- * @return {string} web root path
+ * @returns {string} web root path
*
* @since 8.2
*/
diff --git a/core/src/OC/search.js b/core/src/OC/search.js
index 31f8df7ecf..281907a06a 100644
--- a/core/src/OC/search.js
+++ b/core/src/OC/search.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -25,17 +25,17 @@ import OC from './index'
* Do a search query and display the results
* @param {string} query the search query
*/
-const search = function (query) {
- OC.Search.search(query, null, 0, 30);
-};
+const search = function(query) {
+ OC.Search.search(query, null, 0, 30)
+}
/**
* @namespace OC.search
*/
-search.customResults = {};
+search.customResults = {}
/**
* @deprecated use get/setFormatter() instead
*/
-search.resultTypes = {};
+search.resultTypes = {}
-export default search;
+export default search
diff --git a/core/src/OC/util-history.js b/core/src/OC/util-history.js
index 3dd1a104ef..77607b6402 100644
--- a/core/src/OC/util-history.js
+++ b/core/src/OC/util-history.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -20,7 +20,6 @@
*/
import _ from 'underscore'
-
import OC from './index'
/**
@@ -46,40 +45,41 @@ export default {
* using the params as query string
* @param {boolean} [replace=false] whether to replace instead of pushing
*/
- _pushState: function (params, url, replace) {
- var strParams;
+ _pushState: function(params, url, replace) {
+ var strParams
if (typeof (params) === 'string') {
- strParams = params;
+ strParams = params
} else {
- strParams = OC.buildQueryString(params);
+ strParams = OC.buildQueryString(params)
}
+
if (window.history.pushState) {
- url = url || location.pathname + '?' + strParams;
+ url = url || location.pathname + '?' + strParams
// Workaround for bug with SVG and window.history.pushState on Firefox < 51
// https://bugzilla.mozilla.org/show_bug.cgi?id=652991
- var isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
+ var isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1
if (isFirefox && parseInt(navigator.userAgent.split('/').pop()) < 51) {
- var patterns = document.querySelectorAll('[fill^="url(#"], [stroke^="url(#"], [filter^="url(#invert"]');
+ var patterns = document.querySelectorAll('[fill^="url(#"], [stroke^="url(#"], [filter^="url(#invert"]')
for (var i = 0, ii = patterns.length, pattern; i < ii; i++) {
- pattern = patterns[i];
- pattern.style.fill = pattern.style.fill;
- pattern.style.stroke = pattern.style.stroke;
- pattern.removeAttribute("filter");
- pattern.setAttribute("filter", "url(#invert)");
+ const { fill, stroke } = pattern.style
+ pattern = patterns[i]
+ pattern.style.fill = fill
+ pattern.style.stroke = stroke
+ pattern.removeAttribute('filter')
+ pattern.setAttribute('filter', 'url(#invert)')
}
}
if (replace) {
- window.history.replaceState(params, '', url);
+ window.history.replaceState(params, '', url)
} else {
- window.history.pushState(params, '', url);
+ window.history.pushState(params, '', url)
}
- }
- // use URL hash for IE8
- else {
- window.location.hash = '?' + strParams;
+ } else {
+ // use URL hash for IE8
+ window.location.hash = '?' + strParams
// inhibit next onhashchange that just added itself
// to the event queue
- this._cancelPop = true;
+ this._cancelPop = true
}
},
@@ -89,13 +89,11 @@ export default {
* Note: this includes a workaround for IE8/IE9 that uses
* the hash part instead of the search part.
*
- * @param {Object|string} params to append to the URL, can be either a string
- * or a map
- * @param {string} [url] URL to be used, otherwise the current URL will be used,
- * using the params as query string
+ * @param {Object|string} params to append to the URL, can be either a string or a map
+ * @param {string} [url] URL to be used, otherwise the current URL will be used, using the params as query string
*/
- pushState: function (params, url) {
- return this._pushState(params, url, false);
+ pushState: function(params, url) {
+ this._pushState(params, url, false)
},
/**
@@ -109,75 +107,76 @@ export default {
* @param {string} [url] URL to be used, otherwise the current URL will be used,
* using the params as query string
*/
- replaceState: function (params, url) {
- return this._pushState(params, url, true);
+ replaceState: function(params, url) {
+ this._pushState(params, url, true)
},
/**
* Add a popstate handler
*
- * @param handler function
+ * @param {Function} handler handler
*/
- addOnPopStateHandler: function (handler) {
- this._handlers.push(handler);
+ addOnPopStateHandler: function(handler) {
+ this._handlers.push(handler)
},
/**
* Parse a query string from the hash part of the URL.
* (workaround for IE8 / IE9)
+ * @returns {string}
*/
- _parseHashQuery: function () {
- var hash = window.location.hash,
- pos = hash.indexOf('?');
+ _parseHashQuery: function() {
+ var hash = window.location.hash
+ var pos = hash.indexOf('?')
if (pos >= 0) {
- return hash.substr(pos + 1);
+ return hash.substr(pos + 1)
}
if (hash.length) {
// remove hash sign
- return hash.substr(1);
+ return hash.substr(1)
}
- return '';
+ return ''
},
- _decodeQuery: function (query) {
- return query.replace(/\+/g, ' ');
+ _decodeQuery: function(query) {
+ return query.replace(/\+/g, ' ')
},
/**
* Parse the query/search part of the URL.
* Also try and parse it from the URL hash (for IE8)
*
- * @return map of parameters
+ * @returns {Object} map of parameters
*/
- parseUrlQuery: function () {
- var query = this._parseHashQuery(),
- params;
+ parseUrlQuery: function() {
+ var query = this._parseHashQuery()
+ var params
// try and parse from URL hash first
if (query) {
- params = OC.parseQueryString(this._decodeQuery(query));
+ params = OC.parseQueryString(this._decodeQuery(query))
}
// else read from query attributes
- params = _.extend(params || {}, OC.parseQueryString(this._decodeQuery(location.search)));
- return params || {};
+ params = _.extend(params || {}, OC.parseQueryString(this._decodeQuery(location.search)))
+ return params || {}
},
- _onPopState: function (e) {
+ _onPopState: function(e) {
if (this._cancelPop) {
- this._cancelPop = false;
- return;
+ this._cancelPop = false
+ return
}
- var params;
+ var params
if (!this._handlers.length) {
- return;
+ return
}
- params = (e && e.state);
+ params = (e && e.state)
if (_.isString(params)) {
- params = OC.parseQueryString(params);
+ params = OC.parseQueryString(params)
} else if (!params) {
- params = this.parseUrlQuery() || {};
+ params = this.parseUrlQuery() || {}
}
for (var i = 0; i < this._handlers.length; i++) {
- this._handlers[i](params);
+ this._handlers[i](params)
}
}
}
diff --git a/core/src/OC/util.js b/core/src/OC/util.js
index dd66f4b295..7c4a44b77d 100644
--- a/core/src/OC/util.js
+++ b/core/src/OC/util.js
@@ -1,6 +1,4 @@
-/* global t */
-
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -30,22 +28,26 @@ import humanFileSize from '../Util/human-file-size'
function chunkify(t) {
// Adapted from http://my.opera.com/GreyWyvern/blog/show.dml/1671288
- let tz = [], x = 0, y = -1, n = 0, code, c;
+ let tz = []
+ let x = 0
+ let y = -1
+ let n = 0
+ let c
while (x < t.length) {
- c = t.charAt(x);
+ c = t.charAt(x)
// only include the dot in strings
- var m = ((!n && c === '.') || (c >= '0' && c <= '9'));
+ var m = ((!n && c === '.') || (c >= '0' && c <= '9'))
if (m !== n) {
// next chunk
- y++;
- tz[y] = '';
- n = m;
+ y++
+ tz[y] = ''
+ n = m
}
- tz[y] += c;
- x++;
+ tz[y] += c
+ x++
}
- return tz;
+ return tz
}
/**
@@ -64,17 +66,17 @@ export default {
* Makes 2kB to 2048.
* Inspired by computerFileSize in helper.php
* @param {string} string file size in human readable format
- * @return {number} or null if string could not be parsed
+ * @returns {number} or null if string could not be parsed
*
*
*/
- computerFileSize: function (string) {
+ computerFileSize: function(string) {
if (typeof string !== 'string') {
- return null;
+ return null
}
- var s = string.toLowerCase().trim();
- var bytes = null;
+ var s = string.toLowerCase().trim()
+ var bytes = null
var bytesArray = {
'b': 1,
@@ -88,164 +90,165 @@ export default {
't': 1024 * 1024 * 1024 * 1024,
'pb': 1024 * 1024 * 1024 * 1024 * 1024,
'p': 1024 * 1024 * 1024 * 1024 * 1024
- };
+ }
- var matches = s.match(/^[\s+]?([0-9]*)(\.([0-9]+))?( +)?([kmgtp]?b?)$/i);
+ var matches = s.match(/^[\s+]?([0-9]*)(\.([0-9]+))?( +)?([kmgtp]?b?)$/i)
if (matches !== null) {
- bytes = parseFloat(s);
+ bytes = parseFloat(s)
if (!isFinite(bytes)) {
- return null;
+ return null
}
} else {
- return null;
+ return null
}
if (matches[5]) {
- bytes = bytes * bytesArray[matches[5]];
+ bytes = bytes * bytesArray[matches[5]]
}
- bytes = Math.round(bytes);
- return bytes;
+ bytes = Math.round(bytes)
+ return bytes
},
/**
- * @param timestamp
- * @param format
+ * @param {string|number} timestamp timestamp
+ * @param {string} format date format, see momentjs docs
* @returns {string} timestamp formatted as requested
*/
- formatDate: function (timestamp, format) {
- format = format || "LLL";
- return moment(timestamp).format(format);
+ formatDate: function(timestamp, format) {
+ format = format || 'LLL'
+ return moment(timestamp).format(format)
},
/**
- * @param timestamp
+ * @param {string|number} timestamp timestamp
* @returns {string} human readable difference from now
*/
- relativeModifiedDate: function (timestamp) {
- var diff = moment().diff(moment(timestamp));
+ relativeModifiedDate: function(timestamp) {
+ var diff = moment().diff(moment(timestamp))
if (diff >= 0 && diff < 45000) {
- return t('core', 'seconds ago');
+ return t('core', 'seconds ago')
}
- return moment(timestamp).fromNow();
+ return moment(timestamp).fromNow()
},
/**
* Returns whether this is IE
*
- * @return {bool} true if this is IE, false otherwise
+ * @returns {bool} true if this is IE, false otherwise
*/
- isIE: function () {
- return $('html').hasClass('ie');
+ isIE: function() {
+ return $('html').hasClass('ie')
},
/**
* Returns the width of a generic browser scrollbar
*
- * @return {int} width of scrollbar
+ * @returns {int} width of scrollbar
*/
- getScrollBarWidth: function () {
+ getScrollBarWidth: function() {
if (this._scrollBarWidth) {
- return this._scrollBarWidth;
+ return this._scrollBarWidth
}
- var inner = document.createElement('p');
- inner.style.width = "100%";
- inner.style.height = "200px";
+ var inner = document.createElement('p')
+ inner.style.width = '100%'
+ inner.style.height = '200px'
- var outer = document.createElement('div');
- outer.style.position = "absolute";
- outer.style.top = "0px";
- outer.style.left = "0px";
- outer.style.visibility = "hidden";
- outer.style.width = "200px";
- outer.style.height = "150px";
- outer.style.overflow = "hidden";
- outer.appendChild(inner);
+ var outer = document.createElement('div')
+ outer.style.position = 'absolute'
+ outer.style.top = '0px'
+ outer.style.left = '0px'
+ outer.style.visibility = 'hidden'
+ outer.style.width = '200px'
+ outer.style.height = '150px'
+ outer.style.overflow = 'hidden'
+ outer.appendChild(inner)
- document.body.appendChild(outer);
- var w1 = inner.offsetWidth;
- outer.style.overflow = 'scroll';
- var w2 = inner.offsetWidth;
+ document.body.appendChild(outer)
+ var w1 = inner.offsetWidth
+ outer.style.overflow = 'scroll'
+ var w2 = inner.offsetWidth
if (w1 === w2) {
- w2 = outer.clientWidth;
+ w2 = outer.clientWidth
}
- document.body.removeChild(outer);
+ document.body.removeChild(outer)
- this._scrollBarWidth = (w1 - w2);
+ this._scrollBarWidth = (w1 - w2)
- return this._scrollBarWidth;
+ return this._scrollBarWidth
},
/**
* Remove the time component from a given date
*
* @param {Date} date date
- * @return {Date} date with stripped time
+ * @returns {Date} date with stripped time
*/
- stripTime: function (date) {
+ stripTime: function(date) {
// FIXME: likely to break when crossing DST
// would be better to use a library like momentJS
- return new Date(date.getFullYear(), date.getMonth(), date.getDate());
+ return new Date(date.getFullYear(), date.getMonth(), date.getDate())
},
/**
* Compare two strings to provide a natural sort
- * @param a first string to compare
- * @param b second string to compare
- * @return -1 if b comes before a, 1 if a comes before b
+ * @param {string} a first string to compare
+ * @param {string} b second string to compare
+ * @returns {number} -1 if b comes before a, 1 if a comes before b
* or 0 if the strings are identical
*/
- naturalSortCompare: function (a, b) {
- var x;
- var aa = chunkify(a);
- var bb = chunkify(b);
+ naturalSortCompare: function(a, b) {
+ var x
+ var aa = chunkify(a)
+ var bb = chunkify(b)
for (x = 0; aa[x] && bb[x]; x++) {
if (aa[x] !== bb[x]) {
- var aNum = Number(aa[x]), bNum = Number(bb[x]);
+ var aNum = Number(aa[x]); var bNum = Number(bb[x])
// note: == is correct here
+ /* eslint-disable-next-line */
if (aNum == aa[x] && bNum == bb[x]) {
- return aNum - bNum;
+ return aNum - bNum
} else {
// Note: This locale setting isn't supported by all browsers but for the ones
// that do there will be more consistency between client-server sorting
- return aa[x].localeCompare(bb[x], OC.getLanguage());
+ return aa[x].localeCompare(bb[x], OC.getLanguage())
}
}
}
- return aa.length - bb.length;
+ return aa.length - bb.length
},
/**
* Calls the callback in a given interval until it returns true
- * @param {function} callback
+ * @param {function} callback function to call on success
* @param {integer} interval in milliseconds
*/
- waitFor: function (callback, interval) {
- var internalCallback = function () {
+ waitFor: function(callback, interval) {
+ var internalCallback = function() {
if (callback() !== true) {
- setTimeout(internalCallback, interval);
+ setTimeout(internalCallback, interval)
}
- };
+ }
- internalCallback();
+ internalCallback()
},
/**
* Checks if a cookie with the given name is present and is set to the provided value.
* @param {string} name name of the cookie
* @param {string} value value of the cookie
- * @return {boolean} true if the cookie with the given name has the given value
+ * @returns {boolean} true if the cookie with the given name has the given value
*/
- isCookieSetToValue: function (name, value) {
- var cookies = document.cookie.split(';');
+ isCookieSetToValue: function(name, value) {
+ var cookies = document.cookie.split(';')
for (var i = 0; i < cookies.length; i++) {
- var cookie = cookies[i].split('=');
+ var cookie = cookies[i].split('=')
if (cookie[0].trim() === name && cookie[1].trim() === value) {
- return true;
+ return true
}
}
- return false;
+ return false
}
}
diff --git a/core/src/OC/xhr-error.js b/core/src/OC/xhr-error.js
index 43b2eba722..8d2ad11533 100644
--- a/core/src/OC/xhr-error.js
+++ b/core/src/OC/xhr-error.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -34,11 +34,12 @@ import Notification from './notification'
*/
export const ajaxConnectionLostHandler = _.throttle(() => {
Notification.showTemporary(t('core', 'Connection to server lost'))
-}, 7 * 1000, {trailing: false})
+}, 7 * 1000, { trailing: false })
/**
* Process ajax error, redirects to main page
* if an error/auth error status was returned.
+ * @param {XMLHttpRequest} xhr xhr request
*/
export const processAjaxError = xhr => {
// purposefully aborted request ?
@@ -50,18 +51,18 @@ export const processAjaxError = xhr => {
if (_.contains([302, 303, 307, 401], xhr.status) && OC.currentUser) {
// sometimes "beforeunload" happens later, so need to defer the reload a bit
- setTimeout(function () {
+ setTimeout(function() {
if (!OC._userIsNavigatingAway && !OC._reloadCalled) {
let timer = 0
const seconds = 5
- const interval = setInterval(function () {
- Notification.showUpdate(n('core', 'Problem loading page, reloading in %n second', 'Problem loading page, reloading in %n seconds', seconds - timer))
- if (timer >= seconds) {
- clearInterval(interval)
- OC.reload()
- }
- timer++
- }, 1000 // 1 second interval
+ const interval = setInterval(function() {
+ Notification.showUpdate(n('core', 'Problem loading page, reloading in %n second', 'Problem loading page, reloading in %n seconds', seconds - timer))
+ if (timer >= seconds) {
+ clearInterval(interval)
+ OC.reload()
+ }
+ timer++
+ }, 1000 // 1 second interval
)
// only call reload once
@@ -70,7 +71,7 @@ export const processAjaxError = xhr => {
}, 100)
} else if (xhr.status === 0) {
// Connection lost (e.g. WiFi disconnected or server is down)
- setTimeout(function () {
+ setTimeout(function() {
if (!OC._userIsNavigatingAway && !OC._reloadCalled) {
// TODO: call method above directly
OC._ajaxConnectionLostHandler()
@@ -85,7 +86,7 @@ export const processAjaxError = xhr => {
* This means that if this XHR object returns 401 or session timeout errors,
* the current page will automatically be reloaded.
*
- * @param {XMLHttpRequest} xhr
+ * @param {XMLHttpRequest} xhr xhr request
*/
export const registerXHRForErrorProcessing = xhr => {
const loadCallback = () => {
@@ -93,7 +94,7 @@ export const registerXHRForErrorProcessing = xhr => {
return
}
- if (xhr.status >= 200 && xhr.status < 300 || xhr.status === 304) {
+ if ((xhr.status >= 200 && xhr.status < 300) || xhr.status === 304) {
return
}
diff --git a/core/src/OCA/index.js b/core/src/OCA/index.js
index fa354456c9..4b87d325a5 100644
--- a/core/src/OCA/index.js
+++ b/core/src/OCA/index.js
@@ -23,4 +23,4 @@
* Namespace for apps
* @namespace OCA
*/
-export default {};
+export default {}
diff --git a/core/src/OCP/appconfig.js b/core/src/OCP/appconfig.js
index 9c5b063566..f4213419aa 100644
--- a/core/src/OCP/appconfig.js
+++ b/core/src/OCP/appconfig.js
@@ -23,94 +23,94 @@ import $ from 'jquery'
import OC from '../OC/index'
/**
- * @param {string} method
- * @param {string} endpoint
- * @param {Object} [options]
- * @param {Object} [options.data]
- * @param {function} [options.success]
- * @param {function} [options.error]
+ * @param {string} method 'post' or 'delete'
+ * @param {string} endpoint endpoint
+ * @param {Object} [options] destructuring object
+ * @param {Object} [options.data] option data
+ * @param {function} [options.success] success callback
+ * @param {function} [options.error] error callback
* @internal
*/
-function call (method, endpoint, options) {
+function call(method, endpoint, options) {
if ((method === 'post' || method === 'delete') && OC.PasswordConfirmation.requiresPasswordConfirmation()) {
- OC.PasswordConfirmation.requirePasswordConfirmation(_.bind(call, this, method, endpoint, options));
- return;
+ OC.PasswordConfirmation.requirePasswordConfirmation(_.bind(call, this, method, endpoint, options))
+ return
}
- options = options || {};
+ options = options || {}
$.ajax({
type: method.toUpperCase(),
url: OC.linkToOCS('apps/provisioning_api/api/v1', 2) + 'config/apps' + endpoint,
data: options.data || {},
success: options.success,
error: options.error
- });
+ })
}
/**
- * @param {Object} [options]
- * @param {function} [options.success]
+ * @param {Object} [options] destructuring object
+ * @param {function} [options.success] success callback
* @since 11.0.0
*/
-export function getApps (options) {
- call('get', '', options);
+export function getApps(options) {
+ call('get', '', options)
}
/**
- * @param {string} app
- * @param {Object} [options]
- * @param {function} [options.success]
- * @param {function} [options.error]
+ * @param {string} app app id
+ * @param {Object} [options] destructuring object
+ * @param {function} [options.success] success callback
+ * @param {function} [options.error] error callback
* @since 11.0.0
*/
-export function getKeys (app, options) {
- call('get', '/' + app, options);
+export function getKeys(app, options) {
+ call('get', '/' + app, options)
}
/**
- * @param {string} app
- * @param {string} key
- * @param {string|function} defaultValue
- * @param {Object} [options]
- * @param {function} [options.success]
- * @param {function} [options.error]
+ * @param {string} app app id
+ * @param {string} key key
+ * @param {string|function} defaultValue default value
+ * @param {Object} [options] destructuring object
+ * @param {function} [options.success] success callback
+ * @param {function} [options.error] error callback
* @since 11.0.0
*/
-export function getValue (app, key, defaultValue, options) {
- options = options || {};
+export function getValue(app, key, defaultValue, options) {
+ options = options || {}
options.data = {
defaultValue: defaultValue
- };
+ }
- call('get', '/' + app + '/' + key, options);
+ call('get', '/' + app + '/' + key, options)
}
/**
- * @param {string} app
- * @param {string} key
- * @param {string} value
- * @param {Object} [options]
- * @param {function} [options.success]
- * @param {function} [options.error]
+ * @param {string} app app id
+ * @param {string} key key
+ * @param {string} value value
+ * @param {Object} [options] destructuring object
+ * @param {function} [options.success] success callback
+ * @param {function} [options.error] error callback
* @since 11.0.0
*/
-export function setValue (app, key, value, options) {
- options = options || {};
+export function setValue(app, key, value, options) {
+ options = options || {}
options.data = {
value: value
- };
+ }
- call('post', '/' + app + '/' + key, options);
+ call('post', '/' + app + '/' + key, options)
}
/**
- * @param {string} app
- * @param {string} key
- * @param {Object} [options]
- * @param {function} [options.success]
- * @param {function} [options.error]
+ * @param {string} app app id
+ * @param {string} key key
+ * @param {Object} [options] destructuring object
+ * @param {function} [options.success] success callback
+ * @param {function} [options.error] error callback
* @since 11.0.0
*/
-export function deleteKey (app, key, options) {
- call('delete', '/' + app + '/' + key, options);
+export function deleteKey(app, key, options) {
+ call('delete', '/' + app + '/' + key, options)
}
diff --git a/core/src/OCP/collaboration.js b/core/src/OCP/collaboration.js
index 162fe8e2a7..4eea517f3a 100644
--- a/core/src/OCP/collaboration.js
+++ b/core/src/OCP/collaboration.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright Copyright (c) 2018 Julius Härtl
*
* @author Julius Härtl
@@ -30,13 +30,14 @@
/**
* @type {TypeDefinition[]}
**/
-let types = {};
+let types = {}
/**
* Those translations will be used by the vue component but they should be shipped with the server
* FIXME: Those translations should be added to the library
+ * @returns {Array}
*/
-const l10nProjects = () => {
+export const l10nProjects = () => {
return [
t('core', 'Add to a project'),
t('core', 'Show details'),
@@ -47,32 +48,32 @@ const l10nProjects = () => {
t('core', 'Failed to add the item to the project'),
t('core', 'Connect items to a project to make them easier to find'),
t('core', 'Type to search for existing projects')
- ];
+ ]
}
export default {
/**
*
- * @param type
- * @param {TypeDefinition} typeDefinition
+ * @param {string} type type
+ * @param {TypeDefinition} typeDefinition typeDefinition
*/
registerType(type, typeDefinition) {
- types[type] = typeDefinition;
+ types[type] = typeDefinition
},
trigger(type) {
return types[type].action()
},
getTypes() {
- return Object.keys(types);
+ return Object.keys(types)
},
getIcon(type) {
- return types[type].typeIconClass || '';
+ return types[type].typeIconClass || ''
},
getLabel(type) {
return escapeHTML(types[type].typeString || type)
},
getLink(type, id) {
/* TODO: Allow action to be executed instead of href as well */
- return typeof types[type] !== 'undefined' ? types[type].link(id) : '';
+ return typeof types[type] !== 'undefined' ? types[type].link(id) : ''
}
-};
+}
diff --git a/core/src/OCP/comments.js b/core/src/OCP/comments.js
index 1500e1937c..2e12accddc 100644
--- a/core/src/OCP/comments.js
+++ b/core/src/OCP/comments.js
@@ -18,34 +18,34 @@ import $ from 'jquery'
* The downside: anything not ascii is excluded. Not sure how common it is in areas using different
* alphabets… the upside: fake domains with similar looking characters won't be formatted as links
*/
-const urlRegex = /(\s|^)(https?:\/\/)?((?:[-A-Z0-9+_]+\.)+[-A-Z]+(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)(\s|$)/ig;
+const urlRegex = /(\s|^)(https?:\/\/)?((?:[-A-Z0-9+_]+\.)+[-A-Z]+(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)(\s|$)/ig
-export function plainToRich (content) {
- return this.formatLinksRich(content);
+export function plainToRich(content) {
+ return this.formatLinksRich(content)
}
-export function richToPlain (content) {
- return this.formatLinksPlain(content);
+export function richToPlain(content) {
+ return this.formatLinksPlain(content)
}
-export function formatLinksRich (content) {
- return content.replace(urlRegex, function (_, leadingSpace, protocol, url, trailingSpace) {
- let linkText = url;
+export function formatLinksRich(content) {
+ return content.replace(urlRegex, function(_, leadingSpace, protocol, url, trailingSpace) {
+ let linkText = url
if (!protocol) {
- protocol = 'https://';
+ protocol = 'https://'
} else if (protocol === 'http://') {
- linkText = protocol + url;
+ linkText = protocol + url
}
- return leadingSpace + '' + linkText + '' + trailingSpace;
- });
+ return leadingSpace + '' + linkText + '' + trailingSpace
+ })
}
-export function formatLinksPlain (content) {
- const $content = $('').html(content);
- $content.find('a').each(function () {
- const $this = $(this);
- $this.html($this.attr('href'));
- });
- return $content.html();
+export function formatLinksPlain(content) {
+ const $content = $('').html(content)
+ $content.find('a').each(function() {
+ const $this = $(this)
+ $this.html($this.attr('href'))
+ })
+ return $content.html()
}
diff --git a/core/src/OCP/index.js b/core/src/OCP/index.js
index a4d8f46b88..7d5edd5a9d 100644
--- a/core/src/OCP/index.js
+++ b/core/src/OCP/index.js
@@ -18,4 +18,4 @@ export default {
Loader,
Toast,
WhatsNew
-};
+}
diff --git a/core/src/OCP/initialstate.js b/core/src/OCP/initialstate.js
index af5dd91e3f..0a6f364ed0 100644
--- a/core/src/OCP/initialstate.js
+++ b/core/src/OCP/initialstate.js
@@ -24,19 +24,19 @@
* @namespace OCP.InitialState
*/
-export function loadState (app, key) {
- const elem = document.querySelector(`#initial-state-${app}-${key}`);
+export function loadState(app, key) {
+ const elem = document.querySelector(`#initial-state-${app}-${key}`)
if (elem === null) {
const msg = `Could not find initial state ${key} of ${app}`
- console.debug(msg);
- throw new Error(msg);
+ console.debug(msg)
+ throw new Error(msg)
}
try {
- return JSON.parse(atob(elem.value));
+ return JSON.parse(atob(elem.value))
} catch (e) {
const msg = `Could not parse initial state ${key} of ${app}`
- console.debug(msg);
- throw new Error(msg);
+ console.debug(msg)
+ throw new Error(msg)
}
}
diff --git a/core/src/OCP/loader.js b/core/src/OCP/loader.js
index 9f551b90a1..7f72c47ca6 100644
--- a/core/src/OCP/loader.js
+++ b/core/src/OCP/loader.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright Copyright (c) 2018 Julius Härtl
*
* @author Julius Härtl
@@ -20,61 +20,60 @@
*
*/
-let loadedScripts = {};
-let loadedStylesheets = {};
+let loadedScripts = {}
+let loadedStylesheets = {}
/**
* @namespace OCP
* @class Loader
*/
export default {
-
/**
* Load a script asynchronously
*
- * @param {string} app
- * @param {string} file
+ * @param {string} app the app name
+ * @param {string} file the script file name
* @returns {Promise}
*/
loadScript: function(app, file) {
- const key = app + file;
+ const key = app + file
if (loadedScripts.hasOwnProperty(key)) {
- return Promise.resolve();
+ return Promise.resolve()
}
- loadedScripts[key] = true;
- return new Promise(function (resolve, reject) {
- var scriptPath = OC.filePath(app, 'js', file);
- var script = document.createElement('script');
- script.src = scriptPath;
- script.setAttribute('nonce', btoa(OC.requestToken));
- script.onload = () => resolve();
- script.onerror = () => reject(`Failed to load script from ${scriptPath}`);
- document.head.appendChild(script);
- });
+ loadedScripts[key] = true
+ return new Promise(function(resolve, reject) {
+ var scriptPath = OC.filePath(app, 'js', file)
+ var script = document.createElement('script')
+ script.src = scriptPath
+ script.setAttribute('nonce', btoa(OC.requestToken))
+ script.onload = () => resolve()
+ script.onerror = () => reject(new Error(`Failed to load script from ${scriptPath}`))
+ document.head.appendChild(script)
+ })
},
/**
* Load a stylesheet file asynchronously
*
- * @param {string} app
- * @param {string} file
+ * @param {string} app the app name
+ * @param {string} file the script file name
* @returns {Promise}
*/
loadStylesheet: function(app, file) {
- const key = app + file;
+ const key = app + file
if (loadedStylesheets.hasOwnProperty(key)) {
- return Promise.resolve();
+ return Promise.resolve()
}
- loadedStylesheets[key] = true;
- return new Promise(function (resolve, reject) {
- var stylePath = OC.filePath(app, 'css', file);
- var link = document.createElement('link');
- link.href = stylePath;
- link.type = 'text/css';
- link.rel = 'stylesheet';
- link.onload = () => resolve();
- link.onerror = () => reject(`Failed to load stylesheet from ${stylePath}`);
- document.head.appendChild(link);
- });
- },
+ loadedStylesheets[key] = true
+ return new Promise(function(resolve, reject) {
+ var stylePath = OC.filePath(app, 'css', file)
+ var link = document.createElement('link')
+ link.href = stylePath
+ link.type = 'text/css'
+ link.rel = 'stylesheet'
+ link.onload = () => resolve()
+ link.onerror = () => reject(new Error(`Failed to load stylesheet from ${stylePath}`))
+ document.head.appendChild(link)
+ })
+ }
}
diff --git a/core/src/OCP/toast.js b/core/src/OCP/toast.js
index 113d37ab41..58f98d9348 100644
--- a/core/src/OCP/toast.js
+++ b/core/src/OCP/toast.js
@@ -33,34 +33,34 @@ const TOAST_TYPE_CLASES = {
const Toast = {
success(text, options = {}) {
- options.type = 'success';
+ options.type = 'success'
return this.message(text, options)
},
warning(text, options = {}) {
- options.type = 'warning';
+ options.type = 'warning'
return this.message(text, options)
},
error(text, options = {}) {
- options.type = 'error';
+ options.type = 'error'
return this.message(text, options)
},
info(text, options = {}) {
- options.type = 'info';
+ options.type = 'info'
return this.message(text, options)
},
message(text, options) {
- options = options || {};
+ options = options || {}
_.defaults(options, {
timeout: 7,
isHTML: false,
type: undefined,
close: true,
callback: () => {}
- });
+ })
if (!options.isHTML) {
text = $('').text(text).html()
}
@@ -71,7 +71,7 @@ const Toast = {
const toast = Toastify({
text: text,
- duration: options.timeout ? options.timeout*1000 : null,
+ duration: options.timeout ? options.timeout * 1000 : null,
callback: options.callback,
close: options.close,
gravity: 'top',
@@ -82,7 +82,7 @@ const Toast = {
})
toast.showToast()
// add toastify object to the element for reference in legacy OC.Notification
- toast.toastElement.toastify = toast;
+ toast.toastElement.toastify = toast
return toast
}
}
diff --git a/core/src/OCP/whatsnew.js b/core/src/OCP/whatsnew.js
index 837cb23217..c2935c5e78 100644
--- a/core/src/OCP/whatsnew.js
+++ b/core/src/OCP/whatsnew.js
@@ -12,121 +12,121 @@ import $ from 'jquery'
import OC from '../OC/index'
-export function query (options) {
- options = options || {};
- var dismissOptions = options.dismiss || {};
+export function query(options) {
+ options = options || {}
+ var dismissOptions = options.dismiss || {}
$.ajax({
type: 'GET',
url: options.url || OC.linkToOCS('core', 2) + 'whatsnew?format=json',
- success: options.success || function (data, statusText, xhr) {
- onQuerySuccess(data, statusText, xhr, dismissOptions);
+ success: options.success || function(data, statusText, xhr) {
+ onQuerySuccess(data, statusText, xhr, dismissOptions)
},
error: options.error || onQueryError
- });
+ })
}
-export function dismiss (version, options) {
- options = options || {};
+export function dismiss(version, options) {
+ options = options || {}
$.ajax({
type: 'POST',
url: options.url || OC.linkToOCS('core', 2) + 'whatsnew',
- data: {version: encodeURIComponent(version)},
+ data: { version: encodeURIComponent(version) },
success: options.success || onDismissSuccess,
error: options.error || onDismissError
- });
+ })
// remove element immediately
- $('.whatsNewPopover').remove();
+ $('.whatsNewPopover').remove()
}
-function onQuerySuccess (data, statusText, xhr, dismissOptions) {
- console.debug('querying Whats New data was successful: ' + statusText);
- console.debug(data);
+function onQuerySuccess(data, statusText, xhr, dismissOptions) {
+ console.debug('querying Whats New data was successful: ' + statusText)
+ console.debug(data)
if (xhr.status !== 200) {
- return;
+ return
}
- var item, menuItem, text, icon;
+ var item, menuItem, text, icon
- var div = document.createElement('div');
- div.classList.add('popovermenu', 'open', 'whatsNewPopover', 'menu-left');
+ var div = document.createElement('div')
+ div.classList.add('popovermenu', 'open', 'whatsNewPopover', 'menu-left')
- var list = document.createElement('ul');
+ var list = document.createElement('ul')
// header
- item = document.createElement('li');
- menuItem = document.createElement('span');
- menuItem.className = "menuitem";
+ item = document.createElement('li')
+ menuItem = document.createElement('span')
+ menuItem.className = 'menuitem'
- text = document.createElement('span');
- text.innerText = t('core', 'New in') + ' ' + data['ocs']['data']['product'];
- text.className = 'caption';
- menuItem.appendChild(text);
+ text = document.createElement('span')
+ text.innerText = t('core', 'New in') + ' ' + data['ocs']['data']['product']
+ text.className = 'caption'
+ menuItem.appendChild(text)
- icon = document.createElement('span');
- icon.className = 'icon-close';
- icon.onclick = function () {
- dismiss(data['ocs']['data']['version'], dismissOptions);
- };
- menuItem.appendChild(icon);
+ icon = document.createElement('span')
+ icon.className = 'icon-close'
+ icon.onclick = function() {
+ dismiss(data['ocs']['data']['version'], dismissOptions)
+ }
+ menuItem.appendChild(icon)
- item.appendChild(menuItem);
- list.appendChild(item);
+ item.appendChild(menuItem)
+ list.appendChild(item)
// Highlights
for (var i in data['ocs']['data']['whatsNew']['regular']) {
- var whatsNewTextItem = data['ocs']['data']['whatsNew']['regular'][i];
- item = document.createElement('li');
+ var whatsNewTextItem = data['ocs']['data']['whatsNew']['regular'][i]
+ item = document.createElement('li')
- menuItem = document.createElement('span');
- menuItem.className = "menuitem";
+ menuItem = document.createElement('span')
+ menuItem.className = 'menuitem'
- icon = document.createElement('span');
- icon.className = 'icon-checkmark';
- menuItem.appendChild(icon);
+ icon = document.createElement('span')
+ icon.className = 'icon-checkmark'
+ menuItem.appendChild(icon)
- text = document.createElement('p');
- text.innerHTML = _.escape(whatsNewTextItem);
- menuItem.appendChild(text);
+ text = document.createElement('p')
+ text.innerHTML = _.escape(whatsNewTextItem)
+ menuItem.appendChild(text)
- item.appendChild(menuItem);
- list.appendChild(item);
+ item.appendChild(menuItem)
+ list.appendChild(item)
}
// Changelog URL
if (!_.isUndefined(data['ocs']['data']['changelogURL'])) {
- item = document.createElement('li');
+ item = document.createElement('li')
- menuItem = document.createElement('a');
- menuItem.href = data['ocs']['data']['changelogURL'];
- menuItem.rel = 'noreferrer noopener';
- menuItem.target = '_blank';
+ menuItem = document.createElement('a')
+ menuItem.href = data['ocs']['data']['changelogURL']
+ menuItem.rel = 'noreferrer noopener'
+ menuItem.target = '_blank'
- icon = document.createElement('span');
- icon.className = 'icon-link';
- menuItem.appendChild(icon);
+ icon = document.createElement('span')
+ icon.className = 'icon-link'
+ menuItem.appendChild(icon)
- text = document.createElement('span');
- text.innerText = t('core', 'View changelog');
- menuItem.appendChild(text);
+ text = document.createElement('span')
+ text.innerText = t('core', 'View changelog')
+ menuItem.appendChild(text)
- item.appendChild(menuItem);
- list.appendChild(item);
+ item.appendChild(menuItem)
+ list.appendChild(item)
}
- div.appendChild(list);
- document.body.appendChild(div);
+ div.appendChild(list)
+ document.body.appendChild(div)
}
-function onQueryError (x, t, e) {
- console.debug('querying Whats New Data resulted in an error: ' + t + e);
- console.debug(x);
+function onQueryError(x, t, e) {
+ console.debug('querying Whats New Data resulted in an error: ' + t + e)
+ console.debug(x)
}
-function onDismissSuccess (data) {
- //noop
+function onDismissSuccess(data) {
+ // noop
}
-function onDismissError (data) {
- console.debug('dismissing Whats New data resulted in an error: ' + data);
-}
\ No newline at end of file
+function onDismissError(data) {
+ console.debug('dismissing Whats New data resulted in an error: ' + data)
+}
diff --git a/core/src/Polyfill/console.js b/core/src/Polyfill/console.js
index 72a1165e43..faa32c457c 100644
--- a/core/src/Polyfill/console.js
+++ b/core/src/Polyfill/console.js
@@ -1,4 +1,5 @@
-/*
+/* eslint-disable no-console */
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -19,13 +20,13 @@
* along with this program. If not, see
*
* @author 2019 Christoph Wurst
@@ -23,10 +23,11 @@
* Get the value of a URL parameter
* @link http://stackoverflow.com/questions/1403888/get-url-parameter-with-jquery
* @param {string} name URL parameter
- * @return {string}
+ * @returns {string}
*/
-export default function getURLParameter (name) {
+export default function getURLParameter(name) {
return decodeURIComponent(
+ // eslint-disable-next-line no-sparse-arrays
(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search) || [, ''])[1].replace(/\+/g, '%20')
- ) || '';
+ ) || ''
}
diff --git a/core/src/Util/human-file-size.js b/core/src/Util/human-file-size.js
index e671a86d05..586ef0e926 100644
--- a/core/src/Util/human-file-size.js
+++ b/core/src/Util/human-file-size.js
@@ -23,29 +23,29 @@
* Returns a human readable file size
* @param {number} size Size in bytes
* @param {boolean} skipSmallSizes return '< 1 kB' for small files
- * @return {string}
+ * @returns {string}
*/
-export default function humanFileSize (size, skipSmallSizes) {
- var humanList = ['B', 'KB', 'MB', 'GB', 'TB'];
+export default function humanFileSize(size, skipSmallSizes) {
+ var humanList = ['B', 'KB', 'MB', 'GB', 'TB']
// Calculate Log with base 1024: size = 1024 ** order
- var order = size > 0 ? Math.floor(Math.log(size) / Math.log(1024)) : 0;
+ var order = size > 0 ? Math.floor(Math.log(size) / Math.log(1024)) : 0
// Stay in range of the byte sizes that are defined
- order = Math.min(humanList.length - 1, order);
- var readableFormat = humanList[order];
- var relativeSize = (size / Math.pow(1024, order)).toFixed(1);
+ order = Math.min(humanList.length - 1, order)
+ var readableFormat = humanList[order]
+ var relativeSize = (size / Math.pow(1024, order)).toFixed(1)
if (skipSmallSizes === true && order === 0) {
- if (relativeSize !== "0.0") {
- return '< 1 KB';
+ if (relativeSize !== '0.0') {
+ return '< 1 KB'
} else {
- return '0 KB';
+ return '0 KB'
}
}
if (order < 2) {
- relativeSize = parseFloat(relativeSize).toFixed(0);
+ relativeSize = parseFloat(relativeSize).toFixed(0)
} else if (relativeSize.substr(relativeSize.length - 2, 2) === '.0') {
- relativeSize = relativeSize.substr(0, relativeSize.length - 2);
+ relativeSize = relativeSize.substr(0, relativeSize.length - 2)
} else {
- relativeSize = parseFloat(relativeSize).toLocaleString(OC.getCanonicalLocale());
+ relativeSize = parseFloat(relativeSize).toLocaleString(OC.getCanonicalLocale())
}
- return relativeSize + ' ' + readableFormat;
+ return relativeSize + ' ' + readableFormat
}
diff --git a/core/src/Util/relative-modified-date.js b/core/src/Util/relative-modified-date.js
index 3837d2c372..4e41f93925 100644
--- a/core/src/Util/relative-modified-date.js
+++ b/core/src/Util/relative-modified-date.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -24,14 +24,16 @@ import OC from '../OC/index'
/**
* Takes an absolute timestamp and return a string with a human-friendly relative date
+ *
* @param {number} timestamp A Unix timestamp
* @deprecated use OC.Util.relativeModifiedDate instead but beware the argument value
+ * @returns {string}
*/
-export default function relative_modified_date (timestamp) {
- console.warn('relative_modified_date is deprecated, use OC.Util.relativeModifiedDate instead')
+export default function relativeModifiedDate(timestamp) {
+ console.warn('relativeModifiedDate is deprecated, use OC.Util.relativeModifiedDate instead')
/*
Were multiplying by 1000 to bring the timestamp back to its original value
per https://github.com/owncloud/core/pull/10647#discussion_r16790315
*/
- return OC.Util.relativeModifiedDate(timestamp * 1000);
+ return OC.Util.relativeModifiedDate(timestamp * 1000)
}
diff --git a/core/src/components/ContactsMenu.js b/core/src/components/ContactsMenu.js
index 8243b9ca1f..661b6d8e7c 100644
--- a/core/src/components/ContactsMenu.js
+++ b/core/src/components/ContactsMenu.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -20,13 +20,13 @@
*/
import $ from 'jquery'
-
import OC from '../OC'
/**
* @todo move to contacts menu code https://github.com/orgs/nextcloud/projects/31#card-21213129
*/
export const setUp = () => {
+ // eslint-disable-next-line no-new
new OC.ContactsMenu({
el: $('#contactsmenu .menu'),
trigger: $('#contactsmenu .menutoggle')
diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
index 3ba13b4f02..e9f44cccb8 100644
--- a/core/src/components/login/LoginForm.vue
+++ b/core/src/components/login/LoginForm.vue
@@ -21,195 +21,195 @@
'
-const entryTemplate = require('./contactsmenu/jquery_entry.handlebars');
+const entryTemplate = require('./contactsmenu/jquery_entry.handlebars')
-$.fn.contactsMenu = function (shareWith, shareType, appendTo) {
+$.fn.contactsMenu = function(shareWith, shareType, appendTo) {
// 0 - user, 4 - email, 6 - remote
- var allowedTypes = [0, 4, 6];
+ var allowedTypes = [0, 4, 6]
if (allowedTypes.indexOf(shareType) === -1) {
- return;
+ return
}
- var $div = this;
- appendTo.append(LIST);
- var $list = appendTo.find('div.contactsmenu-popover');
+ var $div = this
+ appendTo.append(LIST)
+ var $list = appendTo.find('div.contactsmenu-popover')
- $div.click(function () {
+ $div.click(function() {
if (!$list.hasClass('hidden')) {
- $list.addClass('hidden');
- $list.hide();
- return;
+ $list.addClass('hidden')
+ $list.hide()
+ return
}
- $list.removeClass('hidden');
- $list.show();
+ $list.removeClass('hidden')
+ $list.show()
if ($list.hasClass('loaded')) {
- return;
+ return
}
- $list.addClass('loaded');
+ $list.addClass('loaded')
$.ajax(OC.generateUrl('/contactsmenu/findOne'), {
method: 'POST',
data: {
shareType: shareType,
shareWith: shareWith
}
- }).then(function (data) {
- $list.find('ul').find('li').addClass('hidden');
+ }).then(function(data) {
+ $list.find('ul').find('li').addClass('hidden')
- var actions;
+ var actions
if (!data.topAction) {
actions = [{
hyperlink: '#',
title: t('core', 'No action available')
- }];
+ }]
} else {
- actions = [data.topAction].concat(data.actions);
+ actions = [data.topAction].concat(data.actions)
}
- actions.forEach(function (action) {
- var template = entryTemplate;
- $list.find('ul').append(template(action));
- });
+ actions.forEach(function(action) {
+ var template = entryTemplate
+ $list.find('ul').append(template(action))
+ })
+ }, function(jqXHR) {
+ $list.find('ul').find('li').addClass('hidden')
- if (actions.length === 0) {
-
- }
- }, function (jqXHR) {
- $list.find('ul').find('li').addClass('hidden');
-
- var title;
+ var title
if (jqXHR.status === 404) {
- title = t('core', 'No action available');
+ title = t('core', 'No action available')
} else {
- title = t('core', 'Error fetching contact actions');
+ title = t('core', 'Error fetching contact actions')
}
- var template = entryTemplate;
+ var template = entryTemplate
$list.find('ul').append(template({
hyperlink: '#',
title: title
- }));
- });
- });
+ }))
+ })
+ })
- $(document).click(function (event) {
- var clickedList = ($list.has(event.target).length > 0);
- var clickedTarget = ($div.has(event.target).length > 0);
+ $(document).click(function(event) {
+ var clickedList = ($list.has(event.target).length > 0)
+ var clickedTarget = ($div.has(event.target).length > 0)
- $div.each(function () {
+ $div.each(function() {
if ($(this).is(event.target)) {
- clickedTarget = true;
+ clickedTarget = true
}
- });
+ })
if (clickedList || clickedTarget) {
- return;
+ return
}
- $list.addClass('hidden');
- $list.hide();
- });
-};
+ $list.addClass('hidden')
+ $list.hide()
+ })
+}
diff --git a/core/src/jquery/exists.js b/core/src/jquery/exists.js
index bdf62ab7d4..3481faeb6c 100644
--- a/core/src/jquery/exists.js
+++ b/core/src/jquery/exists.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst