Fixes for bubble onclick

jhartz · Apr 7, 2016 · f38e534 · f38e534
1 parent 82f1a56
commit f38e534
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Prototype_v1/scripts/map.js b/Prototype_v1/scripts/map.js
@@ -39,7 +39,7 @@ var MAX_RADIUS = 50;
  * @property {Function} makeDescription - A function that is passed in the data
  *           and returns an HTML description of the location.
  *
- * @property {Function} makeUrl - A function that is passed in the data and
+ * @property {Function} makeLink - A function that is passed in the data and
  *           returns a URL to go to when the bubble is clicked (if applicable).
  */
 
@@ -99,14 +99,14 @@ function initMap(config) {
                     document.querySelector("#zoom-info"));
 
             // Set up onclick
-            if (typeof config.makeUrl == "function") {
+            if (typeof config.makeLink == "function") {
                 // TODO: Is there a better way to do this?
                 map.svg[0][0].addEventListener("click", function (event) {
                     if (event.target.tagName.toLowerCase() == "circle") {
                         console.log("Item clicked: ", event.target);
                         var data = event.target.__data__;
-                        if (data && data.url) {
-                            window.open(data.url, "_blank");
+                        if (data && data.link) {
+                            window.open(data.link, "_blank");
                         }
                     }
                 }, false);
@@ -251,11 +251,11 @@ Location.prototype.getScaledRadius = function () {
  * @return {Object} The object, ready to be passed to D3 Datamap.
  */
 Location.prototype.getD3Object = function () {
-    var makeUrl = this.config.makeUrl;
+    var makeLink = this.config.makeLink;
     var data = {
         name: this.name,
         htmlDescription: this.config.makeDescription(this.data),
-        url: typeof makeUrl == "function" ? makeUrl(this.data) : null,
+        link: typeof makeLink == "function" ? makeLink(this.data) : null,
         radius: this.getScaledRadius(),
         fillKey: this.fillKey
     };

diff --git a/Prototype_v1/scripts/social-media.js b/Prototype_v1/scripts/social-media.js
@@ -72,14 +72,14 @@ var SOCIAL_MEDIA_CONFIG = {
         ]);
 
         if (data.url) {
-            desc += '<p><a href="' + escapeHTML(data.url) + '" target="_blank">Link</a></p>';
+            desc += '<p><a href="' + escapeHTML(data.url) + '" target="_blank">' + escapeHTML(data.url) + '</a></p>';
         }
 
         return desc;
     },
 
 
-    makeUrl: function (data) {
+    makeLink: function (data) {
         if (data.url) {
             return data.url;
         }