jekyll-maps 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f78a665bd5372843570e3b7ce2fdc259372d3b42
-  data.tar.gz: ab275cb5b36e62a4486ee46dd4497b8b8cdd26a9
+  metadata.gz: e1a432ee547d3a2d9f4b6ae0b2e22c848b39014a
+  data.tar.gz: 9d6697299c275ac9e41dd50255621d4447d52c78
 SHA512:
-  metadata.gz: e76302ce186d29bb54201505f164da6883bb09e6ca0765a89fe3bfee79f97114d46cfcc643159cc1ef080b92297190c95118ab3a541976f00b5c8cd82431e2da
-  data.tar.gz: b58410fca8011e807fe11f1f433e97d5a3f4a2fa20f3fc91fbe2e8c35857d8cd146a5db8423eceaf7c85ed815514deff1a1cda324de6927237f46bae023d498e
+  metadata.gz: 8ca56f5cb9c366f96e6dfe82122eb01c7a353db4c06dfbecd25b7223d320621d78b5f0856f79d8cdde12a5d7f7560e465eca0ae5191f3af8a34b27d8faf51055
+  data.tar.gz: 8d7de844e79b31633f71472b07567d555140d7d85835070ab73ccfc493539154f5fb0d26680384c76b17ea1574d1532a6b5c0268ad8e54db4c9e1f71f6fc137b

data/History.md

@@ -1,3 +1,7 @@
+## 1.1.5 / 2016-09-03
+
+* allow to disable marker popup on the map
+
 ## 1.1.4 / 2016-07-31
 
 * open info window when marker is clicked

data/README.md

