diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-03-01 15:38:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-01 15:38:11 +0300 |
| commit | 8b963cbb9b0bcfc2052ab480ff32e28c56ba950f (patch) | |
| tree | 61be757f4686b2dcd1a7cf27493c8e80a50225e3 /src/viewer.js | |
| parent | 48079ada56669daca05c4605826ed4df8224fd24 (diff) | |
| parent | 6820aff4c7ccb8099bd17f00c9d75a2394fce83f (diff) | |
Merge pull request #112 from nextcloud/bugfix/viewer-compatibiltityv16.0.0alpha1
Do not register file handlers if the new viewer app is installed
Diffstat (limited to 'src/viewer.js')
| -rwxr-xr-x | src/viewer.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/viewer.js b/src/viewer.js index df07953..c634ba4 100755 --- a/src/viewer.js +++ b/src/viewer.js @@ -182,7 +182,7 @@ document.addEventListener('DOMContentLoaded', function () { } }); - if (typeof FileActions !== 'undefined') { + if (typeof FileActions !== 'undefined' && !OCA.Viewer) { for (var i = 0; i < videoViewer.mimeTypes.length; ++i) { var mime = videoViewer.mimeTypes[i]; OCA.Files.fileActions.register(mime, 'View', OC.PERMISSION_READ, '', videoViewer.onView); |