From e2dd3304492fde660e03fe71c9e71b9dc8123092 Mon Sep 17 00:00:00 2001
From: Christian Steinle <christiansteinle@arcor.de>
Date: Fri, 30 Sep 2016 17:31:18 +0000
Subject: [PATCH] Korrektur beim Upload neuer Keyvisuals

---
 js/editor.js | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/js/editor.js b/js/editor.js
index d4d2bce..0771f96 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -527,18 +527,18 @@ var editor = new Object({
             data: formData,
             processData: false,
             contentType: false,
-            error: function (jqXHR, textStatus, errorThrow) {
+            error: function (jqXHR, textStatus, errorThrown) {
                 console.log(jqXHR);
                 console.log(textStatus);
-                console.log(errorThrow);
-                alert('Bei der Verarbeitung der Daten ist ein Fehler aufgetreten!')
+                console.log(errorThrown);
+                alert('Bei der Verarbeitung der Daten ist ein Fehler aufgetreten!\nStatus: "' + textStatus + '"\nFehlermeldung: "' + errorThrown + '"');
             },
             success: function (data) {
                 if (data === 'SUCCESS') {
                     location.reload();
                 }
                 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);
-        (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');
         actualInnerSlider.hide();
@@ -1027,9 +1037,12 @@ var imgEditor = new Object({
                 containment: imgEditor.imagePlaceholder,
                 handles: 'se',
                 minWidth: (imgEditor.imgDimension.width * imgEditor.imgDimension.width / imgEditor.imgOrigDimension.width),
-                create: function() {
-                    if(imgEditor.imagePreview.innerHeight() > imgEditor.editImage.innerHeight()) {
-                        imgEditor.imagePreview.css({width: (imgEditor.imagePreview.innerWidth() * imgEditor.editImage.innerHeight() / imgEditor.imagePreview.innerHeight()), height: imgEditor.editImage.innerHeight() });
+                create: function () {
+                    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.previewHeight.val(imgEditor.editImage.innerHeight());
                         imgEditor.previewWidth.val(imgEditor.imagePreview.innerWidth() * imgEditor.editImage.innerHeight() / imgEditor.imagePreview.innerHeight());
                         imgEditor.setCover();
@@ -1164,6 +1177,7 @@ var imgEditor = new Object({
                     hasSlider: 'N',
                     sliderContent: ''
                 };
+
                 if (imgEditor.chosenThumb === 0) {
                     imgEditor.imgData[-1].hasSlider = imgEditor.imgData[imgEditor.imgIDs[imgEditor.chosenThumb]].hasSlider;
                     imgEditor.imgData[-1].sliderContent = imgEditor.imgData[imgEditor.imgIDs[imgEditor.chosenThumb]].sliderContent;