Skip to content

Commit 8b3a045

Browse files
authored
Merge pull request #67 from MapGIS/branch-for-cesium
1.修改popup样式;
2 parents a816b14 + cd8707a commit 8b3a045

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/cesiumjs/manager/PopupController.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ export default class PopupController extends BaseLayer {
8686
const randID = CommonFuncManager.generateRandom();
8787
const rootContentDiv = document.createElement('div');
8888
rootContentDiv.setAttribute('id', `popup_${randID}`);
89-
rootContentDiv.setAttribute('class', 'cesium-popup');
89+
rootContentDiv.setAttribute('class', 'mapgis-popup');
9090
rootContentDiv.setAttribute('style', 'top:5px;left:0;');
9191
const closeDiv = document.createElement('a');
92-
closeDiv.setAttribute('class', 'cesium-popup-close-button');
92+
closeDiv.setAttribute('class', 'mapgis-popup-close-button');
9393
// closeDiv.setAttribute('href', '#');
9494
closeDiv.innerHTML = '×';
9595
const webControl = this;
@@ -101,18 +101,18 @@ export default class PopupController extends BaseLayer {
101101
rootContentDiv.appendChild(closeDiv);
102102

103103
const contentDiv = document.createElement('div');
104-
contentDiv.setAttribute('class', 'cesium-popup-content-wrapper');
104+
contentDiv.setAttribute('class', 'mapgis-popup-content-wrapper');
105105
const contentLinkDiv = document.createElement('div');
106-
contentLinkDiv.setAttribute('class', 'cesium-popup-content');
106+
contentLinkDiv.setAttribute('class', 'mapgis-popup-content');
107107
contentLinkDiv.setAttribute('style', 'max-width: 300px;');
108108
contentLinkDiv.innerHTML = content;
109109
contentDiv.appendChild(contentLinkDiv);
110110
rootContentDiv.appendChild(contentDiv);
111111

112112
const tipContainDiv = document.createElement('div');
113-
tipContainDiv.setAttribute('class', 'cesium-popup-tip-container');
113+
tipContainDiv.setAttribute('class', 'mapgis-popup-tip-container');
114114
const tipDiv = document.createElement('div');
115-
tipDiv.setAttribute('class', 'cesium-popup-tip');
115+
tipDiv.setAttribute('class', 'mapgis-popup-tip');
116116
tipContainDiv.appendChild(tipDiv);
117117
rootContentDiv.appendChild(tipContainDiv);
118118

@@ -274,15 +274,15 @@ export default class PopupController extends BaseLayer {
274274
if (removeDiv && popDiv.parentNode !== null) {
275275
popDiv.parentNode.removeChild(popDiv);
276276
}
277-
if (owner.popupContain !== null && owner.popupContain.length > 0) {
277+
if (Cesium.defined(owner.popupContain) && owner.popupContain.length > 0) {
278278
for (let i = 0, n = 0; i < owner.popupContain.length; i += 1) {
279279
if (owner.popupContain[i].id !== popID) {
280280
owner.popupContain[(n += 1)] = owner.popupContain[i];
281281
}
282282
}
283283
owner.popupContain.length -= 1;
284284
}
285-
if (owner.popupContain.length <= 0) {
285+
if (Cesium.defined(owner.popupContain) && owner.popupContain.length <= 0) {
286286
owner.viewer.camera.percentageChanged = 0.5;
287287
owner.viewer.camera.changed.removeEventListener(this.updatePopups, this);
288288
}

0 commit comments

Comments
 (0)