diff options
author | Morris Jobke <hey@morrisjobke.de> | 2018-10-25 15:49:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-25 15:49:27 +0200 |
commit | 0a2476fcb3823864bceb116d79d48a8278ea4981 (patch) | |
tree | ce61bc3b9a2a659eeeee60f274cc7728f2803bf1 /core | |
parent | 116268a2b594938b9adec2ee65ef4b0391327630 (diff) | |
parent | b09f7ad822835cdf795a444ba856ae8097f51cc8 (diff) | |
download | nextcloud-server-0a2476fcb3823864bceb116d79d48a8278ea4981.tar.gz nextcloud-server-0a2476fcb3823864bceb116d79d48a8278ea4981.zip |
Merge pull request #11988 from nextcloud/docs/jsdoc-build
JSdoc build fixes and move build script out of the root folder
Diffstat (limited to 'core')
-rw-r--r-- | core/js/contactsmenu.js | 13 | ||||
-rw-r--r-- | core/js/files/client.js | 2 | ||||
-rw-r--r-- | core/js/js.js | 10 | ||||
-rw-r--r-- | core/js/login.js | 1 | ||||
-rw-r--r-- | core/js/shareitemmodel.js | 2 | ||||
-rw-r--r-- | core/search/js/search.js | 3 |
6 files changed, 23 insertions, 8 deletions
diff --git a/core/js/contactsmenu.js b/core/js/contactsmenu.js index 8c9b7060a74..d6565a40076 100644 --- a/core/js/contactsmenu.js +++ b/core/js/contactsmenu.js @@ -22,6 +22,10 @@ * */ +/** + * @module OC.ContactsMenu + * @private + */ (function(OC, $, _, Handlebars) { 'use strict'; @@ -56,6 +60,7 @@ /** * @class ContactCollection + * @private */ var ContactCollection = OC.Backbone.Collection.extend({ model: Contact @@ -63,10 +68,11 @@ /** * @class ContactsListView + * @private */ var ContactsListView = OC.Backbone.View.extend({ - /** @type {ContactsCollection} */ + /** @type {ContactCollection} */ _collection: undefined, /** @type {array} */ @@ -115,7 +121,8 @@ }); /** - * @class CotnactsListItemView + * @class ContactsListItemView + * @private */ var ContactsListItemView = OC.Backbone.View.extend({ @@ -205,6 +212,7 @@ /** * @class ContactsMenuView + * @private */ var ContactsMenuView = OC.Backbone.View.extend({ @@ -364,6 +372,7 @@ * @param {jQuery} options.el * @param {jQuery} options.trigger * @class ContactsMenu + * @memberOf OC */ var ContactsMenu = function(options) { this.initialize(options); diff --git a/core/js/files/client.js b/core/js/files/client.js index f3838dd359a..9de732b3bd4 100644 --- a/core/js/files/client.js +++ b/core/js/files/client.js @@ -837,7 +837,7 @@ /** * Add a file info parser function * - * @param {OC.Files.Client~parseFileInfo>} + * @param {OC.Files.Client~parseFileInfo} parserFunction */ addFileInfoParser: function(parserFunction) { this._fileInfoParsers.push(parserFunction); diff --git a/core/js/js.js b/core/js/js.js index 880b986e17b..fd6e0a68da5 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -38,8 +38,11 @@ function escapeHTML(s) { return s.toString().split('&').join('&').split('<').join('<').split('>').join('>').split('"').join('"').split('\'').join('''); } -/** @namespace */ +/** @namespace OCP */ var OCP = {}, + /** + * @namespace OC + */ OC = { PERMISSION_NONE:0, PERMISSION_CREATE:4, @@ -659,7 +662,7 @@ var OCP = {}, registerMenu: function($toggle, $menuEl, toggle, headerMenu) { var self = this; $menuEl.addClass('menu'); - + // On link, the enter key trigger a click event // Only use the click to avoid two fired events $toggle.on($toggle.prop('tagName') === 'A' @@ -1101,7 +1104,8 @@ OC.Notification={ getDefaultNotificationFunction: null, /** - * @type Array.<int> array of notification timers + * @type Array<int> + * @description array of notification timers */ notificationTimers: [], diff --git a/core/js/login.js b/core/js/login.js index 012b4e0280e..3447a5de724 100644 --- a/core/js/login.js +++ b/core/js/login.js @@ -9,6 +9,7 @@ /** * @namespace * @memberOf OC + * @private */ OC.Login = _.extend(OC.Login || {}, { onLogin: function () { diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js index c28d85efbf0..f4a3caf1370 100644 --- a/core/js/shareitemmodel.js +++ b/core/js/shareitemmodel.js @@ -80,7 +80,7 @@ */ var ShareItemModel = OC.Backbone.Model.extend({ /** - * @type share id of the link share, if applicable + * share id of the link share, if applicable */ _linkShareId: null, diff --git a/core/search/js/search.js b/core/search/js/search.js index 167d7c7a53d..5b44027af38 100644 --- a/core/search/js/search.js +++ b/core/search/js/search.js @@ -23,7 +23,8 @@ 'use strict'; /** - * @class OCA.Search + * @class Search + * @memberOf OCA * * The Search class manages a search * |