Mirrors/nextcloud
1
0
複製 0
镜像来自 https://github.com/nextcloud/server.git synced 2024-08-26 17:55:04 +02:00
程式碼 問題管理 Actions 27 Packages Projects 版本發佈 Wiki Activity

Use "showTemporary" instead of explicitly hiding the notification

瀏覽代碼 
"OC.Notification.hide" expects the notification to be hidden to be
passed as an argument. As it was being used to show a temporary
notification the combination of "OC.Notification.show" and
"OC.Notification.hide" was replaced by a single call to
"OC.Notification.showTemporary".

The timeout could have been specified in the options of the call, but it
was left to the default value (7 seconds) for consistency with other
notifications.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2018-03-19 15:28:15 +01:00
父節點 fcef15af80
當前提交 ed1452d7a0
共有 2 個文件被更改，包括 5 次插入 和 6 次删除
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/js/sharedialogview.js
查看文件

@ -334,8 +334,7 @@
$loading.addClass('hidden');
$loading.removeClass('inlineblock');
$confirm.removeClass('hidden');
OC.Notification.show(t('core', 'An error occurred. Please try again'));
window.setTimeout(OC.Notification.hide, 5000);
OC.Notification.showTemporary(t('core', 'An error occurred. Please try again'));
});
},

8
core/js/tests/specs/sharedialogviewSpec.js
查看文件

@ -472,14 +472,14 @@ describe('OC.Share.ShareDialogView', function() {
});
});
describe('autocompletion of users', function() {
var showNotificationStub;
var showTemporaryNotificationStub;
beforeEach(function() {
showNotificationStub = sinon.stub(OC.Notification, 'show');
showTemporaryNotificationStub = sinon.stub(OC.Notification, 'show');
});
afterEach(function() {
showNotificationStub.restore();
showTemporaryNotificationStub.restore();
});
describe('triggers autocomplete display and focus with data when ajax search succeeds', function () {
@ -1486,7 +1486,7 @@ describe('OC.Share.ShareDialogView', function() {
dialog.render();
dialog.autocompleteHandler({term: 'bob'}, sinon.stub());
fakeServer.requests[0].respond(500);
expect(showNotificationStub.calledOnce).toEqual(true);
expect(showTemporaryNotificationStub.calledOnce).toEqual(true);
});
describe('renders the autocomplete elements', function() {