Skip to content
This repository was archived by the owner on Jan 10, 2021. It is now read-only.

Commit 1cd07e2

Browse files
committed
0.4.1
1 parent c8d04ad commit 1cd07e2

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

dist/zz-load.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,20 +171,23 @@ var zzLoad = (function () {
171171

172172
if (element.nodeName.toLowerCase() === 'picture') {
173173
var pitureImg = element.getElementsByTagName('img')[0];
174-
var patter = /^(http(s)?:)?\/\//i;
175174

176175
if (pitureImg instanceof window.HTMLImageElement) {
177-
var currentSrc = pitureImg.currentSrc.replace(patter, '');
176+
var clear = function clear(str) {
177+
return str.replace(/^\/\//i, '').replace(window.location.origin, '');
178+
};
179+
180+
var currentSrc = clear(pitureImg.currentSrc);
178181
var src = null;
179182
var _srcset = null;
180183

181184
for (var i = 0; i < element.children.length; i++) {
182185
var child = element.children[i];
183186
var isSource = child.nodeName.toLowerCase() === 'source';
184187
var isImg = child.nodeName.toLowerCase() === 'img';
185-
var childSrc = isSource ? child.srcset : isImg ? child.src : '';
188+
var childSrc = clear(isSource ? child.srcset : isImg ? child.src : '');
186189

187-
if (currentSrc === childSrc.replace(patter, '')) {
190+
if (currentSrc === childSrc) {
188191
src = child.getAttribute(_attrs.sourceImg) || null;
189192
_srcset = child.getAttribute(_attrs.sourceSrcSet);
190193
}

dist/zz-load.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zz-load",
3-
"version": "0.4.0",
3+
"version": "0.4.1",
44
"description": "",
55
"main": "zz-load.es.js",
66
"scripts": {

zz-load.es.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,17 @@ const _load = (element, onLoad, onError, asPromise) => {
152152
// picture
153153
if (element.nodeName.toLowerCase() === 'picture') {
154154
const pitureImg = element.getElementsByTagName('img')[0];
155-
const patter = /^(http(s)?:)?\/\//i;
156155
if (pitureImg instanceof window.HTMLImageElement) {
157-
let currentSrc = pitureImg.currentSrc.replace(patter, '');
156+
const clear = str => str.replace(/^\/\//i, '').replace(window.location.origin, '');
157+
const currentSrc = clear(pitureImg.currentSrc);
158158
let src = null;
159159
let srcset = null;
160-
161160
for (let i = 0; i < element.children.length; i++) {
162161
const child = element.children[i];
163162
const isSource = child.nodeName.toLowerCase() === 'source';
164163
const isImg = child.nodeName.toLowerCase() === 'img';
165-
const childSrc = isSource ? child.srcset : isImg ? child.src : '';
166-
if (currentSrc === childSrc.replace(patter, '')) {
164+
const childSrc = clear(isSource ? child.srcset : isImg ? child.src : '');
165+
if (currentSrc === childSrc) {
167166
src = child.getAttribute(_attrs.sourceImg) || null;
168167
srcset = child.getAttribute(_attrs.sourceSrcSet);
169168
}
@@ -201,6 +200,7 @@ const _load = (element, onLoad, onError, asPromise) => {
201200
if (srcset) {
202201
img.srcset = srcset;
203202
}
203+
204204
img.src = src;
205205
return null;
206206
}

0 commit comments

Comments
 (0)