From 2ba8f376ed9176a1fe9e6c83c403fbb66640e683 Mon Sep 17 00:00:00 2001 From: Manish Bisht Date: Thu, 21 Jul 2016 16:54:04 +0200 Subject: [PATCH] Removed support for older version of IE Signed-off-by: Olivier Paroz (oparoz) --- img/app.png | Bin 295 -> 0 bytes img/dateasc.png | Bin 398 -> 0 bytes img/datedes.png | Bin 398 -> 0 bytes img/folder.png | Bin 285 -> 0 bytes img/gallery-dark.png | Bin 460 -> 0 bytes img/nameasc.png | Bin 398 -> 0 bytes img/namedes.png | Bin 399 -> 0 bytes img/toggle.png | Bin 1374 -> 0 bytes js/galleryutility.js | 2 +- js/slideshow.js | 5 ----- js/thumbnail.js | 24 +++--------------------- 11 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 img/app.png delete mode 100644 img/dateasc.png delete mode 100644 img/datedes.png delete mode 100644 img/folder.png delete mode 100644 img/gallery-dark.png delete mode 100644 img/nameasc.png delete mode 100644 img/namedes.png delete mode 100644 img/toggle.png diff --git a/img/app.png b/img/app.png deleted file mode 100644 index 171af526e9d5125b00d46a1e353b60118f33834c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyP60k4u0Z-fWq>38QX9||(UKs) zU6E7`q7=&zmV62A}j66cDyDKfAnFwS6%V?4odK3;hF zizQD#q^!P}R8XVLpR%&7f`N}i%{d5(L6!G!)9hANM3N6R|AtL;3h(~3mgXHoo4*iReJExA zUYHqmW$ukos3rVOm={pQ8HVvIW!{0$5m&?yVUA>I7oH%)Z+wd4c#kkHN?9=Owrzh3 svm?VSuHE1AmDYTG+XU8y)~yL{04gp~Cj4{hQvd(}07*qoM6N<$f`(hH1poj5 diff --git a/img/datedes.png b/img/datedes.png deleted file mode 100644 index 916b73842b39b728b47ee5992504b852deeabf15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 398 zcmV;90df9`P)4FlmSzHVuO{^q^l>yWEQHz2i7O5;O;$INc1Of&t8{7T~?4B`bAu#YyZMeq(R;~_?|iY1srQuD2&kRB{Y{xk-z z$WQPV6H)vZhB1z_)cl;rEh)Sb9XPp8Y@Dm3rORY`Y+f5ax5gv+Fd2 zPeRi=WnA*E@Hu=(QKWaIP}OqPX~fx>h7N sfiK|;a@Qr+=xZGO5hk?fmXJ*S1Ba$l$+WinBme*a07*qoM6N<$f@#68v;Y7A diff --git a/img/folder.png b/img/folder.png deleted file mode 100644 index 49598f4fa3881e4bbf2d30804f8617c4f11f0d60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyt^qzFu0Xn>p&_N7y~SFQ(mJVXpmS*kY6wZ z6E_bpzl3%|d1X~~eZ%~{`wm_G^0)JzwFXc{p{I*uNCo5BQwN0(ItZ{moF?jWMrp?P z`jC}DGY4u)*gQ@2fiw&T9!p$878xtn_ZMHF4xhlul*Ye Pw4A}y)z4*}Q$iB}&6aMS diff --git a/img/gallery-dark.png b/img/gallery-dark.png deleted file mode 100644 index 1e9dbb57c7a1b4a87f0c2ac79e52e1a522d81b0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!(gJ)!T!AzxfQf+th!{ylN0v67 z16re4666=mz{bukt*sLqmyna2SJ2Qg|H!f9Cr+NfaQW)H_a8rh`SB}K`}}mE;xC>q zjv*Dd-d;P&b;v=WCDHg@p!K@Kxfy%^dvi7W#kTO>?NIo9-{uSZG)@bRsrS~tGbovr zqHySn8uNy)AD9#l@bCQ{ub}fic6&UFwt)xI1DkMEuwY6+b&xlDX4WoimS9dQr7 z&0fFZL!ZR0KgMCl*jJX?c&uD?@92)TtKaYQ`FxDM$J#_Lp@Qv#MT04W!!L$QHBt;d zj4TTdFqSlYhmax`4SXNwF|l7@ychg{p%zS99jNA#abU0TZ)ASK@LsckK~}&3D8S4j zKiTvb!`Zu=`6epgpelF{r G5}E)J4v@3} diff --git a/img/nameasc.png b/img/nameasc.png deleted file mode 100644 index 524602ca504b3bef2255cbf48ebbcf6dad8d3eaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 398 zcmV;90df9`P)sNNYFb8uaF?F;UIyFTT6j21`@P{(9|E$;Gh)I zP#C$D7!HDnB>o6Ow1#`4>z7wkd_8cvhvz)!x#tI$f3}0)7*Ho`%>3rUU03nC+gZd1 zrO|DpGq7r4wa%x@XAr-SpJ>HBOa*>`$pWtjZ}a3|(n8BMgs>%|tn z;L2&mN2ON#@g)3f1x_m#qljBYfs@4Nu!a`g4)KWsXD0ARHS&)Y@06Cff|r;LkWiiM;C5JN7LBD1MEv9I`UtRtNa5tP|C2rsPr*jhd-3XpJL~v z%1anVH`%y{JLnjA}#8fG^XeHh$Xzq9(#q6@V~_a|Fv;x9Qk?Y s=orprV;3QODem{u*KWog?AAm451uqx7zAi^%K!iX07*qoM6N<$f+G^O?EnA( diff --git a/img/namedes.png b/img/namedes.png deleted file mode 100644 index 725ade088c7647861ec0cc9c04d836522ec704ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399 zcmV;A0dW3_P)bwE zBo2y*D2js_>hPZIdU@Z6m-N8lxt#ku-}`%>=ibY|n8sH$d*GPDb>u1@Jrwv&0!|lb zxi7dD`xwWcsLf*$t(kThXE;S?)aIgAF4xoMi*P+u!N_MEMB`)vKf&uHS3@&bExaAa zSimM$68KS~>yO1YWE-OhJ`rwSU^d1*nWhOp!o>3&Pz3*iJv3q<;BPa{$EeSg>8}Xy zRQid(u!QA+{7f`2qxKE;e~WeHR>@)rHQ2@DsO_K|&*F_f;2dMPRQf~>)i__np}YHj zFr2=_rx=eW^Y3w1XL=RM~<=dGi<)fwwxyS0U#)AKuFXZQP`3l7l1tQ%a0zF;sIjmP81 zIy*ZLA3Ahse>gv_2_wxCC256G^c-WpR3SLT31@}t0qrmIH zG2la>3y2R44E&VIWR|TOmQJU0@pyb1_y#xwd^)0b)Rx z&*$r%oSghk0UkYiv@|p{bnp1_j*iYrBt8c|01gXAz=#5F z?2HZr2PO2M0ACCa4&GGouCA^LAOU;_j0lODT1Rr>!i8JFSHP!o6bA*X9&qb9Xw5eW zyXK~*rhVtnpN|0~5{cPs*RK7Io!MDn5j(^4)Ue*(-jjhq;AH^~0*$hJH&CYp^cYHY zfAQkQqb)5hp~sIOFZB2K{|>AQ@Pe$XluN6kwYIhf&z?Pd1iPvNg5eR&Z3N8vZ;Zua zZvl*tkN;UL7S{xDSv&`1v&e@TFSly#&;0JbZh3vh=*p&-EA+}tu{f!UxeI$KncS<|A?XrlpK0*A7g zR5X{%wVPu8E3+)CB2guE(npLlYr{^b0piZT)FZ`Hk(~OaNs~>czF0-0ghk`N<;`X)&ftb z)6YgmM($ykalR4(jljA*w3^H1mJ*4?&j9Dnojcjx-Q6z0D$il;^yyM9^?UNW6mI7l36plHEkfIg~aFF;z7m<)Kt7$Q(+Su(My2Py0Zr5jm$~i|sSKIq&DOCtN>e zRWrwO?IF&wTvb!Y@@;L|*-9&2Of(|q#YEdN?CoNrWoJ&t|Nqsjl9=rEa;neNx|~+L gCD&53|NMIX58~#>-PLA_Z2$lO07*qoM6N<$g84FxivR!s 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 *