diff options
| author | noveens <noveen.sachdeva@research.iiit.ac.in> | 2017-02-15 01:56:00 +0530 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-03-23 13:12:29 -0600 |
| commit | 40228c0c2b17c800fa5e227b4d2e8d074da82075 (patch) | |
| tree | 74f7e43380384b88bc29be08135c0e1252600597 /apps/files_versions | |
| parent | 39ac804899197069b40384afdc40966e22658eca (diff) | |
| download | nextcloud-server-40228c0c2b17c800fa5e227b4d2e8d074da82075.tar.gz nextcloud-server-40228c0c2b17c800fa5e227b4d2e8d074da82075.zip | |
added quit option in commentstabview.js
added quit option in notif in app.js
added quit option in notif in file-upload.js
added quit option in notif in fileinfomodel.js
added quit option in notif in filelist.js
added quit option in notif in filelist.js
added quit option in notif in tagsplugin.js
added quit option in notif in statusmanager.js
added quit option in notif in external.js
added quit option in notif in versionstabview.js
added quit option in notif in notification.js
changes according to the latest review.
timeout removed since there is a button to close it
translation capability added
typo fixed
test files updated
small errors fixed
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/files_versions')
| -rw-r--r-- | apps/files_versions/js/versionstabview.js | 9 | ||||
| -rw-r--r-- | apps/files_versions/tests/js/versionstabviewSpec.js | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js index e5ca115ecfa..aa20d8fda7a 100644 --- a/apps/files_versions/js/versionstabview.js +++ b/apps/files_versions/js/versionstabview.js @@ -133,11 +133,14 @@ fileInfoModel.trigger('busy', fileInfoModel, false); self.$el.find('.versions').removeClass('hidden'); self._toggleLoading(false); - OC.Notification.showTemporary( - t('files_version', 'Failed to revert {file} to revision {timestamp}.', { + OC.Notification.show(t('files_version', 'Failed to revert {file} to revision {timestamp}.', + { file: versionModel.getFullPath(), timestamp: OC.Util.formatDate(versionModel.get('timestamp') * 1000) - }) + }), + { + type: 'error' + } ); } }); diff --git a/apps/files_versions/tests/js/versionstabviewSpec.js b/apps/files_versions/tests/js/versionstabviewSpec.js index cadd4eb363e..94ad72d0f77 100644 --- a/apps/files_versions/tests/js/versionstabviewSpec.js +++ b/apps/files_versions/tests/js/versionstabviewSpec.js @@ -224,7 +224,7 @@ describe('OCA.Versions.VersionsTabView', function() { expect(changes.etag).toBeDefined(); }); it('shows notification on revert error', function() { - var notificationStub = sinon.stub(OC.Notification, 'showTemporary'); + var notificationStub = sinon.stub(OC.Notification, 'show'); tabView.$el.find('.revertVersion').eq(1).click(); |