@@ -99,7 +99,7 @@ If you have any questions or proposals - open up an [issue](https://github.com/a
 
 ## Examples
 
-Want to see it in action? Check out [Demo Page](https://ayastreb.github.io/jekyll-maps/#examples)!
+Want to see it in action? Check out [Demo Page](https://ayastreb.me/jekyll-maps/#examples)!
 
 ## Contributing
 

data/lib/jekyll-maps/google_map_api.js

@@ -2,13 +2,13 @@ var jekyllMaps = (function () {
     'use strict';
 
     return {
-        data: [],
-        maps: [],
-        initializeMap: initializeMap,
+        data:              [],
+        maps:              [],
+        initializeMap:     initializeMap,
         initializeCluster: initializeCluster,
-        register: register,
-        render: render,
-        processCluster: processCluster
+        register:          register,
+        render:            render,
+        processCluster:    processCluster
     };
 
     /**
@@ -17,8 +17,8 @@ var jekyllMaps = (function () {
     function initializeMap() {
         this.options = {
             mapTypeId: google.maps.MapTypeId.ROADMAP,
-            center: new google.maps.LatLng(0, 0),
-            zoom: 12
+            center:    new google.maps.LatLng(0, 0),
+            zoom:      12
         }
         this.mapReady = true;
         this.render();
@@ -29,10 +29,10 @@ var jekyllMaps = (function () {
      *
      * @param String id
      * @param Array locations
-     * @param Boolean useCluster
+     * @param Object settings
      */
-    function register(id, locations, useCluster) {
-        this.data.push({id: id, locations: locations, useCluster: useCluster});
+    function register(id, locations, settings) {
+        this.data.push({id: id, locations: locations, settings: settings});
         this.render();
     }
 
@@ -43,46 +43,50 @@ var jekyllMaps = (function () {
         if (!this.mapReady) return;
 
         while (this.data.length > 0) {
-            var data = this.data.pop(),
-                bounds = new google.maps.LatLngBounds(),
-                options = this.options,
-                map = new google.maps.Map(document.getElementById(data.id), options),
+            var data       = this.data.pop(),
+                bounds     = new google.maps.LatLngBounds(),
+                options    = Object.assign({}, this.options, data.settings),
+                map        = new google.maps.Map(document.getElementById(data.id), options),
                 infoWindow = new google.maps.InfoWindow(),
-                markers = data.locations.map(createMarker);
+                markers    = data.locations.map(function (location) {
+                    return createMarker(location, options.showMarkerPopup);
+                });
 
             map.fitBounds(bounds);
             google.maps.event.addListenerOnce(map, 'bounds_changed', onBoundsChanged);
-            if (data.useCluster) {
+            if (options.useCluster) {
                 this.maps.push({map: map, markers: markers});
                 this.processCluster();
             }
         }
 
-        function createMarker(location) {
+        function createMarker(location, showMarkerPopup) {
             var position = new google.maps.LatLng(location.latitude, location.longitude),
-                marker = new google.maps.Marker({
+                marker   = new google.maps.Marker({
                     position: position,
-                    title: location.title,
-                    image: location.image,
-                    url: location.url,
-                    map: map
+                    title:    location.title,
+                    image:    location.image,
+                    url:      location.url,
+                    map:      map
                 });
 
             bounds.extend(position);
-            marker.addListener('click', function () {
-                var contentString = '<div class="map-info-window"><h5>' + this.title + '</h5>',
-                    link = 'View';
-                if (this.image.length > 0) {
-                    link = '<img src="' + this.image + '" alt="' + this.title + '"/>';
-                }
-                contentString += '<a href="' + this.url + '">' + link + '</a></div>';
-                infoWindow.setContent(contentString);
-                infoWindow.open(map, this);
-            });
+            if (showMarkerPopup) marker.addListener('click', markerPopup);
 
             return marker;
         }
 
+        function markerPopup() {
+            var contentString = '<div class="map-info-window"><h5>' + this.title + '</h5>',
+                link = 'View';
+            if (this.image.length > 0) {
+                link = '<img src="' + this.image + '" alt="' + this.title + '"/>';
+            }
+            contentString += '<a href="' + this.url + '">' + link + '</a></div>';
+            infoWindow.setContent(contentString);
+            infoWindow.open(map, this);
+        }
+
         function onBoundsChanged() {
             if (this.getZoom() > options.zoom) {
                 this.setZoom(options.zoom);
@@ -102,9 +106,31 @@ var jekyllMaps = (function () {
         while (this.maps.length > 0) {
             var obj = this.maps.pop();
             new MarkerClusterer(obj.map, obj.markers, {
-                gridSize: this.clusterSettings.grid_size || 25,
+                gridSize:  this.clusterSettings.grid_size || 25,
                 imagePath: 'https://cdn.rawgit.com/googlemaps/js-marker-clusterer/gh-pages/images/m'
             });
         }
     }
+
+    if (typeof Object.assign != 'function') {
+        Object.assign = function (target) {
+            'use strict';
+            if (target == null) {
+                throw new TypeError('Cannot convert undefined or null to object');
+            }
+
+            target = Object(target);
+            for (var index = 1; index < arguments.length; index++) {
+                var source = arguments[index];
+                if (source != null) {
+                    for (var key in source) {
+                        if (Object.prototype.hasOwnProperty.call(source, key)) {
+                            target[key] = source[key];
+                        }
+                    }
+                }
+            }
+            return target;
+        };
+    }
 }());

data/lib/jekyll-maps/google_map_api.rb

@@ -31,7 +31,7 @@ HTML
             .fetch("google", {})
             .fetch("api_key", "")
           <<HTML
-<script async defer src='https://maps.googleapis.com/maps/api/js?key=#{api_key}&callback=jekyllMaps.initializeMap'></script>
+<script async defer src='https://maps.googleapis.com/maps/api/js?key=#{api_key}&callback=#{Jekyll::Maps::GoogleMapTag::JS_LIB_NAME}.initializeMap'></script>
 HTML
         end
 
@@ -43,7 +43,7 @@ HTML
           return unless settings.fetch("enabled", true)
           <<HTML
 <script async defer src='https://cdn.rawgit.com/googlemaps/js-marker-clusterer/gh-pages/src/markerclusterer.js'
-        onload='jekyllMaps.initializeCluster(#{settings.to_json})'></script>
+        onload='#{Jekyll::Maps::GoogleMapTag::JS_LIB_NAME}.initializeCluster(#{settings.to_json})'></script>
 HTML
         end
 

data/lib/jekyll-maps/google_map_tag.rb

@@ -12,14 +12,17 @@ module Jekyll
       end
 
       def render(context)
-        locations   = @finder.find(context.registers[:site], context.registers[:page])
-        use_cluster = @args[:flags][:no_cluster] ? "false" : "true"
+        locations = @finder.find(context.registers[:site], context.registers[:page])
         @args[:attributes][:id] ||= SecureRandom.uuid
 
         <<HTML
 <div #{render_attributes}></div>
 <script type='text/javascript'>
-  #{JS_LIB_NAME}.register('#{@args[:attributes][:id]}', #{locations.to_json}, #{use_cluster});
+  #{JS_LIB_NAME}.register(
+    '#{@args[:attributes][:id]}',
+    #{locations.to_json},
+    #{map_settings.to_json}
+  );
 </script>
 HTML
       end
@@ -48,6 +51,14 @@ HTML
         css = css.join(" ") if css.is_a?(Array)
         %(class='#{css}')
       end
+
+      private
+      def map_settings
+        {
+          useCluster: !@args[:flags][:no_cluster],
+          showMarkerPopup: @args[:attributes][:show_popup] != 'false'
+        }
+      end
     end
   end
 end

data/lib/jekyll-maps/location_finder.rb

@@ -14,15 +14,7 @@ module Jekyll
           site.data.each { |_, docs| filter(docs) }
         end
 
-        @documents.map do |document|
-          {
-            :latitude  => document["location"]["latitude"],
-            :longitude => document["location"]["longitude"],
-            :title     => document["title"],
-            :url       => document["url"] || document.url,
-            :image     => document["image"] || ""
-          }
-        end
+        convert
       end
 
       private
@@ -43,6 +35,19 @@ module Jekyll
           return false if doc[key].nil? || doc[key] != value
         end
       end
+
+      private
+      def convert
+        @documents.map do |document|
+          {
+            :latitude  => document["location"]["latitude"],
+            :longitude => document["location"]["longitude"],
+            :title     => document["title"],
+            :url       => document["url"] || document.url,
+            :image     => document["image"] || ""
+          }
+        end
+      end
     end
   end
 end

data/lib/jekyll-maps/options_parser.rb

@@ -11,6 +11,7 @@ module Jekyll
         width
         height
         class
+        show_popup
       ).freeze
 
       class << self

data/lib/jekyll-maps/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Maps
-    VERSION = "1.1.4".freeze
+    VERSION = "1.1.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-maps
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Anatoliy Yastreb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-31 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll