Skip to content

Commit

Permalink
build: release 1.3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@fengyuanchen
fengyuanchen committed Jul 4, 2019
1 parent ddd0c3d commit aab2927
Show file tree
Hide file tree
Showing 12 changed files with 166 additions and 154 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## next
## 1.3.6 (Jul 4, 2019)

- Avoid using the `innerHTML` property for security (#269).
- Avoid escaping URLs (#298, #301).
Expand Down
33 changes: 21 additions & 12 deletions dist/viewer.common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Copyright 2015-present Chen Fengyuan
* Released under the MIT license
*
* Date: 2019-06-29T10:32:18.607Z
* Date: 2019-07-04T11:00:16.790Z
*/

'use strict';
Expand Down Expand Up @@ -959,25 +959,34 @@ var render = {
var element = this.element,
options = this.options,
list = this.list;
var items = '';
forEach(this.images, function (image, i) {
var src = escapeHTMLEntities(image.src);
var items = [];
forEach(this.images, function (image, index) {
var src = image.src;
var alt = escapeHTMLEntities(image.alt || getImageNameFromURL(src));
var url = options.url;

if (isString(url)) {
url = escapeHTMLEntities(image.getAttribute(url));
url = image.getAttribute(url);
} else if (isFunction(url)) {
url = escapeHTMLEntities(url.call(_this, image));
url = url.call(_this, image);
}

if (src || url) {
items += '<li>' + '<img' + " src=\"".concat(src || url, "\"") + ' role="button"' + ' data-viewer-action="view"' + " data-index=\"".concat(i, "\"") + " data-original-url=\"".concat(url || src, "\"") + " alt=\"".concat(alt, "\"") + '>' + '</li>';
var item = document.createElement('li');
var img = document.createElement('img');
img.src = src || url;
img.alt = alt;
img.setAttribute('data-index', index);
img.setAttribute('data-original-url', url || src);
img.setAttribute('data-viewer-action', 'view');
img.setAttribute('role', 'button');
item.appendChild(img);
list.appendChild(item);
items.push(item);
}
});
list.innerHTML = items;
this.items = list.getElementsByTagName('li');
forEach(this.items, function (item) {
this.items = items;
forEach(items, function (item) {
var image = item.firstElementChild;
setData(image, 'filled', true);

Expand Down Expand Up @@ -1784,7 +1793,7 @@ var methods = {
canvas = this.canvas;
var item = this.items[index];
var img = item.querySelector('img');
var url = escapeHTMLEntities(getData(img, 'originalUrl'));
var url = getData(img, 'originalUrl');
var alt = escapeHTMLEntities(img.getAttribute('alt'));
var image = document.createElement('img');
image.src = url;
Expand Down Expand Up @@ -2198,7 +2207,7 @@ var methods = {
forEach(this.items, function (item, i) {
var img = item.querySelector('img');
var image = document.createElement('img');
image.src = escapeHTMLEntities(getData(img, 'originalUrl'));
image.src = getData(img, 'originalUrl');
image.alt = escapeHTMLEntities(img.getAttribute('alt'));
total += 1;
addClass(image, CLASS_FADE);
Expand Down
2 changes: 1 addition & 1 deletion dist/viewer.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Copyright 2015-present Chen Fengyuan
* Released under the MIT license
*
* Date: 2019-06-29T10:32:15.670Z
* Date: 2019-07-04T11:00:13.705Z
*/

.viewer-zoom-in::before,
Expand Down
33 changes: 21 additions & 12 deletions dist/viewer.esm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Copyright 2015-present Chen Fengyuan
* Released under the MIT license
*
* Date: 2019-06-29T10:32:18.607Z
* Date: 2019-07-04T11:00:16.790Z
*/

function _typeof(obj) {
Expand Down Expand Up @@ -957,25 +957,34 @@ var render = {
var element = this.element,
options = this.options,
list = this.list;
var items = '';
forEach(this.images, function (image, i) {
var src = escapeHTMLEntities(image.src);
var items = [];
forEach(this.images, function (image, index) {
var src = image.src;
var alt = escapeHTMLEntities(image.alt || getImageNameFromURL(src));
var url = options.url;

if (isString(url)) {
url = escapeHTMLEntities(image.getAttribute(url));
url = image.getAttribute(url);
} else if (isFunction(url)) {
url = escapeHTMLEntities(url.call(_this, image));
url = url.call(_this, image);
}

if (src || url) {
items += '<li>' + '<img' + " src=\"".concat(src || url, "\"") + ' role="button"' + ' data-viewer-action="view"' + " data-index=\"".concat(i, "\"") + " data-original-url=\"".concat(url || src, "\"") + " alt=\"".concat(alt, "\"") + '>' + '</li>';
var item = document.createElement('li');
var img = document.createElement('img');
img.src = src || url;
img.alt = alt;
img.setAttribute('data-index', index);
img.setAttribute('data-original-url', url || src);
img.setAttribute('data-viewer-action', 'view');
img.setAttribute('role', 'button');
item.appendChild(img);
list.appendChild(item);
items.push(item);
}
});
list.innerHTML = items;
this.items = list.getElementsByTagName('li');
forEach(this.items, function (item) {
this.items = items;
forEach(items, function (item) {
var image = item.firstElementChild;
setData(image, 'filled', true);

Expand Down Expand Up @@ -1782,7 +1791,7 @@ var methods = {
canvas = this.canvas;
var item = this.items[index];
var img = item.querySelector('img');
var url = escapeHTMLEntities(getData(img, 'originalUrl'));
var url = getData(img, 'originalUrl');
var alt = escapeHTMLEntities(img.getAttribute('alt'));
var image = document.createElement('img');
image.src = url;
Expand Down Expand Up @@ -2196,7 +2205,7 @@ var methods = {
forEach(this.items, function (item, i) {
var img = item.querySelector('img');
var image = document.createElement('img');
image.src = escapeHTMLEntities(getData(img, 'originalUrl'));
image.src = getData(img, 'originalUrl');
image.alt = escapeHTMLEntities(img.getAttribute('alt'));
total += 1;
addClass(image, CLASS_FADE);
Expand Down
33 changes: 21 additions & 12 deletions dist/viewer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Copyright 2015-present Chen Fengyuan
* Released under the MIT license
*
* Date: 2019-06-29T10:32:18.607Z
* Date: 2019-07-04T11:00:16.790Z
*/

(function (global, factory) {
Expand Down Expand Up @@ -963,25 +963,34 @@
var element = this.element,
options = this.options,
list = this.list;
var items = '';
forEach(this.images, function (image, i) {
var src = escapeHTMLEntities(image.src);
var items = [];
forEach(this.images, function (image, index) {
var src = image.src;
var alt = escapeHTMLEntities(image.alt || getImageNameFromURL(src));
var url = options.url;

if (isString(url)) {
url = escapeHTMLEntities(image.getAttribute(url));
url = image.getAttribute(url);
} else if (isFunction(url)) {
url = escapeHTMLEntities(url.call(_this, image));
url = url.call(_this, image);
}

if (src || url) {
items += '<li>' + '<img' + " src=\"".concat(src || url, "\"") + ' role="button"' + ' data-viewer-action="view"' + " data-index=\"".concat(i, "\"") + " data-original-url=\"".concat(url || src, "\"") + " alt=\"".concat(alt, "\"") + '>' + '</li>';
var item = document.createElement('li');
var img = document.createElement('img');
img.src = src || url;
img.alt = alt;
img.setAttribute('data-index', index);
img.setAttribute('data-original-url', url || src);
img.setAttribute('data-viewer-action', 'view');
img.setAttribute('role', 'button');
item.appendChild(img);
list.appendChild(item);
items.push(item);
}
});
list.innerHTML = items;
this.items = list.getElementsByTagName('li');
forEach(this.items, function (item) {
this.items = items;
forEach(items, function (item) {
var image = item.firstElementChild;
setData(image, 'filled', true);

Expand Down Expand Up @@ -1788,7 +1797,7 @@
canvas = this.canvas;
var item = this.items[index];
var img = item.querySelector('img');
var url = escapeHTMLEntities(getData(img, 'originalUrl'));
var url = getData(img, 'originalUrl');
var alt = escapeHTMLEntities(img.getAttribute('alt'));
var image = document.createElement('img');
image.src = url;
Expand Down Expand Up @@ -2202,7 +2211,7 @@
forEach(this.items, function (item, i) {
var img = item.querySelector('img');
var image = document.createElement('img');
image.src = escapeHTMLEntities(getData(img, 'originalUrl'));
image.src = getData(img, 'originalUrl');
image.alt = escapeHTMLEntities(img.getAttribute('alt'));
total += 1;
addClass(image, CLASS_FADE);
Expand Down
2 changes: 1 addition & 1 deletion dist/viewer.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/viewer.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/css/viewer.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Copyright 2015-present Chen Fengyuan
* Released under the MIT license
*
* Date: 2019-06-29T10:32:15.670Z
* Date: 2019-07-04T11:00:13.705Z
*/

.viewer-zoom-in::before,
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<div class="container">
<div class="row">
<div class="col-md">
<h1>Viewer.js <small class="h6">v1.3.5</small></h1>
<h1>Viewer.js <small class="h6">v1.3.6</small></h1>
<p class="lead">JavaScript image viewer.</p>
</div>
<div class="col-md">
Expand Down
33 changes: 21 additions & 12 deletions docs/js/viewer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Copyright 2015-present Chen Fengyuan
* Released under the MIT license
*
* Date: 2019-06-29T10:32:18.607Z
* Date: 2019-07-04T11:00:16.790Z
*/

(function (global, factory) {
Expand Down Expand Up @@ -963,25 +963,34 @@
var element = this.element,
options = this.options,
list = this.list;
var items = '';
forEach(this.images, function (image, i) {
var src = escapeHTMLEntities(image.src);
var items = [];
forEach(this.images, function (image, index) {
var src = image.src;
var alt = escapeHTMLEntities(image.alt || getImageNameFromURL(src));
var url = options.url;

if (isString(url)) {
url = escapeHTMLEntities(image.getAttribute(url));
url = image.getAttribute(url);
} else if (isFunction(url)) {
url = escapeHTMLEntities(url.call(_this, image));
url = url.call(_this, image);
}

if (src || url) {
items += '<li>' + '<img' + " src=\"".concat(src || url, "\"") + ' role="button"' + ' data-viewer-action="view"' + " data-index=\"".concat(i, "\"") + " data-original-url=\"".concat(url || src, "\"") + " alt=\"".concat(alt, "\"") + '>' + '</li>';
var item = document.createElement('li');
var img = document.createElement('img');
img.src = src || url;
img.alt = alt;
img.setAttribute('data-index', index);
img.setAttribute('data-original-url', url || src);
img.setAttribute('data-viewer-action', 'view');
img.setAttribute('role', 'button');
item.appendChild(img);
list.appendChild(item);
items.push(item);
}
});
list.innerHTML = items;
this.items = list.getElementsByTagName('li');
forEach(this.items, function (item) {
this.items = items;
forEach(items, function (item) {
var image = item.firstElementChild;
setData(image, 'filled', true);

Expand Down Expand Up @@ -1788,7 +1797,7 @@
canvas = this.canvas;
var item = this.items[index];
var img = item.querySelector('img');
var url = escapeHTMLEntities(getData(img, 'originalUrl'));
var url = getData(img, 'originalUrl');
var alt = escapeHTMLEntities(img.getAttribute('alt'));
var image = document.createElement('img');
image.src = url;
Expand Down Expand Up @@ -2202,7 +2211,7 @@
forEach(this.items, function (item, i) {
var img = item.querySelector('img');
var image = document.createElement('img');
image.src = escapeHTMLEntities(getData(img, 'originalUrl'));
image.src = getData(img, 'originalUrl');
image.alt = escapeHTMLEntities(img.getAttribute('alt'));
total += 1;
addClass(image, CLASS_FADE);
Expand Down
Loading

0 comments on commit aab2927

Please sign in to comment.