aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/src/models
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files/src/models')
-rw-r--r--apps/files/src/models/Setting.js21
-rw-r--r--apps/files/src/models/Tab.js7
2 files changed, 22 insertions, 6 deletions
diff --git a/apps/files/src/models/Setting.js b/apps/files/src/models/Setting.js
index 66173b7df93..1db1d818e69 100644
--- a/apps/files/src/models/Setting.js
+++ b/apps/files/src/models/Setting.js
@@ -9,6 +9,7 @@ export default class Setting {
_el
_name
_open
+ _order
/**
* Create a new files app setting
@@ -19,12 +20,14 @@ export default class Setting {
* @param {Function} component.el function that returns an unmounted dom element to be added
* @param {Function} [component.open] callback for when setting is added
* @param {Function} [component.close] callback for when setting is closed
+ * @param {number} [component.order] the order of this setting, lower numbers are shown first
*/
- constructor(name, { el, open, close }) {
+ constructor(name, { el, open, close, order }) {
this._name = name
this._el = el
this._open = open
this._close = close
+ this._order = order || 0
if (typeof this._open !== 'function') {
this._open = () => {}
@@ -33,6 +36,18 @@ export default class Setting {
if (typeof this._close !== 'function') {
this._close = () => {}
}
+
+ if (typeof this._el !== 'function') {
+ throw new Error('Setting must have an `el` function that returns a DOM element')
+ }
+
+ if (typeof this._name !== 'string') {
+ throw new Error('Setting must have a `name` string')
+ }
+
+ if (typeof this._order !== 'number') {
+ throw new Error('Setting must have an `order` number')
+ }
}
get name() {
@@ -51,4 +66,8 @@ export default class Setting {
return this._close
}
+ get order() {
+ return this._order
+ }
+
}
diff --git a/apps/files/src/models/Tab.js b/apps/files/src/models/Tab.js
index 7b5ec721f1c..b67d51f277f 100644
--- a/apps/files/src/models/Tab.js
+++ b/apps/files/src/models/Tab.js
@@ -2,7 +2,7 @@
* SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
-import { sanitizeSVG } from '@skjnldsv/sanitize-svg'
+import DOMPurify from 'dompurify'
export default class Tab {
@@ -80,10 +80,7 @@ export default class Tab {
this._scrollBottomReached = scrollBottomReached
if (typeof iconSvg === 'string') {
- sanitizeSVG(iconSvg)
- .then(sanitizedSvg => {
- this._iconSvgSanitized = sanitizedSvg
- })
+ this._iconSvgSanitized = DOMPurify.sanitize(iconSvg)
}
}