ri-st/editors
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Korrektur beim Upload neuer Keyvisuals

Browse Source
This commit is contained in:
Christian Steinle
2016-09-30 17:31:18 +00:00
parent c45735734d
commit e2dd330449
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
js/editor.js
View File

@@ -527,18 +527,18 @@ var editor = new Object({
data: formData, data: formData,
processData: false, processData: false,
contentType: false, contentType: false,
error: function (jqXHR, textStatus, errorThrow) { error: function (jqXHR, textStatus, errorThrown) {
console.log(jqXHR); console.log(jqXHR);
console.log(textStatus); console.log(textStatus);
console.log(errorThrow); console.log(errorThrown);
alert('Bei der Verarbeitung der Daten ist ein Fehler aufgetreten!') alert('Bei der Verarbeitung der Daten ist ein Fehler aufgetreten!\nStatus: "' + textStatus + '"\nFehlermeldung: "' + errorThrown + '"');
}, },
success: function (data) { success: function (data) {
if (data === 'SUCCESS') { if (data === 'SUCCESS') {
location.reload(); location.reload();
} }
else { else {
alert('Bei der Verarbeitung der Daten ist ein Fehler aufgetreten!') alert('Bei der Verarbeitung der Daten ist ein Fehler aufgetreten!');
} }
} }
}); });
@@ -984,7 +984,17 @@ var imgEditor = new Object({
} }
imgEditor.makeEditingArea(imgID); imgEditor.makeEditingArea(imgID);
(imgID === -1) ? imgEditor.dataSetElement.val(editor.type + '_' + imgEditor.imgIDs[0]) : imgEditor.dataSetElement.val(editor.type + '_' + imgID); if (imgID === -1) {
if (typeof(imgEditor.imgIDs[0]) == 'undefined') {
imgEditor.dataSetElement.val(editor.type);
$('#request').val('insertData');
} else {
imgEditor.dataSetElement.val(editor.type + '_' + imgEditor.imgIDs[0])
}
}
else {
imgEditor.dataSetElement.val(editor.type + '_' + imgID);
}
var actualInnerSlider = $('.editor_slider').children('.inner'); var actualInnerSlider = $('.editor_slider').children('.inner');
actualInnerSlider.hide(); actualInnerSlider.hide();
@@ -1027,9 +1037,12 @@ var imgEditor = new Object({
containment: imgEditor.imagePlaceholder, containment: imgEditor.imagePlaceholder,
handles: 'se', handles: 'se',
minWidth: (imgEditor.imgDimension.width * imgEditor.imgDimension.width / imgEditor.imgOrigDimension.width), minWidth: (imgEditor.imgDimension.width * imgEditor.imgDimension.width / imgEditor.imgOrigDimension.width),
create: function() { create: function () {
if(imgEditor.imagePreview.innerHeight() > imgEditor.editImage.innerHeight()) { if (imgEditor.imagePreview.innerHeight() > imgEditor.editImage.innerHeight()) {
imgEditor.imagePreview.css({width: (imgEditor.imagePreview.innerWidth() * imgEditor.editImage.innerHeight() / imgEditor.imagePreview.innerHeight()), height: imgEditor.editImage.innerHeight() }); imgEditor.imagePreview.css({
width: (imgEditor.imagePreview.innerWidth() * imgEditor.editImage.innerHeight() / imgEditor.imagePreview.innerHeight()),
height: imgEditor.editImage.innerHeight()
});
imgEditor.previewHeight.val(imgEditor.editImage.innerHeight()); imgEditor.previewHeight.val(imgEditor.editImage.innerHeight());
imgEditor.previewWidth.val(imgEditor.imagePreview.innerWidth() * imgEditor.editImage.innerHeight() / imgEditor.imagePreview.innerHeight()); imgEditor.previewWidth.val(imgEditor.imagePreview.innerWidth() * imgEditor.editImage.innerHeight() / imgEditor.imagePreview.innerHeight());
imgEditor.setCover(); imgEditor.setCover();
@@ -1164,6 +1177,7 @@ var imgEditor = new Object({
hasSlider: 'N', hasSlider: 'N',
sliderContent: '' sliderContent: ''
}; };
if (imgEditor.chosenThumb === 0) { if (imgEditor.chosenThumb === 0) {
imgEditor.imgData[-1].hasSlider = imgEditor.imgData[imgEditor.imgIDs[imgEditor.chosenThumb]].hasSlider; imgEditor.imgData[-1].hasSlider = imgEditor.imgData[imgEditor.imgIDs[imgEditor.chosenThumb]].hasSlider;
imgEditor.imgData[-1].sliderContent = imgEditor.imgData[imgEditor.imgIDs[imgEditor.chosenThumb]].sliderContent; imgEditor.imgData[-1].sliderContent = imgEditor.imgData[imgEditor.imgIDs[imgEditor.chosenThumb]].sliderContent;