Popup close buttons can take a URL.
This commit is contained in:
+25
-394
@@ -709,36 +709,6 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="DeepZoomMapGeoMap">
|
||||
<span class="title ">
|
||||
|
||||
|
||||
<a href="DeepZoomMapGeoMap.html">DeepZoomMapGeoMap</a>
|
||||
|
||||
</span>
|
||||
|
||||
<ul class="members itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="methods itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="events itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="DeepZoomMapProjection">
|
||||
<span class="title ">
|
||||
|
||||
@@ -783,36 +753,6 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="DeepZoomMapProjectionMapProjection">
|
||||
<span class="title ">
|
||||
|
||||
|
||||
<a href="DeepZoomMapProjectionMapProjection.html">DeepZoomMapProjectionMapProjection</a>
|
||||
|
||||
</span>
|
||||
|
||||
<ul class="members itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="methods itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="events itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="EventHandler">
|
||||
<span class="title ">
|
||||
|
||||
@@ -1695,36 +1635,6 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="ImageMapGeoMap">
|
||||
<span class="title ">
|
||||
|
||||
|
||||
<a href="ImageMapGeoMap.html">ImageMapGeoMap</a>
|
||||
|
||||
</span>
|
||||
|
||||
<ul class="members itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="methods itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="events itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="InteractivePopup">
|
||||
<span class="title ">
|
||||
|
||||
@@ -2319,66 +2229,6 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="MessageInteractivePopup">
|
||||
<span class="title ">
|
||||
|
||||
|
||||
<a href="MessageInteractivePopup.html">MessageInteractivePopup</a>
|
||||
|
||||
</span>
|
||||
|
||||
<ul class="members itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="methods itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="events itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="MessageMessageInteractivePopup">
|
||||
<span class="title ">
|
||||
|
||||
|
||||
<a href="MessageMessageInteractivePopup.html">MessageMessageInteractivePopup</a>
|
||||
|
||||
</span>
|
||||
|
||||
<ul class="members itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="methods itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="events itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="Modal">
|
||||
<span class="title ">
|
||||
|
||||
@@ -2423,66 +2273,6 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="ModalInteractivePopup">
|
||||
<span class="title ">
|
||||
|
||||
|
||||
<a href="ModalInteractivePopup.html">ModalInteractivePopup</a>
|
||||
|
||||
</span>
|
||||
|
||||
<ul class="members itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="methods itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="events itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="ModalModalInteractivePopup">
|
||||
<span class="title ">
|
||||
|
||||
|
||||
<a href="ModalModalInteractivePopup.html">ModalModalInteractivePopup</a>
|
||||
|
||||
</span>
|
||||
|
||||
<ul class="members itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="methods itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="events itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="Overlay">
|
||||
<span class="title ">
|
||||
|
||||
@@ -2661,36 +2451,6 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="PopupInteractivePopup">
|
||||
<span class="title ">
|
||||
|
||||
|
||||
<a href="PopupInteractivePopup.html">PopupInteractivePopup</a>
|
||||
|
||||
</span>
|
||||
|
||||
<ul class="members itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="methods itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="events itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="PopupMenu">
|
||||
<span class="title ">
|
||||
|
||||
@@ -2735,156 +2495,6 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="PopupMenuPopupInteractivePopup">
|
||||
<span class="title ">
|
||||
|
||||
|
||||
<a href="PopupMenuPopupInteractivePopup.html">PopupMenuPopupInteractivePopup</a>
|
||||
|
||||
</span>
|
||||
|
||||
<ul class="members itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="methods itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="events itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="PopupMenuPopupMenuPopupInteractivePopup">
|
||||
<span class="title ">
|
||||
|
||||
|
||||
<a href="PopupMenuPopupMenuPopupInteractivePopup.html">PopupMenuPopupMenuPopupInteractivePopup</a>
|
||||
|
||||
</span>
|
||||
|
||||
<ul class="members itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="methods itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="events itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="PopupMenuPopupMenuPopupPopupInteractivePopup">
|
||||
<span class="title ">
|
||||
|
||||
|
||||
<a href="PopupMenuPopupMenuPopupPopupInteractivePopup.html">PopupMenuPopupMenuPopupPopupInteractivePopup</a>
|
||||
|
||||
</span>
|
||||
|
||||
<ul class="members itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="methods itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="events itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="PopupMenuPopupPopupInteractivePopup">
|
||||
<span class="title ">
|
||||
|
||||
|
||||
<a href="PopupMenuPopupPopupInteractivePopup.html">PopupMenuPopupPopupInteractivePopup</a>
|
||||
|
||||
</span>
|
||||
|
||||
<ul class="members itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="methods itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="events itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="PopupPopupInteractivePopup">
|
||||
<span class="title ">
|
||||
|
||||
|
||||
<a href="PopupPopupInteractivePopup.html">PopupPopupInteractivePopup</a>
|
||||
|
||||
</span>
|
||||
|
||||
<ul class="members itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="typedefs itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="methods itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
<ul class="events itemMembers">
|
||||
|
||||
</ul>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="item" data-name="Progress">
|
||||
<span class="title ">
|
||||
|
||||
@@ -3441,7 +3051,7 @@ export class InteractivePopup extends AbstractPopup {
|
||||
* @constructor
|
||||
* @param {object} [opts] - An options object to specify to style and behaviour of the popup.
|
||||
* @param {boolean} [opts.closeOnPopup=false] - Should the popup be closed when the user clicks on the popup?
|
||||
* @param {boolean} [opts.closeButton=true] - Should a close button be displayed on the upper right corner?
|
||||
* @param {boolean|string} [opts.closeButton=true] - Should a close button be displayed on the upper right corner? Alternatively, a URL to the image can be specified.
|
||||
* @param {object} [opts.button] - A Button object to be display on the lower right corner.
|
||||
* @param {object} [opts.buttonGroup] - A ButtonGroup object to be displayed on the lower right corner.
|
||||
*/
|
||||
@@ -3496,7 +3106,16 @@ export class InteractivePopup extends AbstractPopup {
|
||||
// closeButton
|
||||
//-----------------
|
||||
if (this.opts.closeButton) {
|
||||
let closeButton = PIXI.Sprite.from('../../assets/icons/close.png')
|
||||
let url = null
|
||||
if (typeof this.opts.closeButton === 'string' || this.opts.closeButton instanceof String) {
|
||||
url = InteractivePopup.iconIsUrl(this.opts.closeButton)
|
||||
? this.opts.closeButton
|
||||
: `../../assets/icons/${this.opts.closeButton}.png`
|
||||
} else {
|
||||
url = '../../assets/icons/close.png'
|
||||
}
|
||||
|
||||
let closeButton = PIXI.Sprite.from(url)
|
||||
closeButton.width = this.headerStyle.fontSize
|
||||
closeButton.height = closeButton.width
|
||||
closeButton.tint = this.theme.color2
|
||||
@@ -3595,6 +3214,18 @@ export class InteractivePopup extends AbstractPopup {
|
||||
|
||||
return size
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests if an icon string is an url.
|
||||
*
|
||||
* @private
|
||||
* @static
|
||||
* @param {string} url - The url to test.
|
||||
* @return {boolean} true if the url is an url to an image.
|
||||
*/
|
||||
static iconIsUrl(url) {
|
||||
return /\.(png|svg|gif|jpg|jpeg|tif|tiff)$/i.test(url)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -3620,7 +3251,7 @@ export default class Popup extends InteractivePopup {
|
||||
*
|
||||
* @constructor
|
||||
* @param {object} [opts] - An options object to specify to style and behaviour of the popup.
|
||||
* @param {boolean} [opts.closeButton=false] - Should a close button be displayed on the upper right corner?
|
||||
* @param {boolean|string} [opts.closeButton=false] - Should a close button be displayed on the upper right corner? Alternatively, a URL to the image can be specified.
|
||||
* @param {number} [opts.minWidth=0] - The minimum width of the popup.
|
||||
* @param {number} [opts.minHeight=0] - The minimum height of the popup.
|
||||
*/
|
||||
@@ -3651,7 +3282,7 @@ export default class Popup extends InteractivePopup {
|
||||
|
||||
<footer class="content-size">
|
||||
<div class="footer">
|
||||
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Mon Jan 20 2020 11:33:21 GMT+0100 (Mitteleuropäische Normalzeit)
|
||||
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Wed Feb 24 2021 16:12:36 GMT+0100 (Mitteleuropäische Normalzeit)
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user