From 2642a04e19ef6f6b02c255ab0cfcd691749f2e20 Mon Sep 17 00:00:00 2001
From: Andreas Fernandez <a.fernandez@scripting-base.de>
Date: Mon, 20 Jul 2015 15:00:40 +0200
Subject: [PATCH] [BUGFIX] Remove leftover usage of prototype in EXT:form
Prototype is used in EXT:form, which is based on ExtJS. Prototype
was removed earlier, resulting in JavaScript errors. The broken
function calls are replaced by ExtJS pendants.
Resolves: #68391
Related: #39721
Releases: master
Change-Id: If005caa86b63cf930fc49e2408214ef4d9574c4f
Reviewed-on: http://review.typo3.org/41735
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
.../Wizard/Elements/Predefined/CheckboxGroup.js | 4 ++--
.../Wizard/Elements/Predefined/RadioGroup.js | 4 ++--
.../Public/JavaScript/Wizard/Viewport/Left.js | 2 +-
.../JavaScript/Wizard/Viewport/Left/Elements.js | 2 +-
.../JavaScript/Wizard/Viewport/Left/Elements/Basic.js | 2 +-
.../Wizard/Viewport/Left/Elements/Content.js | 2 +-
.../Wizard/Viewport/Left/Elements/Predefined.js | 2 +-
.../Public/JavaScript/Wizard/Viewport/Left/Form.js | 11 ++++++-----
.../Public/JavaScript/Wizard/Viewport/Left/Options.js | 11 ++++++-----
9 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Elements/Predefined/CheckboxGroup.js b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Elements/Predefined/CheckboxGroup.js
index 2143936f29cc..eb00a20ef554 100644
--- a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Elements/Predefined/CheckboxGroup.js
+++ b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Elements/Predefined/CheckboxGroup.js
@@ -105,12 +105,12 @@ TYPO3.Form.Wizard.Elements.Predefined.CheckboxGroup = Ext.extend(TYPO3.Form.Wiza
*/
rebuild: function(component) {
this.containerComponent.removeAll();
- if (this.configuration.options.size() > 0) {
+ if (this.configuration.options.length > 0) {
var dummy = this.containerComponent.findById('dummy');
if (dummy) {
this.containerComponent.remove(dummy, true);
}
- this.configuration.options.each(function(option, index, length) {
+ Ext.each(this.configuration.options, function(option, index, length) {
var checkbox = this.containerComponent.add({
xtype: 'typo3-form-wizard-elements-basic-checkbox',
isEditable: false,
diff --git a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Elements/Predefined/RadioGroup.js b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Elements/Predefined/RadioGroup.js
index 66c5621a8e43..feb4fd093a76 100644
--- a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Elements/Predefined/RadioGroup.js
+++ b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Elements/Predefined/RadioGroup.js
@@ -105,12 +105,12 @@ TYPO3.Form.Wizard.Elements.Predefined.RadioGroup = Ext.extend(TYPO3.Form.Wizard.
*/
rebuild: function(component) {
this.containerComponent.removeAll();
- if (this.configuration.options.size() > 0) {
+ if (this.configuration.options.length > 0) {
var dummy = this.containerComponent.findById('dummy');
if (dummy) {
this.containerComponent.remove(dummy, true);
}
- this.configuration.options.each(function(option, index, length) {
+ Ext.each(this.configuration.options, function(option, index, length) {
var radio = this.containerComponent.add({
xtype: 'typo3-form-wizard-elements-basic-radio',
isEditable: false,
diff --git a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left.js b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left.js
index fad28d9a6cbb..586d7defb1f0 100644
--- a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left.js
+++ b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left.js
@@ -78,7 +78,7 @@ TYPO3.Form.Wizard.Viewport.Left = Ext.extend(Ext.TabPanel, {
var allowedTabs = TYPO3.Form.Wizard.Settings.defaults.showTabs.split(/[, ]+/);
var tabs = [];
- allowedTabs.each(function(option, index, length) {
+ Ext.each(allowedTabs, function(option, index, length) {
var tabXtype = 'typo3-form-wizard-viewport-left-' + option;
if (Ext.ComponentMgr.isRegistered(tabXtype)) {
tabs.push({
diff --git a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements.js b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements.js
index e1aa8aa8c319..72a06a0d7fb3 100644
--- a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements.js
+++ b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements.js
@@ -46,7 +46,7 @@ TYPO3.Form.Wizard.Viewport.Left.Elements = Ext.extend(Ext.Panel, {
var allowedAccordions = TYPO3.Form.Wizard.Settings.defaults.tabs.elements.showAccordions.split(/[, ]+/);
var accordions = [];
- allowedAccordions.each(function(option, index, length) {
+ Ext.each(allowedAccordions, function(option, index, length) {
var accordionXtype = 'typo3-form-wizard-viewport-left-elements-' + option;
if (Ext.ComponentMgr.isRegistered(accordionXtype)) {
accordions.push({
diff --git a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements/Basic.js b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements/Basic.js
index cb1d31ca57a9..4f2e0fdc0f8d 100644
--- a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements/Basic.js
+++ b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements/Basic.js
@@ -38,7 +38,7 @@ TYPO3.Form.Wizard.Viewport.Left.Elements.Basic = Ext.extend(TYPO3.Form.Wizard.Vi
var allowedButtons = TYPO3.Form.Wizard.Settings.defaults.tabs.elements.accordions.basic.showButtons.split(/[, ]+/);
var buttons = [];
- allowedButtons.each(function(option, index, length) {
+ Ext.each(allowedButtons, function(option, index, length) {
switch (option) {
case 'button':
buttons.push({
diff --git a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements/Content.js b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements/Content.js
index 44d8b147c813..bfcb0c3f9da7 100644
--- a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements/Content.js
+++ b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements/Content.js
@@ -38,7 +38,7 @@ TYPO3.Form.Wizard.Viewport.Left.Elements.Content = Ext.extend(TYPO3.Form.Wizard.
var allowedButtons = TYPO3.Form.Wizard.Settings.defaults.tabs.elements.accordions.content.showButtons.split(/[, ]+/);
var buttons = [];
- allowedButtons.each(function(option, index, length) {
+ Ext.each(allowedButtons, function(option, index, length) {
switch (option) {
case 'header':
buttons.push({
diff --git a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements/Predefined.js b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements/Predefined.js
index a2659c08a3f0..d1596e90e3bc 100644
--- a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements/Predefined.js
+++ b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Elements/Predefined.js
@@ -38,7 +38,7 @@ TYPO3.Form.Wizard.Viewport.Left.Elements.Predefined = Ext.extend(TYPO3.Form.Wiza
var allowedButtons = TYPO3.Form.Wizard.Settings.defaults.tabs.elements.accordions.predefined.showButtons.split(/[, ]+/);
var buttons = [];
- allowedButtons.each(function(option, index, length) {
+ Ext.each(allowedButtons, function(option, index, length) {
switch (option) {
case 'email':
buttons.push({
diff --git a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Form.js b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Form.js
index 5b884b5950f0..89264b985447 100644
--- a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Form.js
+++ b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Form.js
@@ -108,7 +108,7 @@ TYPO3.Form.Wizard.Viewport.Left.Form = Ext.extend(Ext.Panel, {
this.accordion.removeAll();
if (form) {
- allowedAccordions.each(function(option, index, length) {
+ Ext.each(allowedAccordions, function(option, index, length) {
switch (option) {
case 'behaviour':
this.accordion.add({
@@ -181,10 +181,11 @@ TYPO3.Form.Wizard.Viewport.Left.Form = Ext.extend(Ext.Panel, {
}
}, this);
if (this.tabEl) {
- if (tabIsValid && Ext.get(this.tabEl).hasClass('validation-error')) {
- this.tabEl.removeClassName('validation-error');
- } else if (!tabIsValid && !Ext.get(this.tabEl).hasClass('validation-error')) {
- this.tabEl.addClassName('validation-error');
+ var tabEl = Ext.get(this.tabEl);
+ if (tabIsValid && tabEl.hasClass('validation-error')) {
+ tabEl.removeClass('validation-error');
+ } else if (!tabIsValid && !tabEl.hasClass('validation-error')) {
+ tabEl.addClass('validation-error');
}
}
}
diff --git a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Options.js b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Options.js
index b5965ef2e289..6e51602abec2 100644
--- a/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Options.js
+++ b/typo3/sysext/form/Resources/Public/JavaScript/Wizard/Viewport/Left/Options.js
@@ -120,7 +120,7 @@ TYPO3.Form.Wizard.Viewport.Left.Options = Ext.extend(Ext.Panel, {
xtype: 'typo3-form-wizard-viewport-left-options-dummy'
});
}
- this.tabEl.removeClassName('validation-error');
+ Ext.get(this.tabEl).removeClass('validation-error');
Ext.iterate(this.validAccordions, function(key, value) {
this.validAccordions[key] = true;
}, this);
@@ -157,10 +157,11 @@ TYPO3.Form.Wizard.Viewport.Left.Options = Ext.extend(Ext.Panel, {
var tabIsValid = this.tabIsValid();
if (this.tabEl) {
- if (tabIsValid && Ext.get(this.tabEl).hasClass('validation-error')) {
- this.tabEl.removeClassName('validation-error');
- } else if (!tabIsValid && !Ext.get(this.tabEl).hasClass('validation-error')) {
- this.tabEl.addClassName('validation-error');
+ var tabEl = Ext.get(this.tabEl);
+ if (tabIsValid && tabEl.hasClass('validation-error')) {
+ tabEl.removeClass('validation-error');
+ } else if (!tabIsValid && !tabEl.hasClass('validation-error')) {
+ tabEl.addClass('validation-error');
}
}
}
--
GitLab