Skip to content

Fix issue 239 #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jancborchardt merged 2 commits into from
Jan 27, 2020
Merged

Fix issue 239 #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e129c81
fixed an Typo which was spamming a log
tacruc Jan 18, 2020
147fc87
Fixed issue 239
tacruc Jan 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion js/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,20 @@
$('#display-slider').prop('checked', true);
}

if (optionsValues.hasOwnProperty('mapboxAPIKEY') && optionsValues.mapboxAPIKEY !== '') {
//detect Webgl
var canvas = document.createElement('canvas');
var experimental = false;
var gl;

try { gl = canvas.getContext("webgl"); }
catch (x) { gl = null; }

if (gl == null) {
try { gl = canvas.getContext("experimental-webgl"); experimental = true; }
catch (x) { gl = null; }
}

if (optionsValues.hasOwnProperty('mapboxAPIKEY') && optionsValues.mapboxAPIKEY !== '' && gl == null) {
// change "button" layers
delete mapController.baseLayers['OpenStreetMap'];
delete mapController.baseLayers['ESRI Aerial'];
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/GeophotoService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public function getAllFromDB($userId) {
$file_object->type = $file->getType();
$file_object->mime = $file->getMimetype();
$file_object->lastmod = $file->getMTime();
$file_object->size = $file->getSize;
$file_object->size = $file->getSize();
$file_object->path = $path;
$file_object->hasPreview = in_array($cacheEntry->getMimeType(), $previewEnableMimetypes);
$filesById[] = $file_object;
Expand Down