jekyll-maps 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e26fa740a142e97113f43ab66748b40750dfaf4d8b33f84cb1ff43d20a827ea5
-  data.tar.gz: 70eac67645b3e5a4cc59075382a5d86620bd74e92e30346255411db432b45a88
+  metadata.gz: e1f7764e330ca8398f9b8ac424b3ab6dafa38d6bd0a8b91f39f1f8dc85fef981
+  data.tar.gz: 699cdb8682423e5508a5aa4fed846c6017a2a4b1fecc6878c9de369d1392a521
 SHA512:
-  metadata.gz: 9ec488a7c7638c64a6cb07c8d93aba74a62168d3c0afe23f981cf0ee13082105b874de1cdd34e61da356fe4a9c7761ea79002d45a3621163d7447fa03e45af4f
-  data.tar.gz: 76232fd2b19eb1f942fdb4a78ff3ebdcbfcdfbee5d3d06974c5ecd470b9c1caa6607eff6eee22429eca172813a796f395c16badfcd80384ef1c1e48242e84ac0
+  metadata.gz: 88ff121fe971e8676931c22bfb1610d70aeb93023dbc9e216fd975fa6331eed665fccb26726f538001557e5cb32e5069b376ddb7a34655f88e8fc3ccbeacca43
+  data.tar.gz: 1ae331ad6d9afa9689e5ba27a8dcc778289cef50ee339bbd4a0cf9c8051ab1048c2c6713bf6c423c6fa3012cc1d6ffb6c89da5154e12e496aab2312895b474c1

data/.gitignore

@@ -7,3 +7,4 @@ coverage
 _site
 node_modules
 .DS_store
+.#*

data/History.md

@@ -1,3 +1,8 @@
+## 2.3.0 / 2018-03-17
+
+* customize popup link text (#34)
+* do not use page url for multiple on page locations (#33)
+
 ## 2.2.0 / 2018-03-07
 
 * implement custom marker icon (#30)

data/lib/jekyll-maps/google_map_api.js

@@ -79,6 +79,7 @@ var jekyllMaps = (function() {
         position: position,
         title: location.title,
         image: location.image,
+        popup_html: location.popup_html,
         icon: location.icon || mapOptions.markerIcon,
         url: markerUrl(mapOptions.baseUrl, location.url),
         url_text: location.url_text,
@@ -97,14 +98,19 @@ var jekyllMaps = (function() {
 
     function markerPopup() {
       var content = '<div class="map-info-window"><h5>' + this.title + '</h5>'
-      var imageTag =
-        this.image.length > 0 &&
-        '<img src="' + this.image + '" alt="' + this.title + '"/>'
-      if (this.url.length > 0) {
-        var linkContent = imageTag || this.url_text || 'View'
-        content += '<a href="' + this.url + '">' + linkContent + '</a>'
-      } else if (imageTag) {
-        content += imageTag
+      if (this.popup_html.length > 0) {
+        content += this.popup_html
+      }
+      else {
+        var imageTag =
+          this.image.length > 0 &&
+          '<img src="' + this.image + '" alt="' + this.title + '"/>'
+        if (this.url.length > 0) {
+          var linkContent = imageTag || this.url_text || 'View'
+          content += '<a href="' + this.url + '">' + linkContent + '</a>'
+        } else if (imageTag) {
+          content += imageTag
+        }
       }
       content += '</div>'
       infoWindow.setContent(content)

data/lib/jekyll-maps/location_finder.rb

@@ -22,12 +22,13 @@ module Jekyll
       private
       def location_from_options(page)
         {
-          :latitude  => @options[:attributes][:latitude],
-          :longitude => @options[:attributes][:longitude],
-          :title     => @options[:attributes][:marker_title] || page["title"],
-          :icon      => @options[:attributes][:marker_icon] || page["marker_icon"],
-          :url       => @options[:attributes][:marker_url] || fetch_url(page),
-          :image     => @options[:attributes][:marker_img] || page["image"] || ""
+          :latitude   => @options[:attributes][:latitude],
+          :longitude  => @options[:attributes][:longitude],
+          :title      => @options[:attributes][:marker_title] || page["title"],
+          :icon       => @options[:attributes][:marker_icon] || page["marker_icon"],
+          :url        => @options[:attributes][:marker_url] || fetch_url(page),
+          :image      => @options[:attributes][:marker_img] || page["image"] || "",
+          :popup_html => @options[:attributes][:marker_popup_html] || ""
         }
       end
 
@@ -75,12 +76,14 @@ module Jekyll
       def match_filters?(doc)
         @options[:filters].each do |filter, value|
           if filter == "src"
-            return true unless doc.respond_to?(:relative_path)
-            return false unless doc.relative_path.start_with?(value)
+            if doc.respond_to?(:relative_path)
+              return false unless doc.relative_path.start_with?(value)
+            end
           elsif doc[filter].nil? || doc[filter] != value
             return false
           end
         end
+        return true
       end
 
       private
@@ -103,13 +106,15 @@ module Jekyll
       private
       def convert(document, location)
         {
-          :latitude  => location["latitude"],
-          :longitude => location["longitude"],
-          :title     => location["title"] || document["title"],
-          :icon      => location["marker_icon"] || document["marker_icon"],
-          :url       => location["url"] || fetch_url(document),
-          :url_text  => location["url_text"],
-          :image     => location["image"] || document["image"] || ""
+          :latitude   => location["latitude"],
+          :longitude  => location["longitude"],
+          :title      => location["title"] || document["title"],
+          :icon       => location["marker_icon"] || document["marker_icon"],
+          :url        => location["url"] || fetch_url(document),
+          :url_text   => location["url_text"],
+          :image      => location["image"] || document["image"] || "",
+          :popup_html => location["marker_popup_html"] \
+                         || document["marker_popup_html"] || ""
         }
       end
 

data/lib/jekyll-maps/options_parser.rb

@@ -19,6 +19,7 @@ module Jekyll
         marker_icon
         marker_img
         marker_url
+        marker_popup_html
       ).freeze
 
       class << self

data/lib/jekyll-maps/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Maps
-    VERSION = "2.3.0".freeze
+    VERSION = "2.3.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-maps
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Anatoliy Yastreb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-17 00:00:00.000000000 Z
+date: 2019-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Jekyll Google Maps integration