Merge remote-tracking branch 'origin/develop' into feature/CSR-550
This commit is contained in:
commit
ec162e2c52
3 changed files with 26 additions and 7 deletions
|
|
@ -297,8 +297,10 @@ export default {
|
||||||
// if multiple cars were found
|
// if multiple cars were found
|
||||||
let matchingCars = carsFound.filter(car => car.vehicle.carId === carEntered.carId);
|
let matchingCars = carsFound.filter(car => car.vehicle.carId === carEntered.carId);
|
||||||
if (matchingCars.length === 1) {
|
if (matchingCars.length === 1) {
|
||||||
// and one and only of them matches the car id entered
|
|
||||||
this.$refs.loadingModal.showModal();
|
this.$refs.loadingModal.showModal();
|
||||||
|
|
||||||
|
// and one and only of them matches the car id entered
|
||||||
|
const matchingCar = matchingCars[0];
|
||||||
this.updateVehicleInfo(matchingCar.vin, matchingCar.vehicle);
|
this.updateVehicleInfo(matchingCar.vin, matchingCar.vehicle);
|
||||||
navigateAfterSaveToHeritageFunnel(this.$route);
|
navigateAfterSaveToHeritageFunnel(this.$route);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -175,7 +175,7 @@ export default ({
|
||||||
);
|
);
|
||||||
|
|
||||||
// Standard place_changed event handling
|
// Standard place_changed event handling
|
||||||
autocomplete.addListener('place_changed', fillInAddress);
|
const autocompleteListener = window.google.maps.event.addListener(autocomplete, 'place_changed', fillInAddress);
|
||||||
|
|
||||||
// Wrapping the addressField1 element in the Google Address Autocomplete object
|
// Wrapping the addressField1 element in the Google Address Autocomplete object
|
||||||
// will cause "autocomplete='off'" which Chrome completely ignores. This event
|
// will cause "autocomplete='off'" which Chrome completely ignores. This event
|
||||||
|
|
@ -225,7 +225,6 @@ export default ({
|
||||||
}
|
}
|
||||||
|
|
||||||
if (place && place.address_components) {
|
if (place && place.address_components) {
|
||||||
self.addressModel.streetAddress= "";
|
|
||||||
self.showAddressFields = true;
|
self.showAddressFields = true;
|
||||||
|
|
||||||
for (const component of place.address_components) {
|
for (const component of place.address_components) {
|
||||||
|
|
@ -262,7 +261,15 @@ export default ({
|
||||||
else {
|
else {
|
||||||
self.displayVerificationWarning = true;
|
self.displayVerificationWarning = true;
|
||||||
self.displayNoMatchWarning = false;
|
self.displayNoMatchWarning = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// after showing the address fields, disable the address autocomplete
|
||||||
|
window.google.maps.event.removeListener(autocompleteListener);
|
||||||
|
window.google.maps.event.clearInstanceListeners(autocomplete);
|
||||||
|
addressField1.onchange = null;
|
||||||
|
const pacContainer = document.querySelector(".pac-container");
|
||||||
|
pacContainer.remove();
|
||||||
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ html {
|
||||||
&.list-button,
|
&.list-button,
|
||||||
&.list-card,
|
&.list-card,
|
||||||
&.list-card.list-button {
|
&.list-card.list-button {
|
||||||
|
border: none;
|
||||||
color: $red;
|
color: $red;
|
||||||
input[type=checkbox]:focus + label,
|
input[type=checkbox]:focus + label,
|
||||||
input[type=radio]:focus + label {
|
input[type=radio]:focus + label {
|
||||||
|
|
@ -13,10 +14,11 @@ html {
|
||||||
}
|
}
|
||||||
&:hover {
|
&:hover {
|
||||||
box-shadow: 0px 0px 0px 4px $red-200;
|
box-shadow: 0px 0px 0px 4px $red-200;
|
||||||
border-radius: 10px;
|
border-radius: .5rem;
|
||||||
}
|
}
|
||||||
label {
|
label {
|
||||||
border: 1px solid $red;
|
border: 1px solid $red;
|
||||||
|
border-radius: .5rem;
|
||||||
}
|
}
|
||||||
label:hover {
|
label:hover {
|
||||||
box-shadow: 0px 0px 0px 4px $red-200;
|
box-shadow: 0px 0px 0px 4px $red-200;
|
||||||
|
|
@ -51,12 +53,21 @@ html {
|
||||||
}
|
}
|
||||||
&.textbox-question,
|
&.textbox-question,
|
||||||
&.dropdown-question {
|
&.dropdown-question {
|
||||||
|
input:hover {
|
||||||
|
box-shadow: 0px 0px 0px 4px $red-200;
|
||||||
|
border-radius: .5rem;
|
||||||
|
border: 1px solid $red;
|
||||||
|
}
|
||||||
|
input:focus {
|
||||||
|
box-shadow: 0 0 0 2.5px $red;
|
||||||
|
}
|
||||||
p {
|
p {
|
||||||
color: $red;
|
color: $red;
|
||||||
}
|
}
|
||||||
input,
|
input,
|
||||||
select {
|
select {
|
||||||
border: 1px solid $red;
|
border: 1px solid transparent;
|
||||||
|
box-shadow: 0 0 0 1px $red;
|
||||||
&:focus {
|
&:focus {
|
||||||
border: 1px solid transparent;
|
border: 1px solid transparent;
|
||||||
}
|
}
|
||||||
|
|
@ -131,7 +142,6 @@ html {
|
||||||
&.btn.btn-primary:hover,
|
&.btn.btn-primary:hover,
|
||||||
&.btn.btn-primary:focus,
|
&.btn.btn-primary:focus,
|
||||||
&.btn.btn-primary:focus-visible {
|
&.btn.btn-primary:focus-visible {
|
||||||
color: $gray !important;
|
|
||||||
background: $gray-200;
|
background: $gray-200;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue