[BUGFIX] Fix broken ImageManipulation wizard

This is a follow-up patch for #72704:
[BUGFIX] Avoid double loading of global RequireJS modules

Resolves: #72739
Related: #72704
Releases: master, 7.6
Change-Id: I156353ba1f21284599a75483565b27d8af3c43a6
Reviewed-on: https://review.typo3.org/45951
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>

diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/AjaxDataHandler.js b/typo3/sysext/backend/Resources/Public/JavaScript/AjaxDataHandler.js
index e9205ba..82e7c6d 100644 (file)
--- a/typo3/sysext/backend/Resources/Public/JavaScript/AjaxDataHandler.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/AjaxDataHandler.js
@@ -19,7 +19,7 @@ define(['jquery',
                'TYPO3/CMS/Backend/Modal',
                'TYPO3/CMS/Backend/Icons',
                'TYPO3/CMS/Backend/Notification',
-               'TYPO3/CMS/Backend/Severity',
+               'TYPO3/CMS/Backend/Severity'
           ], function ($, Modal, Icons, Notification, Severity) {
        'use strict';
 

diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/ImageManipulation.js b/typo3/sysext/backend/Resources/Public/JavaScript/ImageManipulation.js
index 24177c3..031fd67 100644 (file)
--- a/typo3/sysext/backend/Resources/Public/JavaScript/ImageManipulation.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/ImageManipulation.js
@@ -15,7 +15,7 @@
  * Module: TYPO3/CMS/Backend/ImageManipulation
  * Contains all logic for the image crop GUI
  */
-define(['jquery', 'TYPO3/CMS/Backend/Modal'], function ($, Modal) {
+define(['jquery', 'TYPO3/CMS/Backend/Modal', 'TYPO3/CMS/Backend/Severity'], function ($, Modal, Severity) {
 
        /**
         *
@@ -60,7 +60,7 @@ define(['jquery', 'TYPO3/CMS/Backend/Modal'], function ($, Modal) {
        ImageManipulation.show = function() {
                ImageManipulation.currentModal = Modal.loadUrl(
                        ImageManipulation.$trigger.data('image-name'),
-                       TYPO3.Severity.notice,
+                       Severity.notice,
                        [],
                        ImageManipulation.$trigger.data('url'),
                        ImageManipulation.initializeCropperModal,

diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/Severity.js b/typo3/sysext/backend/Resources/Public/JavaScript/Severity.js
index 96b9e4f..85bc23b 100644 (file)
--- a/typo3/sysext/backend/Resources/Public/JavaScript/Severity.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/Severity.js
@@ -12,8 +12,8 @@
  */
 
 /**
- * Module: TYPO3/CMS/Backend/Notification
- * Notification API for the TYPO3 backend
+ * Module: TYPO3/CMS/Backend/Severity
+ * Severity for the TYPO3 backend
  */
 define(function () {
        'use strict';

diff --git a/typo3/sysext/filelist/Resources/Public/JavaScript/FileDelete.js b/typo3/sysext/filelist/Resources/Public/JavaScript/FileDelete.js
index b336c17..d708f99 100644 (file)
--- a/typo3/sysext/filelist/Resources/Public/JavaScript/FileDelete.js
+++ b/typo3/sysext/filelist/Resources/Public/JavaScript/FileDelete.js
@@ -15,7 +15,7 @@
  * Module: TYPO3/CMS/Filelist/FileDelete
  * JavaScript for file delete
  */
-define(['jquery', 'TYPO3/CMS/Backend/Modal'], function ($, Modal) {
+define(['jquery', 'TYPO3/CMS/Backend/Modal', 'TYPO3/CMS/Backend/Severity'], function ($, Modal, Severity) {
 
        $(document).on('click', '.t3js-filelist-delete', function(e) {
                e.preventDefault();
@@ -30,7 +30,7 @@ define(['jquery', 'TYPO3/CMS/Backend/Modal'], function ($, Modal) {
                var veriCode = $anchorElement.data('veriCode');
                var deleteUrl = $anchorElement.data('deleteUrl') + '&file[delete][0][data]=' + encodeURIComponent(identifier) + '&vC=' + encodeURIComponent(veriCode);
                if ($anchorElement.data('check')) {
-                       var $modal = Modal.confirm($anchorElement.data('title'), $anchorElement.data('content'), top.TYPO3.Severity.warning, [
+                       var $modal = Modal.confirm($anchorElement.data('title'), $anchorElement.data('content'), Severity.warning, [
                                {
                                        text: TYPO3.lang['buttons.confirm.delete_file.no'] || 'Cancel',
                                        active: true,

diff --git a/typo3/sysext/recordlist/Resources/Public/JavaScript/BrowseFolders.js b/typo3/sysext/recordlist/Resources/Public/JavaScript/BrowseFolders.js
index ba00b0e..e149e29 100644 (file)
--- a/typo3/sysext/recordlist/Resources/Public/JavaScript/BrowseFolders.js
+++ b/typo3/sysext/recordlist/Resources/Public/JavaScript/BrowseFolders.js
@@ -16,7 +16,7 @@
  * Folder selection
  * @exports TYPO3/CMS/Recordlist/BrowseFolders
  */
-define(['jquery', 'TYPO3/CMS/Recordlist/ElementBrowser', 'TYPO3/CMS/Backend/Modal'], function ($, ElementBrowser, Modal) {
+define(['jquery', 'TYPO3/CMS/Recordlist/ElementBrowser', 'TYPO3/CMS/Backend/Modal', 'TYPO3/CMS/Backend/Severity'], function ($, ElementBrowser, Modal, Severity) {
        'use strict';
 
        $(function() {
@@ -29,7 +29,7 @@ define(['jquery', 'TYPO3/CMS/Recordlist/ElementBrowser', 'TYPO3/CMS/Backend/Moda
 
                $('.t3js-folderIdError').on('click', function (event) {
                        event.preventDefault();
-                       Modal.confirm('', $(this).data('message'), opener.TYPO3.Severity.error, [], []);
+                       Modal.confirm('', $(this).data('message'), Severity.error, [], []);
                });
        });