Skip to content

Commit 13fe38d

Browse files
committed
v2.0.1 - cleanup/simplify "handleImageLoad" logic
1 parent cd709a8 commit 13fe38d

File tree

6 files changed

+15
-19
lines changed

6 files changed

+15
-19
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "image-map",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"author": {
55
"name": "Travis Clarke",
66
"email": "[email protected]",

dist/image-map.es.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function _createClass(Constructor, protoProps, staticProps) {
2727
return Constructor;
2828
}
2929

30-
var version = "2.0.0";
30+
var version = "2.0.1";
3131

3232
var RESIZE = "resize";
3333
var LOAD = "load";
@@ -108,8 +108,6 @@ var ImageMap = /*#__PURE__*/function () {
108108
return function (e) {
109109
var w = e.target.width;
110110
var h = e.target.height;
111-
var wPercent = offsetWidth / 100;
112-
var hPercent = offsetHeight / 100;
113111
var mapName = e.target.getAttribute(USEMAP).replace(/^#/, "");
114112
var areas = document.querySelectorAll(ImageMap.genAreaSelector(mapName));
115113

@@ -118,7 +116,8 @@ var ImageMap = /*#__PURE__*/function () {
118116
var coordsString = area.dataset[COORDS] = area.dataset[COORDS] || area.getAttribute(COORDS);
119117
var coordsArrayOld = coordsString.split(",");
120118
var coordsArrayNew = coordsArrayOld.map(function (_, i) {
121-
return i % 2 === 0 ? Number(coordsArrayOld[i] / w * 100 * wPercent) : Number(coordsArrayOld[i] / h * 100 * hPercent);
119+
// Scale the coordinate from the original width/height to the actual rendered width/height (i.e. offset)
120+
return i % 2 === 0 ? Number(coordsArrayOld[i] / w * offsetWidth) : Number(coordsArrayOld[i] / h * offsetHeight);
122121
});
123122
area.setAttribute(COORDS, coordsArrayNew.toString());
124123
};

dist/image-map.jquery.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
return Constructor;
3333
}
3434

35-
var version = "2.0.0";
35+
var version = "2.0.1";
3636

3737
var RESIZE = "resize";
3838
var LOAD = "load";
@@ -113,8 +113,6 @@
113113
return function (e) {
114114
var w = e.target.width;
115115
var h = e.target.height;
116-
var wPercent = offsetWidth / 100;
117-
var hPercent = offsetHeight / 100;
118116
var mapName = e.target.getAttribute(USEMAP).replace(/^#/, "");
119117
var areas = document.querySelectorAll(ImageMap.genAreaSelector(mapName));
120118

@@ -123,7 +121,8 @@
123121
var coordsString = area.dataset[COORDS] = area.dataset[COORDS] || area.getAttribute(COORDS);
124122
var coordsArrayOld = coordsString.split(",");
125123
var coordsArrayNew = coordsArrayOld.map(function (_, i) {
126-
return i % 2 === 0 ? Number(coordsArrayOld[i] / w * 100 * wPercent) : Number(coordsArrayOld[i] / h * 100 * hPercent);
124+
// Scale the coordinate from the original width/height to the actual rendered width/height (i.e. offset)
125+
return i % 2 === 0 ? Number(coordsArrayOld[i] / w * offsetWidth) : Number(coordsArrayOld[i] / h * offsetHeight);
127126
});
128127
area.setAttribute(COORDS, coordsArrayNew.toString());
129128
};

dist/image-map.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
return Constructor;
3434
}
3535

36-
var version = "2.0.0";
36+
var version = "2.0.1";
3737

3838
var RESIZE = "resize";
3939
var LOAD = "load";
@@ -114,8 +114,6 @@
114114
return function (e) {
115115
var w = e.target.width;
116116
var h = e.target.height;
117-
var wPercent = offsetWidth / 100;
118-
var hPercent = offsetHeight / 100;
119117
var mapName = e.target.getAttribute(USEMAP).replace(/^#/, "");
120118
var areas = document.querySelectorAll(ImageMap.genAreaSelector(mapName));
121119

@@ -124,7 +122,8 @@
124122
var coordsString = area.dataset[COORDS] = area.dataset[COORDS] || area.getAttribute(COORDS);
125123
var coordsArrayOld = coordsString.split(",");
126124
var coordsArrayNew = coordsArrayOld.map(function (_, i) {
127-
return i % 2 === 0 ? Number(coordsArrayOld[i] / w * 100 * wPercent) : Number(coordsArrayOld[i] / h * 100 * hPercent);
125+
// Scale the coordinate from the original width/height to the actual rendered width/height (i.e. offset)
126+
return i % 2 === 0 ? Number(coordsArrayOld[i] / w * offsetWidth) : Number(coordsArrayOld[i] / h * offsetHeight);
128127
});
129128
area.setAttribute(COORDS, coordsArrayNew.toString());
130129
};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "image-map",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"description": "Response, dynamic image maps",
55
"main": "dist/image-map.js",
66
"module": "dist/image-map.es.js",

src/image-map.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ class ImageMap {
6565
return e => {
6666
const w = e.target.width;
6767
const h = e.target.height;
68-
const wPercent = offsetWidth / 100;
69-
const hPercent = offsetHeight / 100;
7068
const mapName = e.target.getAttribute(USEMAP).replace(/^#/, "");
7169

7270
const areas = document.querySelectorAll(ImageMap.genAreaSelector(mapName));
@@ -75,9 +73,10 @@ class ImageMap {
7573

7674
const coordsString = (area.dataset[COORDS] = area.dataset[COORDS] || area.getAttribute(COORDS));
7775
const coordsArrayOld = coordsString.split(",");
78-
const coordsArrayNew = coordsArrayOld.map((_, i) =>
79-
i % 2 === 0 ? Number((coordsArrayOld[i] / w) * 100 * wPercent) : Number((coordsArrayOld[i] / h) * 100 * hPercent)
80-
);
76+
const coordsArrayNew = coordsArrayOld.map((_, i) => {
77+
// Scale the coordinate from the original width/height to the actual rendered width/height (i.e. offset)
78+
return i % 2 === 0 ? Number((coordsArrayOld[i] / w) * offsetWidth) : Number((coordsArrayOld[i] / h) * offsetHeight);
79+
});
8180
area.setAttribute(COORDS, coordsArrayNew.toString());
8281
}
8382
};

0 commit comments

Comments
 (0)