Skip to content
Snippets Groups Projects
Commit 4e8ad928 authored by Frank Nägler's avatar Frank Nägler Committed by Anja Leichsenring
Browse files

[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/45947


Reviewed-by: default avatarAndreas Fernandez <typo3@scripting-base.de>
Tested-by: default avatarAndreas Fernandez <typo3@scripting-base.de>
Reviewed-by: default avatarMarkus Klein <markus.klein@typo3.org>
Tested-by: default avatarMarkus Klein <markus.klein@typo3.org>
Reviewed-by: default avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: default avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
parent 1f4b9745
Branches
Tags
No related merge requests found
......@@ -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';
......
......@@ -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,
......
......@@ -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';
......
......@@ -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,
......
......@@ -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, [], []);
});
});
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment