diff --git a/img/app.png b/img/app.png deleted file mode 100644 index 171af526e..000000000 Binary files a/img/app.png and /dev/null differ diff --git a/img/dateasc.png b/img/dateasc.png deleted file mode 100644 index aefd392f8..000000000 Binary files a/img/dateasc.png and /dev/null differ diff --git a/img/datedes.png b/img/datedes.png deleted file mode 100644 index 916b73842..000000000 Binary files a/img/datedes.png and /dev/null differ diff --git a/img/folder.png b/img/folder.png deleted file mode 100644 index 49598f4fa..000000000 Binary files a/img/folder.png and /dev/null differ diff --git a/img/gallery-dark.png b/img/gallery-dark.png deleted file mode 100644 index 1e9dbb57c..000000000 Binary files a/img/gallery-dark.png and /dev/null differ diff --git a/img/nameasc.png b/img/nameasc.png deleted file mode 100644 index 524602ca5..000000000 Binary files a/img/nameasc.png and /dev/null differ diff --git a/img/namedes.png b/img/namedes.png deleted file mode 100644 index 725ade088..000000000 Binary files a/img/namedes.png and /dev/null differ diff --git a/img/toggle.png b/img/toggle.png deleted file mode 100644 index 10735dff9..000000000 Binary files a/img/toggle.png and /dev/null differ diff --git a/js/galleryutility.js b/js/galleryutility.js index a337f5029..8aa75d9ab 100644 --- a/js/galleryutility.js +++ b/js/galleryutility.js @@ -26,7 +26,7 @@ window.Gallery = window.Gallery || {}; if ($('html').is('.ie8')) { return 'unsupportedIe'; } else if (navigator.userAgent.indexOf("MSIE") > 0) { - return 'oldIe'; + return 'unsupportedIe'; } else if (!!navigator.userAgent.match(/Trident.*rv[ :]*11\./)) { return 'modernIe'; } else if (navigator.userAgent.indexOf("Edge/") > 0) { diff --git a/js/slideshow.js b/js/slideshow.js index d135390bf..2373a32a3 100644 --- a/js/slideshow.js +++ b/js/slideshow.js @@ -52,11 +52,6 @@ this._initControlsAutoFader(); - // Replace all Owncloud svg images with png images for ancient browsers - if (!OC.Util.hasSVGSupport()) { - OC.Util.replaceSVG(this.$el); - } - // Only modern browsers can manipulate history if (history && history.pushState) { // Stop the slideshow when backing out. diff --git a/js/thumbnail.js b/js/thumbnail.js index 03da6ff35..45b7df137 100644 --- a/js/thumbnail.js +++ b/js/thumbnail.js @@ -1,4 +1,4 @@ -/* global $, DOMPurify, Gallery */ +/* global $, DOMPurify, OC, Gallery */ /** * A thumbnail is the actual image attached to the GalleryImage object * @@ -132,7 +132,7 @@ function Thumbnail (fileId, square) { }; thumb.image.onerror = function () { thumb.valid = false; - var icon = Thumbnails._getMimeIcon(preview.mimetype); + var icon = OC.MimeType.getIconUrl(preview.mimetype); setTimeout(function () { thumb.image.src = icon; }, 0); @@ -147,7 +147,7 @@ function Thumbnail (fileId, square) { 'data:' + preview.mimetype + ';base64,' + imageData; } else { thumb.valid = false; - thumb.image.src = Thumbnails._getMimeIcon(preview.mimetype); + thumb.image.src = OC.MimeType.getIconUrl(preview.mimetype); } } }); @@ -156,24 +156,6 @@ function Thumbnail (fileId, square) { return batch; }, - /** - * Returns the link to the media type icon - * - * Modern browsers get an SVG, older ones a PNG - * - * @param mimeType - * - * @returns {*|string} - * @private - */ - _getMimeIcon: function (mimeType) { - var icon = OC.MimeType.getIconUrl(mimeType); - if (Gallery.ieVersion !== false) { - icon = icon.substr(0, icon.lastIndexOf(".")) + ".png"; - } - return icon; - }, - /** * Sanitises SVGs *