TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #2021 - Cropping with float values

This commit is contained in:
Jérémy Gaulin 2016-05-30 00:22:26 +02:00
parent 51c4258fa1
commit 11a55b764b
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cms/widgets/MediaManager.php
View File

@ -1179,9 +1179,11 @@ class MediaManager extends WidgetBase
throw new SystemException('Invalid selection data.');
}
if (!ctype_digit($selectionData[$paramName])) {
if (!is_numeric($selectionData[$paramName])) {
throw new SystemException('Invalid selection data.');
}
$selectionData[$paramName] = (int) $selectionData[$paramName];
}
$sessionDirectoryPath = $this->getCropSessionDirPath($cropSessionKey);

14
modules/cms/widgets/mediamanager/assets/js/mediamanager.imagecroppopup.js
View File

@ -202,7 +202,7 @@
mode = this.getSelectionMode()
switch (mode) {
case 'fixed-ratio' :
case 'fixed-ratio' :
this.jCrop.setOptions({
aspectRatio: width/height,
minSize: [0, 0],
@ -210,7 +210,7 @@
allowResize: true
})
break
case 'fixed-size' :
case 'fixed-size' :
this.jCrop.setOptions({
aspectRatio: 0,
minSize: [width, height],
@ -218,7 +218,7 @@
allowResize: false
})
break
case 'normal' :
case 'normal' :
this.jCrop.setOptions({
aspectRatio: 0,
minSize: [0, 0],
@ -314,7 +314,7 @@
var data = {
cropSessionKey: this.$popupElement.find('input[name=cropSessionKey]').val(),
path: this.$popupElement.find('input[name=path]').val()
}
}
$.oc.stripeLoadIndicator.show()
$(ev.target).request(this.options.alias+'::onResizeImage', {
@ -338,7 +338,7 @@
this.$popupElement.find('span[data-label=width]').text(width)
this.$popupElement.find('span[data-label=height]').text(hegiht)
this.$popupElement.find('input[data-control=dimension-width]').val(width)
this.$popupElement.find('input[data-control=dimension-height]').val(hegiht)
@ -370,8 +370,8 @@
}
this.selectionSizeLabel.setAttribute('class', '')
this.selectionSizeLabel.querySelector('[data-label=selection-width]').textContent = width
this.selectionSizeLabel.querySelector('[data-label=selection-height]').textContent = height
this.selectionSizeLabel.querySelector('[data-label=selection-width]').textContent = parseInt(width)
this.selectionSizeLabel.querySelector('[data-label=selection-height]').textContent = parseInt(height)
}
// EVENT HANDLERS