diff options
Diffstat (limited to 'core/src/OC/notification.js')
| -rw-r--r-- | core/src/OC/notification.js | 74 |
1 files changed, 49 insertions, 25 deletions
diff --git a/core/src/OC/notification.js b/core/src/OC/notification.js index 4e95476b69b..a0b289b6a87 100644 --- a/core/src/OC/notification.js +++ b/core/src/OC/notification.js @@ -1,7 +1,12 @@ /** * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at> * - * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at> + * @author Christoph Wurst <christoph@winzerhof-wurst.at> + * @author Daniel Calviño Sánchez <danxuliu@gmail.com> + * @author Joas Schilling <coding@schilljs.com> + * @author John Molakvoæ <skjnldsv@protonmail.com> + * @author Julius Härtl <jus@bitgrid.net> + * @author npmbuildbot[bot] "npmbuildbot[bot]@users.noreply.github.com" * * @license GNU AGPL version 3 or any later version * @@ -16,15 +21,17 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * */ import _ from 'underscore' import $ from 'jquery' +import { showMessage, TOAST_DEFAULT_TIMEOUT, TOAST_PERMANENT_TIMEOUT } from '@nextcloud/dialogs' /** * @todo Write documentation - * @deprecated 17.0.0 use OCP.Toast + * @deprecated 17.0.0 use the `@nextcloud/dialogs` package instead * @namespace OC.Notification */ export default { @@ -35,9 +42,9 @@ export default { /** * @param {Function} callback callback function - * @deprecated 17.0.0 use OCP.Toast + * @deprecated 17.0.0 use the `@nextcloud/dialogs` package */ - setDefault: function(callback) { + setDefault(callback) { this.getDefaultNotificationFunction = callback }, @@ -49,9 +56,9 @@ export default { * * @param {jQuery} [$row] notification row * @param {Function} [callback] callback - * @deprecated 17.0.0 use OCP.Toast + * @deprecated 17.0.0 use the `@nextcloud/dialogs` package */ - hide: function($row, callback) { + hide($row, callback) { if (_.isFunction($row)) { // first arg is the callback callback = $row @@ -65,7 +72,11 @@ export default { // remove the row directly $row.each(function() { - $(this)[0].toastify.hideToast() + if ($(this)[0].toastify) { + $(this)[0].toastify.hideToast() + } else { + console.error('cannot hide toast because object is not set') + } if (this === this.updatableNotification) { this.updatableNotification = null } @@ -88,13 +99,14 @@ export default { * @param {string} [options.type] notification type * @param {int} [options.timeout=0] timeout value, defaults to 0 (permanent) * @returns {jQuery} jQuery element for notification row - * @deprecated 17.0.0 use OCP.Toast + * @deprecated 17.0.0 use the `@nextcloud/dialogs` package */ - showHtml: function(html, options) { + showHtml(html, options) { options = options || {} options.isHTML = true - options.timeout = (!options.timeout) ? -1 : options.timeout - const toast = window.OCP.Toast.message(html, options) + options.timeout = (!options.timeout) ? TOAST_PERMANENT_TIMEOUT : options.timeout + const toast = showMessage(html, options) + toast.toastElement.toastify = toast return $(toast.toastElement) }, @@ -106,12 +118,22 @@ export default { * @param {string} [options.type] notification type * @param {int} [options.timeout=0] timeout value, defaults to 0 (permanent) * @returns {jQuery} jQuery element for notification row - * @deprecated 17.0.0 use OCP.Toast + * @deprecated 17.0.0 use the `@nextcloud/dialogs` package */ - show: function(text, options) { + show(text, options) { + const escapeHTML = function(text) { + return text.toString() + .split('&').join('&') + .split('<').join('<') + .split('>').join('>') + .split('"').join('"') + .split('\'').join(''') + } + options = options || {} - options.timeout = (!options.timeout) ? -1 : options.timeout - const toast = window.OCP.Toast.message(text, options) + options.timeout = (!options.timeout) ? TOAST_PERMANENT_TIMEOUT : options.timeout + const toast = showMessage(escapeHTML(text), options) + toast.toastElement.toastify = toast return $(toast.toastElement) }, @@ -120,13 +142,14 @@ export default { * * @param {string} text Message to display * @returns {jQuery} JQuery element for notificaiton row - * @deprecated 17.0.0 use OCP.Toast + * @deprecated 17.0.0 use the `@nextcloud/dialogs` package */ - showUpdate: function(text) { + showUpdate(text) { if (this.updatableNotification) { this.updatableNotification.hideToast() } - this.updatableNotification = OCP.Toast.message(text, { timeout: -1 }) + this.updatableNotification = showMessage(text, { timeout: TOAST_PERMANENT_TIMEOUT }) + this.updatableNotification.toastElement.toastify = this.updatableNotification return $(this.updatableNotification.toastElement) }, @@ -140,21 +163,22 @@ export default { * @param {boolean} [options.isHTML=false] an indicator for HTML notifications (true) or text (false) * @param {string} [options.type] notification type * @returns {JQuery<any>} the toast element - * @deprecated 17.0.0 use OCP.Toast + * @deprecated 17.0.0 use the `@nextcloud/dialogs` package */ - showTemporary: function(text, options) { + showTemporary(text, options) { options = options || {} - options.timeout = options.timeout || 7 - const toast = window.OCP.Toast.message(text, options) + options.timeout = options.timeout || TOAST_DEFAULT_TIMEOUT + const toast = showMessage(text, options) + toast.toastElement.toastify = toast return $(toast.toastElement) }, /** * Returns whether a notification is hidden. * @returns {boolean} - * @deprecated 17.0.0 use OCP.Toast + * @deprecated 17.0.0 use the `@nextcloud/dialogs` package */ - isHidden: function() { + isHidden() { return !$('#content').find('.toastify').length }, } |