Merge branch 'hotfix/php-7.3-compat'

This commit is contained in:
Björn Fromme
2019-07-30 09:30:13 +02:00
@@ -1,7 +1,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"
xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
xmlns:ep="http://typo3.org/ns/EP/EpEvents/ViewHelpers">
<html data-namespace-typo3-fluid="true" lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<f:layout name="Default"/>
@@ -70,7 +70,7 @@
inline-template>
<f:form id="configuratorform" object="{inquiry}" name="inquiry" action="processConfiguratorForm"
controller="AjaxForm" pluginName="Ajax" pageType="1703" pageUid="{settings.ajaxPageUid}"
noCacheHash="1" additionalAttributes="{'@submit.prevent': 'submitForm()'}">
additionalAttributes="{'@submit.prevent': 'submitForm()'}">
<f:form.hidden property="travelType" additionalAttributes="{v-model: 'formData.type'}"/>
<f:form.hidden property="hotelType" additionalAttributes="{v-model: 'formData.accommodation'}"/>
<f:form.hidden property="locationType" additionalAttributes="{v-model: 'formData.destination'}"/>
@@ -96,22 +96,12 @@
<div class="config-selectbox__badges">
<span v-for="badge in selectedOptions(selectBoxType)" class="config-selectbox__badge">{{ badge }}</span>
</div>
<span class="config-selectbox__toggle" :class="{
closed: !selectBoxData.active && !isIncludedBox(selectBoxType),
open: selectBoxData.active,
included: isIncludedBox(selectBoxType)
}"></span>
<span class="config-selectbox__toggle" :class="{closed: !selectBoxData.active && !isIncludedBox(selectBoxType),open: selectBoxData.active,included: isIncludedBox(selectBoxType)}"></span>
</a>
<div class="config-selectbox__main">
<a href="#"
v-for="(label, value) in selectBoxData.options"
:class="[
'config-selectbox__item ' + selectBoxType + '--' + value,
{
selected: isSelected(selectBoxType, value),
'has--icon': selectBoxData.hasIcon
}
]"
:class="['config-selectbox__item ' + selectBoxType + '--' + value,{selected: isSelected(selectBoxType, value),'has--icon': selectBoxData.hasIcon}]"
@click.prevent="toggleSelection(selectBoxType, value)"
@touchend.prevent="toggleSelection(selectBoxType, value)">
<div class="config-selectbox__item__inner"