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

Merge pull request #19552 from owncloud/inline_fileactions_alttext 

If an inline files action provides an alt text show it
This commit is contained in:
Thomas Müller 2015-10-05 10:24:48 +02:00
parent 681ab05e4d 6bf6ff9564
commit 28919faff5
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/files/js/fileactions.js
View File

@ -144,7 +144,8 @@
order: action.order || 0, order: action.order || 0,
icon: action.icon, icon: action.icon,
permissions: action.permissions, permissions: action.permissions,
type: action.type || FileActions.TYPE_DROPDOWN type: action.type || FileActions.TYPE_DROPDOWN,
altText: action.altText || ''
}; };
if (_.isUndefined(action.displayName)) { if (_.isUndefined(action.displayName)) {
actionSpec.displayName = t('files', name); actionSpec.displayName = t('files', name);

56
apps/files/tests/js/fileactionsSpec.js
View File

@ -151,6 +151,62 @@ describe('OCA.Files.FileActions tests', function() {
expect($tr.find('.action.action-match').length).toEqual(1); expect($tr.find('.action.action-match').length).toEqual(1);
expect($tr.find('.action.action-nomatch').length).toEqual(0); expect($tr.find('.action.action-nomatch').length).toEqual(0);
}); });
it('display inline icon', function() {
fileActions.registerAction({
name: 'Icon',
displayName: 'IconDisplay',
type: OCA.Files.FileActions.TYPE_INLINE,
mime: 'all',
icon: OC.imagePath('core', 'actions/icon'),
permissions: OC.PERMISSION_READ
});
fileActions.registerAction({
name: 'NoIcon',
displayName: 'NoIconDisplay',
type: OCA.Files.FileActions.TYPE_INLINE,
mime: 'all',
permissions: OC.PERMISSION_READ
});
fileActions.display($tr.find('td.filename'), true, fileList);
expect($tr.find('.action.action-icon').length).toEqual(1);
expect($tr.find('.action.action-icon').find('img').length).toEqual(1);
expect($tr.find('.action.action-icon').find('img').eq(0).attr('src')).toEqual(OC.imagePath('core', 'actions/icon'));
expect($tr.find('.action.action-noicon').length).toEqual(1);
expect($tr.find('.action.action-noicon').find('img').length).toEqual(0);
});
it('display alt text on inline icon', function() {
fileActions.registerAction({
name: 'IconAltText',
displayName: 'IconAltTextDisplay',
type: OCA.Files.FileActions.TYPE_INLINE,
mime: 'all',
icon: OC.imagePath('core', 'actions/iconAltText'),
altText: 'alt icon text',
permissions: OC.PERMISSION_READ
});
fileActions.registerAction({
name: 'IconNoAltText',
displayName: 'IconNoAltTextDisplay',
type: OCA.Files.FileActions.TYPE_INLINE,
mime: 'all',
icon: OC.imagePath('core', 'actions/iconNoAltText'),
permissions: OC.PERMISSION_READ
});
fileActions.display($tr.find('td.filename'), true, fileList);
expect($tr.find('.action.action-iconalttext').length).toEqual(1);
expect($tr.find('.action.action-iconalttext').find('img').length).toEqual(1);
expect($tr.find('.action.action-iconalttext').find('img').eq(0).attr('alt')).toEqual('alt icon text');
expect($tr.find('.action.action-iconnoalttext').length).toEqual(1);
expect($tr.find('.action.action-iconnoalttext').find('img').length).toEqual(1);
expect($tr.find('.action.action-iconnoalttext').find('img').eq(0).attr('alt')).toEqual('');
});
}); });
describe('action handler', function() { describe('action handler', function() {
var actionStub, $tr, clock; var actionStub, $tr, clock;