jekyll-maps 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1a432ee547d3a2d9f4b6ae0b2e22c848b39014a
-  data.tar.gz: 9d6697299c275ac9e41dd50255621d4447d52c78
+  metadata.gz: 3bf3fffa8b6a67a476bdbe5fc43b4448098bb365
+  data.tar.gz: a2907b6e1a100ed5ed7d66bdbfcd2278b2316127
 SHA512:
-  metadata.gz: 8ca56f5cb9c366f96e6dfe82122eb01c7a353db4c06dfbecd25b7223d320621d78b5f0856f79d8cdde12a5d7f7560e465eca0ae5191f3af8a34b27d8faf51055
-  data.tar.gz: 8d7de844e79b31633f71472b07567d555140d7d85835070ab73ccfc493539154f5fb0d26680384c76b17ea1574d1532a6b5c0268ad8e54db4c9e1f71f6fc137b
+  metadata.gz: a326efc82dd3efa73f3c140137c0f87f29f86e93d8d795883cd4a83f57d7064ee8868e3e250932c04cda356fa784eada946ea9ba612ad9a85c107a8d5dfcaf38
+  data.tar.gz: f7bb0962ad9a89794a2c767b88a92870bb995048b313c678e92fe8ed71fd7bb8672ca3dee3b14bdefbfab2168a9929f903b3473b9e7575b6c8581ca1d125b612

data/History.md

@@ -1,3 +1,7 @@
+## 1.1.6 / 2016-09-07
+* fix #15 - broken page if there is <header> tag used
+* allow setting custom zoom level with `zoom:10` attribute
+
 ## 1.1.5 / 2016-09-03
 
 * allow to disable marker popup on the map

data/jekyll-maps.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Anatoliy Yastreb"]
   spec.email         = ["anatoliy.yastreb@gmail.com"]
 
-  spec.homepage      = "https://github.com/ayastreb/jekyll-google-maps"
+  spec.homepage      = "https://github.com/ayastreb/jekyll-maps"
   spec.licenses      = ["MIT"]
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|spec|features)/!) }
   spec.require_paths = ["lib"]

data/lib/jekyll-maps/google_map_api.js

