Bump for dynamic logo PR

slight tidy and add to README
3 years ago · 8aa754132a
parent e5e0046b82
commit 8aa754132a
4 changed files with 8 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,6 @@
 ### Change Log for Node-RED Worldmap

+ - v2.23.0 - Give logo and id so it can be overridden by toplogo command. PR #188.
 - v2.22.3 - Don't show empty popup for geojson object. Issue #186. Add wobble to null island.
 - v2.22.2 - Be more tolerant of speed string types
 - v2.22.0 - Separate out layer events in worldmap in
--- a/README.md
+++ b/README.md
@ -11,6 +11,7 @@ map web page for plotting "things" on.

 ### Updates

+- v2.23.0 - Give logo and id so it can be overridden by toplogo command. PR #188.
 - v2.22.3 - Don't show empty popup for geojson object. Issue #186. Add wobble to null island.
 - v2.22.2 - Be more tolerant of speed string types
 - v2.22.0 - Separate out layer events in worldmap in
@ -413,6 +414,8 @@ Optional properties include
 - **button** - if supplied with a `name` and `icon` property - adds a button to provide user input - sends
 a msg `{"action":"button", "name":"the_button_name"}` to the worldmap in node. If supplied with a `name` property only, it will remove the button. Optional `position` property can be 'bottomright', 'bottomleft', 'topleft' or 'topright' (default).
 - **contextmenu** - html string to define the right click menu when not on a marker. Defaults to the simple add marker input. Empty string `""` disables this right click.
+ - **toptitle** - Words to replace title in title bar (if not in iframe)
+ - **toplogo** - URL to logo image for top tile bar (if not in iframe) - ideally 60px by 24px.

 #### To switch layer, move map and zoom

--- a/worldmap/index.html
+++ b/worldmap/index.html
@ -80,7 +80,7 @@

 <body>
 <div id="topbar">
-    <a href="https://nodered.org"><img id="toplogo" src="images/node-red.png" width="60" height="24" alt="NRed"/></a>
+    <a href="https://nodered.org" id="toplink"><img id="toplogo" src="images/node-red.png" style="max-width:60px; height:24px; margin-top:-3px" alt="NRed"/></a>
    <span class="topbar" id="topwords"> Node-RED - map all the things</span>
 </div>
 <div id="results">
--- a/worldmap/worldmap.js
+++ b/worldmap/worldmap.js
@ -2075,9 +2075,10 @@ function doCommand(cmd) {
    }
    if (cmd.hasOwnProperty("toplogo")) {
        if (!inIframe ) {
-             document.getElementById("toplogo").src = cmd.toplogo;
+            document.getElementById("toplogo").src = cmd.toplogo;
+            document.getElementById("toplink").setAttribute("style", "pointer-events:none");
        }
-    }	    
+    }
    if (cmd.hasOwnProperty("clear")) {
        doTidyUp(cmd.clear);
    }