Skip to content

Commit e208f15

Browse files
author
Peter Rushforth
committed
Fix a few small issues with map-tile attributes
Clean up map-feature connectedCallback (remove unused bind)
1 parent 2642053 commit e208f15

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/map-feature.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ export class HTMLFeatureElement extends HTMLElement {
166166
constructor() {
167167
// Always call super first in constructor
168168
super();
169-
this._calculatePosition = calculatePosition.bind(this);
170169
}
171170

172171
connectedCallback() {

src/map-tile.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,41 @@ export class HTMLTileElement extends HTMLElement {
1818
/* jshint ignore:end */
1919
get row() {
2020
/* jshint ignore:start */
21-
return +this.#initialRow;
21+
return this.#hasConnected ? +this.#initialRow : +this.getAttribute('row');
2222
/* jshint ignore:end */
2323
}
2424
set row(val) {
25+
/* jshint ignore:start */
26+
if (this.#hasConnected) return; // Ignore after connection
27+
/* jshint ignore:end */
2528
var parsedVal = parseInt(val, 10);
2629
if (!isNaN(parsedVal)) {
2730
this.setAttribute('row', parsedVal);
2831
}
2932
}
3033
get col() {
3134
/* jshint ignore:start */
32-
return +this.#initialCol;
35+
return this.#hasConnected ? +this.#initialCol : +this.getAttribute('col');;
3336
/* jshint ignore:end */
3437
}
3538
set col(val) {
39+
/* jshint ignore:start */
40+
if (this.#hasConnected) return; // Ignore after connection
41+
/* jshint ignore:end */
3642
var parsedVal = parseInt(val, 10);
3743
if (!isNaN(parsedVal)) {
3844
this.setAttribute('col', parsedVal);
3945
}
4046
}
4147
get zoom() {
4248
/* jshint ignore:start */
43-
return this.#initialZoom;
49+
return this.#hasConnected ? +this.#initialZoom : +this.getAttribute('zoom');;
4450
/* jshint ignore:end */
4551
}
4652
set zoom(val) {
53+
/* jshint ignore:start */
54+
if (this.#hasConnected) return; // Ignore after connection
55+
/* jshint ignore:end */
4756
var parsedVal = parseInt(val, 10);
4857
if (!isNaN(parsedVal) && parsedVal >= 0 && parsedVal <= 25) {
4958
this.setAttribute('zoom', parsedVal);
@@ -75,13 +84,10 @@ export class HTMLTileElement extends HTMLElement {
7584
switch (name) {
7685
case 'row':
7786
return String(this.#initialRow); /* jshint ignore:line */
78-
break;
7987
case 'col':
8088
return String(this.#initialCol); /* jshint ignore:line */
81-
break;
8289
case 'zoom':
8390
return String(this.#initialZoom); /* jshint ignore:line */
84-
break;
8591
}
8692
}
8793
return super.getAttribute(name);

0 commit comments

Comments
 (0)