harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

double up default photo sizes - even the mos simple camera can now do images > 1024px

Browse Source
This commit is contained in:
Mario Vavti 2015-10-15 11:20:56 +02:00
parent 44b542814a
commit 2413968021
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/photos.php
View File

@ -193,8 +193,8 @@ function photo_upload($channel, $observer, $args) {
unset($p['os_storage']); unset($p['os_storage']);
unset($p['os_path']); unset($p['os_path']);
if(($width > 640 || $height > 640) && (! $errors)) { if(($width > 1024 || $height > 1024) && (! $errors)) {
$ph->scaleImage(640); $ph->scaleImage(1024);
$p['scale'] = 1; $p['scale'] = 1;
$r2 = $ph->save($p); $r2 = $ph->save($p);
$smallest = 1; $smallest = 1;
@ -202,8 +202,8 @@ function photo_upload($channel, $observer, $args) {
$errors = true; $errors = true;
} }
if(($width > 320 || $height > 320) && (! $errors)) { if(($width > 640 || $height > 640) && (! $errors)) {
$ph->scaleImage(320); $ph->scaleImage(640);
$p['scale'] = 2; $p['scale'] = 2;
$r3 = $ph->save($p); $r3 = $ph->save($p);
$smallest = 2; $smallest = 2;

5
view/js/main.js
View File

@ -745,13 +745,14 @@ function justifyPhotos() {
selector: '> a, > div:not(.spinner, #page-end)', selector: '> a, > div:not(.spinner, #page-end)',
margins: 3, margins: 3,
border: 0, border: 0,
rowHeight: 180,
sizeRangeSuffixes: { sizeRangeSuffixes: {
'lt100': '-2', 'lt100': '-2',
'lt240': '-2', 'lt240': '-2',
'lt320': '-2', 'lt320': '-2',
'lt500': '', 'lt500': '',
'lt640': '-1', 'lt640': '-2',
'lt1024': '-0' 'lt1024': '-1'
} }
}).on('jg.complete', function(e){ justifiedGalleryActive = false; }); }).on('jg.complete', function(e){ justifiedGalleryActive = false; });
} }

4
view/tpl/cropbody.tpl
View File

@ -27,8 +27,8 @@
previewWrap: 'previewWrap', previewWrap: 'previewWrap',
minWidth: 300, minWidth: 300,
minHeight: 300, minHeight: 300,
maxWidth: 640, maxWidth: 1024,
maxHeight: 640, maxHeight: 1024,
ratioDim: { x: 100, y:100 }, ratioDim: { x: 100, y:100 },
displayOnInit: true, displayOnInit: true,
onEndCrop: onEndCrop onEndCrop: onEndCrop