Skip to content

Commit a63fa79

Browse files
fengyuanchenfengyuanchen
committed
build: release 1.10.5
1 parent 158d3d2 commit a63fa79

File tree

12 files changed

+2649
-4861
lines changed

12 files changed

+2649
-4861
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## next
3+
## 1.10.5 (Apr 5, 2022)
44

55
- Continue to initialize even if some images fail to load in inline mode.
66
- Avoid conflicts with nested modals (#540).

‎dist/viewer.common.js‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
2-
* Viewer.js v1.10.4
2+
* Viewer.js v1.10.5
33
* https://fengyuanchen.github.io/viewerjs
44
*
55
* Copyright 2015-present Chen Fengyuan
66
* Released under the MIT license
77
*
8-
* Date: 2022-02-13T08:40:00.127Z
8+
* Date: 2022-04-05T08:21:02.491Z
99
*/
1010

1111
'use strict';
@@ -3040,10 +3040,20 @@ var others = {
30403040
var viewer = _this.viewer;
30413041
var target = event.target;
30423042

3043-
if (target !== document && target !== viewer && !viewer.contains(target) // Avoid conflicts with other modals (#474)
3044-
&& (target.getAttribute('tabindex') === null || target.getAttribute('aria-modal') !== 'true')) {
3045-
viewer.focus();
3043+
if (target === document || target === viewer || viewer.contains(target)) {
3044+
return;
3045+
}
3046+
3047+
while (target) {
3048+
// Avoid conflicts with other modals (#474, #540)
3049+
if (target.getAttribute('tabindex') !== null || target.getAttribute('aria-modal') === 'true') {
3050+
return;
3051+
}
3052+
3053+
target = target.parentElement;
30463054
}
3055+
3056+
viewer.focus();
30473057
});
30483058
},
30493059
clearEnforceFocus: function clearEnforceFocus() {
@@ -3340,6 +3350,7 @@ var Viewer = /*#__PURE__*/function () {
33403350
forEach(images, function (image) {
33413351
if (!image.complete) {
33423352
removeListener(image, EVENT_LOAD, progress);
3353+
removeListener(image, EVENT_ERROR, progress);
33433354
}
33443355
});
33453356
}
@@ -3348,7 +3359,18 @@ var Viewer = /*#__PURE__*/function () {
33483359
if (image.complete) {
33493360
progress();
33503361
} else {
3351-
addListener(image, EVENT_LOAD, progress, {
3362+
var onLoad;
3363+
var onError;
3364+
addListener(image, EVENT_LOAD, onLoad = function onLoad() {
3365+
removeListener(image, EVENT_ERROR, onError);
3366+
progress();
3367+
}, {
3368+
once: true
3369+
});
3370+
addListener(image, EVENT_ERROR, onError = function onError() {
3371+
removeListener(image, EVENT_LOAD, onLoad);
3372+
progress();
3373+
}, {
33523374
once: true
33533375
});
33543376
}

‎dist/viewer.css‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
2-
* Viewer.js v1.10.4
2+
* Viewer.js v1.10.5
33
* https://fengyuanchen.github.io/viewerjs
44
*
55
* Copyright 2015-present Chen Fengyuan
66
* Released under the MIT license
77
*
8-
* Date: 2022-02-13T08:39:57.620Z
8+
* Date: 2022-04-05T08:21:00.150Z
99
*/
1010

1111
.viewer-zoom-in::before, .viewer-zoom-out::before, .viewer-one-to-one::before, .viewer-reset::before, .viewer-prev::before, .viewer-play::before, .viewer-next::before, .viewer-rotate-left::before, .viewer-rotate-right::before, .viewer-flip-horizontal::before, .viewer-flip-vertical::before, .viewer-fullscreen::before, .viewer-fullscreen-exit::before, .viewer-close::before {
@@ -329,6 +329,7 @@
329329
}
330330

331331
.viewer-button {
332+
-webkit-app-region: no-drag;
332333
background-color: rgba(0, 0, 0, 50%);
333334
border-radius: 50%;
334335
cursor: pointer;

‎dist/viewer.esm.js‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
2-
* Viewer.js v1.10.4
2+
* Viewer.js v1.10.5
33
* https://fengyuanchen.github.io/viewerjs
44
*
55
* Copyright 2015-present Chen Fengyuan
66
* Released under the MIT license
77
*
8-
* Date: 2022-02-13T08:40:00.127Z
8+
* Date: 2022-04-05T08:21:02.491Z
99
*/
1010

1111
function ownKeys(object, enumerableOnly) {
@@ -3038,10 +3038,20 @@ var others = {
30383038
var viewer = _this.viewer;
30393039
var target = event.target;
30403040

3041-
if (target !== document && target !== viewer && !viewer.contains(target) // Avoid conflicts with other modals (#474)
3042-
&& (target.getAttribute('tabindex') === null || target.getAttribute('aria-modal') !== 'true')) {
3043-
viewer.focus();
3041+
if (target === document || target === viewer || viewer.contains(target)) {
3042+
return;
3043+
}
3044+
3045+
while (target) {
3046+
// Avoid conflicts with other modals (#474, #540)
3047+
if (target.getAttribute('tabindex') !== null || target.getAttribute('aria-modal') === 'true') {
3048+
return;
3049+
}
3050+
3051+
target = target.parentElement;
30443052
}
3053+
3054+
viewer.focus();
30453055
});
30463056
},
30473057
clearEnforceFocus: function clearEnforceFocus() {
@@ -3338,6 +3348,7 @@ var Viewer = /*#__PURE__*/function () {
33383348
forEach(images, function (image) {
33393349
if (!image.complete) {
33403350
removeListener(image, EVENT_LOAD, progress);
3351+
removeListener(image, EVENT_ERROR, progress);
33413352
}
33423353
});
33433354
}
@@ -3346,7 +3357,18 @@ var Viewer = /*#__PURE__*/function () {
33463357
if (image.complete) {
33473358
progress();
33483359
} else {
3349-
addListener(image, EVENT_LOAD, progress, {
3360+
var onLoad;
3361+
var onError;
3362+
addListener(image, EVENT_LOAD, onLoad = function onLoad() {
3363+
removeListener(image, EVENT_ERROR, onError);
3364+
progress();
3365+
}, {
3366+
once: true
3367+
});
3368+
addListener(image, EVENT_ERROR, onError = function onError() {
3369+
removeListener(image, EVENT_LOAD, onLoad);
3370+
progress();
3371+
}, {
33503372
once: true
33513373
});
33523374
}

‎dist/viewer.js‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
2-
* Viewer.js v1.10.4
2+
* Viewer.js v1.10.5
33
* https://fengyuanchen.github.io/viewerjs
44
*
55
* Copyright 2015-present Chen Fengyuan
66
* Released under the MIT license
77
*
8-
* Date: 2022-02-13T08:40:00.127Z
8+
* Date: 2022-04-05T08:21:02.491Z
99
*/
1010

1111
(function (global, factory) {
@@ -3044,10 +3044,20 @@
30443044
var viewer = _this.viewer;
30453045
var target = event.target;
30463046

3047-
if (target !== document && target !== viewer && !viewer.contains(target) // Avoid conflicts with other modals (#474)
3048-
&& (target.getAttribute('tabindex') === null || target.getAttribute('aria-modal') !== 'true')) {
3049-
viewer.focus();
3047+
if (target === document || target === viewer || viewer.contains(target)) {
3048+
return;
3049+
}
3050+
3051+
while (target) {
3052+
// Avoid conflicts with other modals (#474, #540)
3053+
if (target.getAttribute('tabindex') !== null || target.getAttribute('aria-modal') === 'true') {
3054+
return;
3055+
}
3056+
3057+
target = target.parentElement;
30503058
}
3059+
3060+
viewer.focus();
30513061
});
30523062
},
30533063
clearEnforceFocus: function clearEnforceFocus() {
@@ -3344,6 +3354,7 @@
33443354
forEach(images, function (image) {
33453355
if (!image.complete) {
33463356
removeListener(image, EVENT_LOAD, progress);
3357+
removeListener(image, EVENT_ERROR, progress);
33473358
}
33483359
});
33493360
}
@@ -3352,7 +3363,18 @@
33523363
if (image.complete) {
33533364
progress();
33543365
} else {
3355-
addListener(image, EVENT_LOAD, progress, {
3366+
var onLoad;
3367+
var onError;
3368+
addListener(image, EVENT_LOAD, onLoad = function onLoad() {
3369+
removeListener(image, EVENT_ERROR, onError);
3370+
progress();
3371+
}, {
3372+
once: true
3373+
});
3374+
addListener(image, EVENT_ERROR, onError = function onError() {
3375+
removeListener(image, EVENT_LOAD, onLoad);
3376+
progress();
3377+
}, {
33563378
once: true
33573379
});
33583380
}

0 commit comments

Comments
 (0)