From 084eed3c6362e9ed8e038aedb98997c667e65f96 Mon Sep 17 00:00:00 2001 From: xg4 Date: Wed, 15 May 2019 20:54:39 +0800 Subject: [PATCH 1/3] [bugfix] Utils: is-src add blob image source (#3300) --- packages/utils/test/index.spec.js | 2 ++ packages/utils/validate/src.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/utils/test/index.spec.js b/packages/utils/test/index.spec.js index d696783d8..c12f8ae34 100644 --- a/packages/utils/test/index.spec.js +++ b/packages/utils/test/index.spec.js @@ -86,4 +86,6 @@ test('is-src', () => { expect(isSrc('img.cdn.com')).toBeFalsy(); expect(isSrc('name')).toBeFalsy(); expect(isSrc('')).toBeFalsy(); + expect(isSrc('blob:http://img.cdn.com')).toBeTruthy(); + expect(isSrc('blob:https://img.cdn.com')).toBeTruthy(); }); diff --git a/packages/utils/validate/src.ts b/packages/utils/validate/src.ts index 9371f0b50..11d6806d2 100644 --- a/packages/utils/validate/src.ts +++ b/packages/utils/validate/src.ts @@ -2,5 +2,5 @@ * Is image source */ export function isSrc(url: string): boolean { - return /^(https?:)?\/\/|data:image/.test(url); + return /^((blob:)?https?:)?\/\/|data:image/.test(url); } From 6961e4efb0422f824473a12972da7022d19380c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Thu, 16 May 2019 14:42:25 +0800 Subject: [PATCH 2/3] [bugfix] Col: should set min-height --- packages/col/index.less | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/col/index.less b/packages/col/index.less index 8f8dd81b1..cdc5534e3 100644 --- a/packages/col/index.less +++ b/packages/col/index.less @@ -2,6 +2,7 @@ .van-col { float: left; + min-height: 1px; box-sizing: border-box; } From 48d47cc1e0de34231043ea0ba8bee3b2ed6cc6c7 Mon Sep 17 00:00:00 2001 From: xg4 Date: Thu, 16 May 2019 10:44:25 +0800 Subject: [PATCH 3/3] [bugfix] Utils: data URLs should be prefixed with the data:image (#3308) --- packages/utils/test/index.spec.js | 1 + packages/utils/validate/src.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/utils/test/index.spec.js b/packages/utils/test/index.spec.js index c12f8ae34..2d46e14e7 100644 --- a/packages/utils/test/index.spec.js +++ b/packages/utils/test/index.spec.js @@ -88,4 +88,5 @@ test('is-src', () => { expect(isSrc('')).toBeFalsy(); expect(isSrc('blob:http://img.cdn.com')).toBeTruthy(); expect(isSrc('blob:https://img.cdn.com')).toBeTruthy(); + expect(isSrc('xdata:image/jpeg;base64,/9j/4AAQSkZ')).toBeFalsy(); }); diff --git a/packages/utils/validate/src.ts b/packages/utils/validate/src.ts index 11d6806d2..7f07f4321 100644 --- a/packages/utils/validate/src.ts +++ b/packages/utils/validate/src.ts @@ -2,5 +2,5 @@ * Is image source */ export function isSrc(url: string): boolean { - return /^((blob:)?https?:)?\/\/|data:image/.test(url); + return /^(((blob:)?https?:)?\/\/|data:image)/.test(url); }