diff options
| author | Olivier Paroz <github@oparoz.com> | 2016-03-26 13:49:22 +0300 |
|---|---|---|
| committer | Olivier Paroz <github@oparoz.com> | 2016-03-26 22:14:12 +0300 |
| commit | 09e8305cce710b680a07b969dc76300843ff5a30 (patch) | |
| tree | 0d328bf9ab517862bbbf8c55a18f021ce53d900a | |
| parent | be1ccc33307fef3e1afa2eeb295b4ceb866dadb4 (diff) | |
Enable SVG rendering on Edgev15.0-stable8.2
That browser will generate lots of errors in the log, but it still works.
The feature is optional, so users can turn it off if it doesn't work with their media files
(cherry picked from commit 4497e2b)
(cherry picked from commit 34bd663)
| -rw-r--r-- | js/galleryconfig.js | 3 | ||||
| -rw-r--r-- | js/galleryutility.js | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/js/galleryconfig.js b/js/galleryconfig.js index 0dfa2982..d9ee0e76 100644 --- a/js/galleryconfig.js +++ b/js/galleryconfig.js @@ -132,7 +132,8 @@ */ _worksInCurrentBrowser: function (feature, validationRule) { var isAcceptable = true; - if (feature === validationRule && Gallery.ieVersion !== false) { + if (feature === validationRule && + (Gallery.ieVersion !== false && Gallery.ieVersion !== 'edge')) { isAcceptable = false; } diff --git a/js/galleryutility.js b/js/galleryutility.js index e17d6e0d..196cf61a 100644 --- a/js/galleryutility.js +++ b/js/galleryutility.js @@ -19,7 +19,7 @@ window.Gallery = window.Gallery || {}; /** * Detects if the browser is a recent or an old version of Internet Explorer * - * @returns {string|bool} + * @returns {string|boolean} */ getIeVersion: function () { // Blocking IE8 @@ -27,9 +27,10 @@ window.Gallery = window.Gallery || {}; return 'unsupportedIe'; } else if (navigator.userAgent.indexOf("MSIE") > 0) { return 'oldIe'; - } else if ((!!navigator.userAgent.match(/Trident.*rv[ :]*11\./)) || - (navigator.userAgent.indexOf("Edge/") > 0)) { + } else if (!!navigator.userAgent.match(/Trident.*rv[ :]*11\./)) { return 'modernIe'; + } else if (navigator.userAgent.indexOf("Edge/") > 0) { + return 'edge'; } return false; |