From f691edf891df98eef70f41ff85559f7c5c731ed4 Mon Sep 17 00:00:00 2001
From: Andreas Fernandez <a.fernandez@scripting-base.de>
Date: Fri, 23 Oct 2015 13:00:43 +0200
Subject: [PATCH] [BUGFIX] Use IconAPI to replace hide action icon in IRRE
Resolves: #70967
Releases: master
Change-Id: I663beb38cdf01ecbabbb6bfcabda16359cd8b23a
Reviewed-on: https://review.typo3.org/44237
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
.../Public/JavaScript/jsfunc.inline.js | 28 ++++++++++++-------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/jsfunc.inline.js b/typo3/sysext/backend/Resources/Public/JavaScript/jsfunc.inline.js
index e4998d11b6fb..458cb46cfee8 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/jsfunc.inline.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/jsfunc.inline.js
@@ -888,7 +888,7 @@ var inline = {
var valueObj = document.getElementsByName(elName);
var escapedObjectIdentifier = this.escapeObjectId(objectIdentifier);
var $container = TYPO3.jQuery('#' + escapedObjectIdentifier + '_div');
- var $icon = $container.find('.t3js-' + escapedObjectIdentifier + '_disabled i');
+ var $icon = $container.find('.t3js-' + escapedObjectIdentifier + '_disabled .t3js-icon');
// It might be the case that there's no hidden field
if (formObj.length && valueObj.length) {
@@ -898,15 +898,23 @@ var inline = {
}
if ($icon.length) {
- if ($icon.hasClass('fa-toggle-on')) {
- $icon.removeClass('fa-toggle-on');
- $icon.addClass('fa-toggle-off');
- $container.addClass('t3-form-field-container-inline-hidden');
- } else {
- $icon.removeClass('fa-toggle-off');
- $icon.addClass('fa-toggle-on');
- $container.removeClass('t3-form-field-container-inline-hidden');
- }
+ require(['TYPO3/CMS/Backend/Icons'], function(Icons) {
+ var hiddenClass = 't3-form-field-container-inline-hidden',
+ isHidden = $container.hasClass(hiddenClass),
+ toggleIcon;
+
+ if (isHidden) {
+ toggleIcon = 'actions-edit-hide';
+ $container.removeClass(hiddenClass);
+ } else {
+ toggleIcon = 'actions-edit-unhide';
+ $container.addClass(hiddenClass);
+ }
+
+ Icons.getIcon(toggleIcon, Icons.sizes.small).done(function(markup) {
+ $icon.replaceWith(markup);
+ });
+ });
}
return false;
--
GitLab