From 269258055ff017fe9d0b7aa6603494699505bf73 Mon Sep 17 00:00:00 2001
From: Frans Saris <franssaris@gmail.com>
Date: Wed, 14 Oct 2015 11:11:58 +0200
Subject: [PATCH] [TASK] Add missing btn-default class for confirm cancel
button
Cancel button of the confirm modal missed the btn-default class.
Resolves: #70277
Releases: master
Change-Id: I6b23f828524f824184b09948c3ed3216ec4dba7d
Reviewed-on: http://review.typo3.org/44045
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
---
.../backend/Resources/Public/JavaScript/AjaxDataHandler.js | 1 +
.../backend/Resources/Public/JavaScript/DragUploader.js | 1 +
.../sysext/backend/Resources/Public/JavaScript/FormEngine.js | 5 ++++-
typo3/sysext/backend/Resources/Public/JavaScript/Modal.js | 1 +
.../extensionmanager/Resources/Public/JavaScript/Main.js | 4 ++++
.../sysext/recycler/Resources/Public/JavaScript/Recycler.js | 2 ++
6 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/AjaxDataHandler.js b/typo3/sysext/backend/Resources/Public/JavaScript/AjaxDataHandler.js
index 71479ae14356..ae4a8617db79 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/AjaxDataHandler.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/AjaxDataHandler.js
@@ -70,6 +70,7 @@ define(['jquery', 'TYPO3/CMS/Backend/Modal', 'TYPO3/CMS/Backend/Notification'],
{
text: $(this).data('button-close-text') || TYPO3.lang['button.cancel'] || 'Cancel',
active: true,
+ btnClass: 'btn-default',
name: 'cancel'
},
{
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/DragUploader.js b/typo3/sysext/backend/Resources/Public/JavaScript/DragUploader.js
index 24de4bca0d9b..c08d710b3e20 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/DragUploader.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/DragUploader.js
@@ -288,6 +288,7 @@ define(['jquery', 'moment', 'nprogress', 'TYPO3/CMS/Backend/Modal', 'TYPO3/CMS/L
{
text: $(this).data('button-close-text') || TYPO3.lang['file_upload.button.cancel'] || 'Cancel',
active: true,
+ btnClass: 'btn-default',
name: 'cancel'
},
{
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/FormEngine.js b/typo3/sysext/backend/Resources/Public/JavaScript/FormEngine.js
index 47cc40ce9a48..49754c23be56 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/FormEngine.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/FormEngine.js
@@ -601,6 +601,7 @@ define(['jquery', 'TYPO3/CMS/Backend/Modal'], function ($, Modal) {
{
text: TYPO3.lang['buttons.confirm.delete_record.no'] || 'Cancel',
active: true,
+ btnClass: 'btn-default',
name: 'no'
},
{
@@ -628,6 +629,7 @@ define(['jquery', 'TYPO3/CMS/Backend/Modal'], function ($, Modal) {
{
text: TYPO3.lang['buttons.confirm.delete_record.no'] || 'Cancel',
active: true,
+ btnClass: 'btn-default',
name: 'no'
},
{
@@ -837,10 +839,11 @@ define(['jquery', 'TYPO3/CMS/Backend/Modal'], function ($, Modal) {
if ($('.has-change').length > 0) {
var title = TYPO3.lang['label.confirm.close_without_save.title'] || 'Do you want to quit without saving?';
var content = TYPO3.lang['label.confirm.close_without_save.content'] || 'You have currently unsaved changes. Are you sure that you want to discard all changes?';
- $modal = Modal.confirm(title, content, top.TYPO3.Severity.warning, [
+ var $modal = Modal.confirm(title, content, top.TYPO3.Severity.warning, [
{
text: TYPO3.lang['buttons.confirm.close_without_save.no'] || 'No, I will continue editing',
active: true,
+ btnClass: 'btn-default',
name: 'no'
},
{
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/Modal.js b/typo3/sysext/backend/Resources/Public/JavaScript/Modal.js
index c72c9d591645..dce9d83f5b8b 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/Modal.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/Modal.js
@@ -104,6 +104,7 @@ define(['jquery', 'TYPO3/CMS/Backend/Notification', 'bootstrap'], function($) {
{
text: $(this).data('button-close-text') || TYPO3.lang['button.cancel'] || 'Cancel',
active: true,
+ btnClass: 'btn-default',
name: 'cancel'
},
{
diff --git a/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js b/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
index cbc84f5da079..a4f652b74869 100644
--- a/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
+++ b/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
@@ -81,6 +81,7 @@ define(['jquery', 'nprogress', 'TYPO3/CMS/Backend/Modal', 'datatables', 'TYPO3/C
{
text: TYPO3.lang['button.cancel'],
active: true,
+ btnClass: 'btn-default',
trigger: function() {
Modal.dismiss();
}
@@ -197,6 +198,7 @@ define(['jquery', 'nprogress', 'TYPO3/CMS/Backend/Modal', 'datatables', 'TYPO3/C
{
text: TYPO3.lang['button.cancel'],
active: true,
+ btnClass: 'btn-default',
trigger: function() {
Modal.dismiss();
}
@@ -386,6 +388,7 @@ define(['jquery', 'nprogress', 'TYPO3/CMS/Backend/Modal', 'datatables', 'TYPO3/C
{
text: TYPO3.lang['button.cancel'],
active: true,
+ btnClass: 'btn-default',
trigger: function() {
Modal.dismiss();
}
@@ -423,6 +426,7 @@ define(['jquery', 'nprogress', 'TYPO3/CMS/Backend/Modal', 'datatables', 'TYPO3/C
{
text: TYPO3.lang['button.cancel'],
active: true,
+ btnClass: 'btn-default',
trigger: function() {
Modal.dismiss();
}
diff --git a/typo3/sysext/recycler/Resources/Public/JavaScript/Recycler.js b/typo3/sysext/recycler/Resources/Public/JavaScript/Recycler.js
index f72cefe5d134..90a2cf34ea45 100644
--- a/typo3/sysext/recycler/Resources/Public/JavaScript/Recycler.js
+++ b/typo3/sysext/recycler/Resources/Public/JavaScript/Recycler.js
@@ -349,6 +349,7 @@ define(['jquery', 'nprogress', 'TYPO3/CMS/Backend/Modal', 'TYPO3/CMS/Backend/jqu
Modal.confirm(TYPO3.lang['modal.delete.header'], message, top.TYPO3.Severity.error, [
{
text: TYPO3.lang['button.cancel'],
+ btnClass: 'btn-default',
trigger: function() {
Modal.dismiss();
}
@@ -397,6 +398,7 @@ define(['jquery', 'nprogress', 'TYPO3/CMS/Backend/Modal', 'TYPO3/CMS/Backend/jqu
Modal.confirm(TYPO3.lang['modal.undo.header'], $message, top.TYPO3.Severity.ok, [
{
text: TYPO3.lang['button.cancel'],
+ btnClass: 'btn-default',
trigger: function() {
Modal.dismiss();
}
--
GitLab