Merge master into federation #48

Manually merged
nutomic merged 120 commits from merge-master into federation 2020-06-09 18:07:02 +00:00
1 changed files with 14 additions and 11 deletions
Showing only changes of commit 9bf444e93a - Show all commits

25
ui/src/utils.ts vendored
View File

@ -863,16 +863,19 @@ export function previewLines(text: string, lines: number = 3): string {
}
function canUseWebP() {
var elem = document.createElement('canvas');
if (!!(elem.getContext && elem.getContext('2d'))) {
var testString = !(window.mozInnerScreenX == null) ? 'png' : 'webp';
// was able or not to get WebP representation
return (
elem.toDataURL('image/webp').startsWith('data:image/' + testString)
);
}
// very old browser like IE 8, canvas not supported
// TODO pictshare might have a webp conversion bug, try disabling this
return false;
// var elem = document.createElement('canvas');
// if (!!(elem.getContext && elem.getContext('2d'))) {
// var testString = !(window.mozInnerScreenX == null) ? 'png' : 'webp';
// // was able or not to get WebP representation
// return (
// elem.toDataURL('image/webp').startsWith('data:image/' + testString)
// );
// }
// // very old browser like IE 8, canvas not supported
// return false;
}