mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Inline usages of OCP.Toast in bundled files 

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2020-02-07 11:02:45 +01:00
parent 01a70e5d0f
commit 8119e0b18e
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
20 changed files with 188 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files/js/dist/personal-settings.js vendored
View File

File diff suppressed because one or more lines are too long

2
apps/files/js/dist/personal-settings.js.map vendored
View File

File diff suppressed because one or more lines are too long

14
apps/files/js/dist/sidebar.js vendored
View File

File diff suppressed because one or more lines are too long

2
apps/files/js/dist/sidebar.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
apps/files/src/components/TransferOwnershipDialogue.vue
View File

@ -70,7 +70,7 @@
import axios from '@nextcloud/axios' import axios from '@nextcloud/axios'
import debounce from 'debounce' import debounce from 'debounce'
import { generateOcsUrl } from '@nextcloud/router' import { generateOcsUrl } from '@nextcloud/router'
import { getFilePickerBuilder } from '@nextcloud/dialogs' import { getFilePickerBuilder, showSuccess } from '@nextcloud/dialogs'
import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect' import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
import Vue from 'vue' import Vue from 'vue'
@ -210,7 +210,7 @@ export default {
this.directory = undefined this.directory = undefined
this.selectedUser = null this.selectedUser = null
OCP.Toast.success(t('files', 'Ownership transfer request sent')) showSuccess(t('files', 'Ownership transfer request sent'))
}) })
.catch(error => { .catch(error => {
logger.error('Could not send ownership transfer request', { error }) logger.error('Could not send ownership transfer request', { error })

48
apps/workflowengine/js/workflowengine.js
View File

File diff suppressed because one or more lines are too long

2
apps/workflowengine/js/workflowengine.js.map
View File

File diff suppressed because one or more lines are too long

3
apps/workflowengine/src/components/Event.vue
View File

@ -28,6 +28,7 @@
<script> <script>
import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect' import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
import { showWarning } from '@nextcloud/dialogs'
export default { export default {
name: 'Event', name: 'Event',
@ -57,7 +58,7 @@ export default {
methods: { methods: {
updateEvent(events) { updateEvent(events) {
if (events.length === 0) { if (events.length === 0) {
window.OCP.Toast.warning(t('workflowengine', 'At least one event must be selected')) showWarning(t('workflowengine', 'At least one event must be selected'))
return return
} }
const existingEntity = this.rule.entity const existingEntity = this.rule.entity

16
core/js/dist/install.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/install.js.map vendored
View File

File diff suppressed because one or more lines are too long

40
core/js/dist/login.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/login.js.map vendored
View File

File diff suppressed because one or more lines are too long

68
core/js/dist/main.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

38
core/js/dist/maintenance.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/maintenance.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
core/js/dist/recommendedapps.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/recommendedapps.js.map vendored
View File

File diff suppressed because one or more lines are too long

61
core/js/tests/specs/coreSpec.js
View File

@ -677,7 +677,6 @@ describe('Core base tests', function() {
}); });
}); });
describe('Notifications', function() { describe('Notifications', function() {
var showSpy;
var showHtmlSpy; var showHtmlSpy;
var clock; var clock;
@ -694,68 +693,56 @@ describe('Core base tests', function() {
beforeEach(function() { beforeEach(function() {
clock = sinon.useFakeTimers(); clock = sinon.useFakeTimers();
showSpy = sinon.spy(OCP.Toast, 'message');
$('#testArea').append('<div id="content"></div>');
}); });
afterEach(function() { afterEach(function() {
showSpy.restore();
// jump past animations // jump past animations
clock.tick(10000); clock.tick(10000);
clock.restore(); clock.restore();
$('#testArea .toastify').remove(); $('body .toastify').remove();
}); });
describe('showTemporary', function() { describe('showTemporary', function() {
it('shows a plain text notification with default timeout', function() { it('shows a plain text notification with default timeout', function() {
OC.Notification.showTemporary('My notification test'); OC.Notification.showTemporary('My notification test');
expect(showSpy.calledOnce).toEqual(true); var $row = $('body .toastify');
expect(showSpy.firstCall.args[0]).toEqual('My notification test');
//expect(showSpy.firstCall.args[1]).toEqual({isHTML: false, timeout: 7});
var $row = $('#testArea .toastify');
expect($row.length).toEqual(1); expect($row.length).toEqual(1);
expect(getNotificationText($row)).toEqual('My notification test'); expect(getNotificationText($row)).toEqual('My notification test');
}); });
it('shows a HTML notification with default timeout', function() { it('shows a HTML notification with default timeout', function() {
OC.Notification.showTemporary('<a>My notification test</a>', { isHTML: true }); OC.Notification.showTemporary('<a>My notification test</a>', { isHTML: true });
expect(showSpy.calledOnce).toEqual(true); var $row = $('body .toastify');
expect(showSpy.firstCall.args[0]).toEqual('<a>My notification test</a>');
expect(showSpy.firstCall.args[1].isHTML).toEqual(true)
var $row = $('#testArea .toastify');
expect($row.length).toEqual(1); expect($row.length).toEqual(1);
expect(getNotificationText($row)).toEqual('<a>My notification test</a>'); expect(getNotificationText($row)).toEqual('<a>My notification test</a>');
}); });
it('hides itself after 7 seconds', function() { it('hides itself after 7 seconds', function() {
OC.Notification.showTemporary(''); OC.Notification.showTemporary('');
var $row = $('#testArea .toastify'); var $row = $('body .toastify');
expect($row.length).toEqual(1); expect($row.length).toEqual(1);
// travel in time +7000 milliseconds // travel in time +7000 milliseconds
clock.tick(7500); clock.tick(7500);
$row = $('#testArea .toastify'); $row = $('body .toastify');
expect($row.length).toEqual(0); expect($row.length).toEqual(0);
}); });
it('hides itself after a given time', function() { it('hides itself after a given time', function() {
OC.Notification.showTemporary('', {timeout: 10}); OC.Notification.showTemporary('', {timeout: 10});
var $row = $('#testArea .toastify'); var $row = $('body .toastify');
expect($row.length).toEqual(1); expect($row.length).toEqual(1);
// travel in time +7000 milliseconds // travel in time +7000 milliseconds
clock.tick(7500); clock.tick(7500);
$row = $('#testArea .toastify'); $row = $('body .toastify');
expect($row.length).toEqual(1); expect($row.length).toEqual(1);
// travel in time another 4000 milliseconds // travel in time another 4000 milliseconds
clock.tick(4000); clock.tick(4000);
$row = $('#testArea .toastify'); $row = $('body .toastify');
expect($row.length).toEqual(0); expect($row.length).toEqual(0);
}); });
}); });
@ -763,24 +750,24 @@ describe('Core base tests', function() {
it('hides itself after a given time', function() { it('hides itself after a given time', function() {
OC.Notification.show('', {timeout: 10}); OC.Notification.show('', {timeout: 10});
var $row = $('#testArea .toastify'); var $row = $('body .toastify');
expect($row.length).toEqual(1); expect($row.length).toEqual(1);
clock.tick(11500); clock.tick(11500);
$row = $('#testArea .toastify'); $row = $('body .toastify');
expect($row.length).toEqual(0); expect($row.length).toEqual(0);
}); });
it('does not hide itself if no timeout given to show', function() { it('does not hide itself if no timeout given to show', function() {
OC.Notification.show(''); OC.Notification.show('');
var $row = $('#testArea .toastify'); var $row = $('body .toastify');
expect($row.length).toEqual(1); expect($row.length).toEqual(1);
// travel in time +1000 seconds // travel in time +1000 seconds
clock.tick(1000000); clock.tick(1000000);
$row = $('#testArea .toastify'); $row = $('body .toastify');
expect($row.length).toEqual(1); expect($row.length).toEqual(1);
}); });
}); });
@ -788,24 +775,24 @@ describe('Core base tests', function() {
it('hides itself after a given time', function() { it('hides itself after a given time', function() {
OC.Notification.showHtml('<p></p>', {timeout: 10}); OC.Notification.showHtml('<p></p>', {timeout: 10});
var $row = $('#testArea .toastify'); var $row = $('body .toastify');
expect($row.length).toEqual(1); expect($row.length).toEqual(1);
clock.tick(11500); clock.tick(11500);
$row = $('#testArea .toastify'); $row = $('body .toastify');
expect($row.length).toEqual(0); expect($row.length).toEqual(0);
}); });
it('does not hide itself if no timeout given to show', function() { it('does not hide itself if no timeout given to show', function() {
OC.Notification.showHtml('<p></p>'); OC.Notification.showHtml('<p></p>');
var $row = $('#testArea .toastify'); var $row = $('body .toastify');
expect($row.length).toEqual(1); expect($row.length).toEqual(1);
// travel in time +1000 seconds // travel in time +1000 seconds
clock.tick(1000000); clock.tick(1000000);
$row = $('#testArea .toastify'); $row = $('body .toastify');
expect($row.length).toEqual(1); expect($row.length).toEqual(1);
}); });
}); });
@ -815,7 +802,7 @@ describe('Core base tests', function() {
var notification = OC.Notification.showTemporary(''); var notification = OC.Notification.showTemporary('');
var $row = $('#testArea .toastify'); var $row = $('body .toastify');
expect($row.length).toEqual(1); expect($row.length).toEqual(1);
OC.Notification.hide(notification, hideCallback); OC.Notification.hide(notification, hideCallback);
@ -823,7 +810,7 @@ describe('Core base tests', function() {
// Give time to the hide animation to finish // Give time to the hide animation to finish
clock.tick(1000); clock.tick(1000);
$row = $('#testArea .toastify'); $row = $('body .toastify');
expect($row.length).toEqual(0); expect($row.length).toEqual(0);
expect(hideCallback.calledOnce).toEqual(true); expect(hideCallback.calledOnce).toEqual(true);
@ -833,7 +820,7 @@ describe('Core base tests', function() {
var notification = OC.Notification.show('', {timeout: 10}); var notification = OC.Notification.show('', {timeout: 10});
var $row = $('#testArea .toastify'); var $row = $('body .toastify');
expect($row.length).toEqual(1); expect($row.length).toEqual(1);
OC.Notification.hide(notification, hideCallback); OC.Notification.hide(notification, hideCallback);
@ -841,7 +828,7 @@ describe('Core base tests', function() {
// Give time to the hide animation to finish // Give time to the hide animation to finish
clock.tick(1000); clock.tick(1000);
$row = $('#testArea .toastify'); $row = $('body .toastify');
expect($row.length).toEqual(0); expect($row.length).toEqual(0);
expect(hideCallback.calledOnce).toEqual(true); expect(hideCallback.calledOnce).toEqual(true);
@ -851,7 +838,7 @@ describe('Core base tests', function() {
var notification = OC.Notification.show(''); var notification = OC.Notification.show('');
var $row = $('#testArea .toastify'); var $row = $('body .toastify');
expect($row.length).toEqual(1); expect($row.length).toEqual(1);
OC.Notification.hide(notification, hideCallback); OC.Notification.hide(notification, hideCallback);
@ -859,7 +846,7 @@ describe('Core base tests', function() {
// Give time to the hide animation to finish // Give time to the hide animation to finish
clock.tick(1000); clock.tick(1000);
$row = $('#testArea .toastify'); $row = $('body .toastify');
expect($row.length).toEqual(0); expect($row.length).toEqual(0);
expect(hideCallback.calledOnce).toEqual(true); expect(hideCallback.calledOnce).toEqual(true);
@ -870,7 +857,7 @@ describe('Core base tests', function() {
var $row2 = OC.Notification.showTemporary('Two', {timeout: 2}); var $row2 = OC.Notification.showTemporary('Two', {timeout: 2});
var $row3 = OC.Notification.showTemporary('Three'); var $row3 = OC.Notification.showTemporary('Three');
var $el = $('#testArea'); var $el = $('body');
var $rows = $el.find('.toastify'); var $rows = $el.find('.toastify');
expect($rows.length).toEqual(3); expect($rows.length).toEqual(3);
@ -890,7 +877,7 @@ describe('Core base tests', function() {
var $row1 = OC.Notification.show('One'); var $row1 = OC.Notification.show('One');
var $row2 = OC.Notification.show('Two'); var $row2 = OC.Notification.show('Two');
var $el = $('#testArea'); var $el = $('body');
var $rows = $el.find('.toastify'); var $rows = $el.find('.toastify');
expect($rows.length).toEqual(2); expect($rows.length).toEqual(2);

35
core/src/OC/notification.js
View File

@ -21,10 +21,11 @@
import _ from 'underscore' import _ from 'underscore'
import $ from 'jquery' import $ from 'jquery'
import { showMessage } from '@nextcloud/dialogs'
/** /**
* @todo Write documentation * @todo Write documentation
* @deprecated 17.0.0 use OCP.Toast * @deprecated 17.0.0 use the `@nextcloud/dialogs` package instead
* @namespace OC.Notification * @namespace OC.Notification
*/ */
export default { export default {
@ -35,7 +36,7 @@ export default {
/** /**
* @param {Function} callback callback function * @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: function(callback) {
this.getDefaultNotificationFunction = callback this.getDefaultNotificationFunction = callback
@ -49,7 +50,7 @@ export default {
* *
* @param {jQuery} [$row] notification row * @param {jQuery} [$row] notification row
* @param {Function} [callback] callback * @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: function($row, callback) {
if (_.isFunction($row)) { if (_.isFunction($row)) {
@ -65,7 +66,11 @@ export default {
// remove the row directly // remove the row directly
$row.each(function() { $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) { if (this === this.updatableNotification) {
this.updatableNotification = null this.updatableNotification = null
} }
@ -88,13 +93,14 @@ export default {
* @param {string} [options.type] notification type * @param {string} [options.type] notification type
* @param {int} [options.timeout=0] timeout value, defaults to 0 (permanent) * @param {int} [options.timeout=0] timeout value, defaults to 0 (permanent)
* @returns {jQuery} jQuery element for notification row * @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: function(html, options) {
options = options || {} options = options || {}
options.isHTML = true options.isHTML = true
options.timeout = (!options.timeout) ? -1 : options.timeout options.timeout = (!options.timeout) ? -1 : options.timeout
const toast = window.OCP.Toast.message(html, options) const toast = showMessage(html, options)
toast.toastElement.toastify = toast
return $(toast.toastElement) return $(toast.toastElement)
}, },
@ -106,12 +112,13 @@ export default {
* @param {string} [options.type] notification type * @param {string} [options.type] notification type
* @param {int} [options.timeout=0] timeout value, defaults to 0 (permanent) * @param {int} [options.timeout=0] timeout value, defaults to 0 (permanent)
* @returns {jQuery} jQuery element for notification row * @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: function(text, options) {
options = options || {} options = options || {}
options.timeout = (!options.timeout) ? -1 : options.timeout options.timeout = (!options.timeout) ? -1 : options.timeout
const toast = window.OCP.Toast.message(text, options) const toast = showMessage(text, options)
toast.toastElement.toastify = toast
return $(toast.toastElement) return $(toast.toastElement)
}, },
@ -120,13 +127,14 @@ export default {
* *
* @param {string} text Message to display * @param {string} text Message to display
* @returns {jQuery} JQuery element for notificaiton row * @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: function(text) {
if (this.updatableNotification) { if (this.updatableNotification) {
this.updatableNotification.hideToast() this.updatableNotification.hideToast()
} }
this.updatableNotification = OCP.Toast.message(text, { timeout: -1 }) this.updatableNotification = showMessage(text, { timeout: -1 })
this.updatableNotification.toastElement.toastify = this.updatableNotification
return $(this.updatableNotification.toastElement) return $(this.updatableNotification.toastElement)
}, },
@ -140,19 +148,20 @@ export default {
* @param {boolean} [options.isHTML=false] an indicator for HTML notifications (true) or text (false) * @param {boolean} [options.isHTML=false] an indicator for HTML notifications (true) or text (false)
* @param {string} [options.type] notification type * @param {string} [options.type] notification type
* @returns {JQuery<any>} the toast element * @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: function(text, options) {
options = options || {} options = options || {}
options.timeout = options.timeout || 7 options.timeout = options.timeout || 7
const toast = window.OCP.Toast.message(text, options) const toast = showMessage(text, options)
toast.toastElement.toastify = toast
return $(toast.toastElement) return $(toast.toastElement)
}, },
/** /**
* Returns whether a notification is hidden. * Returns whether a notification is hidden.
* @returns {boolean} * @returns {boolean}
* @deprecated 17.0.0 use OCP.Toast * @deprecated 17.0.0 use the `@nextcloud/dialogs` package
*/ */
isHidden: function() { isHidden: function() {
return !$('#content').find('.toastify').length return !$('#content').find('.toastify').length