From 3a44339f602704ae6f30d5f10d5621125ef22fb7 Mon Sep 17 00:00:00 2001
From: Frank Naegler <frank.naegler@typo3.org>
Date: Sun, 12 Feb 2017 17:10:50 +0100
Subject: [PATCH] [TASK] FormEngineValidation on speed
This patch removes the setTimeout hacks from FormEngineValidation.js.
Since the removal of ExtJS from FormEngine this hacky solution could be
removed and speed up the FormEngine validation process.
Resolves: #79765
Releases: master
Change-Id: I18f38a1641ea7916844cd464da3f31ad0fc22517
Reviewed-on: https://review.typo3.org/51643
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
Reviewed-by: Susanne Moog <susanne.moog@typo3.org>
Tested-by: Susanne Moog <susanne.moog@typo3.org>
---
.../Private/TypeScript/FormEngineReview.ts | 8 ++++--
.../Public/JavaScript/FormEngineReview.js | 8 ++++--
.../Public/JavaScript/FormEngineValidation.js | 28 ++++++-------------
3 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/typo3/sysext/backend/Resources/Private/TypeScript/FormEngineReview.ts b/typo3/sysext/backend/Resources/Private/TypeScript/FormEngineReview.ts
index 2dfbe36dfdd6..284b4a68e9ea 100644
--- a/typo3/sysext/backend/Resources/Private/TypeScript/FormEngineReview.ts
+++ b/typo3/sysext/backend/Resources/Private/TypeScript/FormEngineReview.ts
@@ -133,9 +133,11 @@ class FormEngineReview {
// Bootstrap has no official API to update the content of a popover w/o destroying it
let $popover: any = $toggleButton.data('bs.popover');
- $popover.options.content = $list.wrapAll('<div>').parent().html();
- $popover.setContent();
- $popover.$tip.addClass($popover.options.placement);
+ if ($popover) {
+ $popover.options.content = $list.wrapAll('<div>').parent().html();
+ $popover.setContent();
+ $popover.$tip.addClass($popover.options.placement);
+ }
} else {
$toggleButton.addClass('hidden').popover('hide');
}
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineReview.js b/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineReview.js
index bc761295caf7..8d7f6d36d2b5 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineReview.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineReview.js
@@ -48,9 +48,11 @@ define(["require", "exports", "TYPO3/CMS/Backend/FormEngineValidation", "jquery"
$toggleButton.removeClass('hidden');
// Bootstrap has no official API to update the content of a popover w/o destroying it
var $popover = $toggleButton.data('bs.popover');
- $popover.options.content = $list_1.wrapAll('<div>').parent().html();
- $popover.setContent();
- $popover.$tip.addClass($popover.options.placement);
+ if ($popover) {
+ $popover.options.content = $list_1.wrapAll('<div>').parent().html();
+ $popover.setContent();
+ $popover.$tip.addClass($popover.options.placement);
+ }
}
else {
$toggleButton.addClass('hidden').popover('hide');
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineValidation.js b/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineValidation.js
index ff6497ff7b26..feba8af35288 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineValidation.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/FormEngineValidation.js
@@ -50,23 +50,16 @@ define(['jquery', 'TYPO3/CMS/Backend/FormEngine', 'moment'], function ($, FormEn
FormEngineValidation.initializeInputFields().promise().done(function () {
// Bind to field changes
$(document).on('change', FormEngineValidation.rulesSelector, function() {
- // we need to wait, because the update of the select fields needs some time
- window.setTimeout(function() {
- FormEngineValidation.validate();
- }, 500);
+ FormEngineValidation.validate();
var $paletteField = $(this).closest('.t3js-formengine-palette-field');
$paletteField.addClass('has-change');
});
- // Bind to datepicker change event, but wait some milliseconds, because the init is not so fast
- window.setTimeout(function() {
- //noinspection JSUnusedLocalSymbols
- $(document).on('dp.change', FormEngineValidation.dateTimeSelector, function(event) {
- FormEngineValidation.validate();
- var $paletteField = $(this).closest('.t3js-formengine-palette-field');
- $paletteField.addClass('has-change');
- });
- }, 500);
+ $(document).on('dp.change', FormEngineValidation.dateTimeSelector, function(event) {
+ FormEngineValidation.validate();
+ var $paletteField = $(this).closest('.t3js-formengine-palette-field');
+ $paletteField.addClass('has-change');
+ });
});
var today = new Date();
@@ -75,6 +68,7 @@ define(['jquery', 'TYPO3/CMS/Backend/FormEngine', 'moment'], function ($, FormEn
FormEngineValidation.lastTime = 0;
FormEngineValidation.refDate = today;
FormEngineValidation.USmode = 0;
+ FormEngineValidation.validate();
};
/**
@@ -1041,13 +1035,7 @@ define(['jquery', 'TYPO3/CMS/Backend/FormEngine', 'moment'], function ($, FormEn
};
FormEngineValidation.registerReady = function() {
- $(function() {
- FormEngineValidation.initialize();
- // Start first validation after one second, because all fields are initial empty (typo3form.fieldSet)
- window.setTimeout(function() {
- FormEngineValidation.validate();
- }, 1000);
- });
+ FormEngineValidation.initialize();
};
FormEngine.Validation = FormEngineValidation;
--
GitLab