jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into feature/CSR-616-3

Browse source
This commit is contained in:
Mark Harris 2022-05-19 15:19:39 -04:00
commit 7e05571f8c
7 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
src/assets/img/wiper-loader.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 16 KiB

2
src/common-components/funnel-footer/funnel-footer.vue
View file

@ -84,7 +84,7 @@ export default {
},
methods: {
onResize() {
this.paddingHeight = document.querySelector(".footer #infoBox").offsetHeight;
this.paddingHeight = this.getFooterInfoBoxHeight();
},
updateButtonText(newText) {
this.customButtontext = newText;

1
src/common-components/loading-modal/loading-modal.spec.js
View file

@ -13,7 +13,6 @@ jest.mock(
jest.mock('@/assets/img/loader.gif', () => 'loader.gif')
jest.mock('@/assets/img/windshield.png', () => 'windshield.png')
jest.mock('@/assets/img/wiper-loader.gif', () => 'windshield.png')
describe("loadingModal", () => {
test("showModal sets modal visible", async () => {

15
src/common-components/loading-modal/loading-modal.vue
View file

File diff suppressed because one or more lines are too long

1
src/layouts/license-plate-lookup/license-plate-lookup.spec.js
View file

@ -13,7 +13,6 @@ import store from "@/store";
jest.mock('@/assets/img/loader.gif', () => 'loader.gif')
jest.mock('@/assets/img/windshield.png', () => 'windshield.png')
jest.mock('@/assets/img/wiper-loader.gif', () => 'windshield.png')
// Mock our module for promises.
jest.mock("@/helpers/layout-helper.js", () => ({

2
src/layouts/vin-lookup/vin-lookup.vue
View file

@ -147,7 +147,7 @@ defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVIC
defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIRED));
defineRule("email-address-format", regex(/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/, errorMessages.EMAIL_ADDRESS_FORMAT));
defineRule("vin-required", required(errorMessages.VIN_REQUIRED));
defineRule("vin-format", regex(/^[A-HJ-NPR-Z0-9]{17}$/, errorMessages.VIN_FORMAT));
defineRule("vin-format", regex(/^[a-hA-Hj-nJ-NpPr-zR-Z0-9]{17}$/, errorMessages.VIN_FORMAT));
export default {
name: "vin-lookup",

3
src/mixins/base-mixin.js
View file

@ -43,7 +43,8 @@ export default {
}
},
getFooterInfoBoxHeight() {
return document.querySelector(".footer #infoBox").offsetHeight;
const footerInfoBox = document.querySelector(".footer #infoBox");
return footerInfoBox ? footerInfoBox.offsetHeight : 0;
}
},
computed: {