@@ -1,136 +1,135 @@
+/* global google */
+/* global MarkerClusterer */
+// eslint-disable-next-line no-unused-vars
 var jekyllMaps = (function () {
-    'use strict';
-
-    return {
-        data:              [],
-        maps:              [],
-        initializeMap:     initializeMap,
-        initializeCluster: initializeCluster,
-        register:          register,
-        render:            render,
-        processCluster:    processCluster
-    };
-
-    /**
-     * Setup Google Maps options and call renderer.
-     */
-    function initializeMap() {
-        this.options = {
-            mapTypeId: google.maps.MapTypeId.ROADMAP,
-            center:    new google.maps.LatLng(0, 0),
-            zoom:      12
-        }
-        this.mapReady = true;
-        this.render();
+  'use strict'
+  var clusterSettings = {}
+  var clusterReady = false
+  var mapReady = false
+  var options = {}
+  var data = []
+  var maps = []
+
+  return {
+    initializeMap: initializeMap,
+    initializeCluster: initializeCluster,
+    register: register
+  }
+
+  /**
+   * Setup Google Maps options and call renderer.
+   */
+  function initializeMap () {
+    options = {
+      mapTypeId: google.maps.MapTypeId.ROADMAP,
+      center: new google.maps.LatLng(0, 0)
     }
-
-    /**
-     * Register map data to be rendered once Google Maps API is loaded.
-     *
-     * @param String id
-     * @param Array locations
-     * @param Object settings
-     */
-    function register(id, locations, settings) {
-        this.data.push({id: id, locations: locations, settings: settings});
-        this.render();
+    mapReady = true
+    render()
+  }
+
+  /**
+   * Register map data to be rendered once Google Maps API is loaded.
+   *
+   * @param string id
+   * @param Array locations
+   * @param Object settings
+   */
+  function register (id, locations, options) {
+    data.push({ id: id, locations: locations, options: options })
+    render()
+  }
+
+  /**
+   * Render maps data if Google Maps API is loaded.
+   */
+  function render () {
+    if (!mapReady) return
+
+    while (data.length > 0) {
+      var item = data.pop()
+      var bounds = new google.maps.LatLngBounds()
+      var mapOptions = Object.assign({}, options, item.options)
+      var map = new google.maps.Map(document.getElementById(item.id), mapOptions)
+      var infoWindow = new google.maps.InfoWindow()
+      var markers = item.locations.map(createMarker)
+
+      map.fitBounds(bounds)
+      google.maps.event.addListenerOnce(map, 'bounds_changed', function() {
+        if (this.customZoom) this.setZoom(this.customZoom)
+      })
+      if (mapOptions.useCluster) {
+        maps.push({ map: map, markers: markers })
+        processCluster()
+      }
     }
 
-    /**
-     * Render maps data if Google Maps API is loaded.
-     */
-    function render() {
-        if (!this.mapReady) return;
-
-        while (this.data.length > 0) {
-            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(function (location) {
-                    return createMarker(location, options.showMarkerPopup);
-                });
+    function createMarker (location) {
+      var position = new google.maps.LatLng(location.latitude, location.longitude)
+      var marker = new google.maps.Marker({
+        position: position,
+        title: location.title,
+        image: location.image,
+        url: location.url,
+        map: map
+      })
 
-            map.fitBounds(bounds);
-            google.maps.event.addListenerOnce(map, 'bounds_changed', onBoundsChanged);
-            if (options.useCluster) {
-                this.maps.push({map: map, markers: markers});
-                this.processCluster();
-            }
-        }
-
-        function createMarker(location, showMarkerPopup) {
-            var position = new google.maps.LatLng(location.latitude, location.longitude),
-                marker   = new google.maps.Marker({
-                    position: position,
-                    title:    location.title,
-                    image:    location.image,
-                    url:      location.url,
-                    map:      map
-                });
-
-            bounds.extend(position);
-            if (showMarkerPopup) marker.addListener('click', markerPopup);
-
-            return marker;
-        }
+      bounds.extend(position)
+      if (mapOptions.showMarkerPopup) marker.addListener('click', markerPopup)
 
-        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);
-            }
-        }
+      return marker
     }
 
-    function initializeCluster(settings) {
-        this.clusterReady = true;
-        this.clusterSettings = settings || {};
-        this.processCluster();
+    function markerPopup () {
+      var contentString = '<div class="map-info-window"><h5>' + this.title + '</h5>'
+      var 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 processCluster() {
-        if (!this.clusterReady) return;
-
-        while (this.maps.length > 0) {
-            var obj = this.maps.pop();
-            new MarkerClusterer(obj.map, obj.markers, {
-                gridSize:  this.clusterSettings.grid_size || 25,
-                imagePath: 'https://cdn.rawgit.com/googlemaps/js-marker-clusterer/gh-pages/images/m'
-            });
-        }
+  }
+
+  function initializeCluster (settings) {
+    clusterReady = true
+    clusterSettings = settings || {}
+    processCluster()
+  }
+
+  function processCluster () {
+    if (!clusterReady) return
+
+    while (maps.length > 0) {
+      var obj = maps.pop()
+      // eslint-disable-next-line no-new
+      new MarkerClusterer(obj.map, obj.markers, {
+        gridSize: clusterSettings.grid_size || 25,
+        imagePath: 'https://cdn.rawgit.com/googlemaps/js-marker-clusterer/gh-pages/images/m'
+      })
+    }
+  }
+}())
+/* Object.assign polyfill */
+if (typeof Object.assign !== 'function') {
+  Object.assign = function (target) {
+    'use strict'
+    if (target == null) {
+      throw new TypeError('Cannot convert undefined or null to object')
     }
 
-    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;
-        };
+    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

@@ -1,7 +1,7 @@
 module Jekyll
   module Maps
     class GoogleMapApi
-      HEAD_END_TAG = %r!</.*head.*>!
+      HEAD_END_TAG = %r!</.*head>!
 
       class << self
         def prepend_api_code(doc)

data/lib/jekyll-maps/google_map_tag.rb

@@ -21,7 +21,7 @@ module Jekyll
   #{JS_LIB_NAME}.register(
     '#{@args[:attributes][:id]}',
     #{locations.to_json},
-    #{map_settings.to_json}
+    #{map_options.to_json}
   );
 </script>
 HTML
@@ -53,11 +53,15 @@ HTML
       end
 
       private
-      def map_settings
-        {
-          useCluster: !@args[:flags][:no_cluster],
-          showMarkerPopup: @args[:attributes][:show_popup] != 'false'
+      def map_options
+        opts = {
+          :useCluster      => !@args[:flags][:no_cluster],
+          :showMarkerPopup => @args[:attributes][:show_popup] != "false"
         }
+        if @args[:attributes][:zoom]
+          opts[:customZoom] = @args[:attributes][:zoom].to_i
+        end
+        opts
       end
     end
   end

data/lib/jekyll-maps/options_parser.rb

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

data/lib/jekyll-maps/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-maps
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Anatoliy Yastreb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-03 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -92,7 +92,7 @@ files:
 - lib/jekyll-maps/version.rb
 - script/bootstrap
 - script/cibuild
-homepage: https://github.com/ayastreb/jekyll-google-maps
+homepage: https://github.com/ayastreb/jekyll-maps
 licenses:
 - MIT
 metadata: {}