markerclustererplus-rails 2.0.16 → 2.0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1be49395941d961b1fd2240d44acc26ebdd2272a
-  data.tar.gz: 2682daca5b400f2a8c911c01cafb0f42b384837f
+  metadata.gz: 02a300d6483702597fddc1e4196a765d5ad7ddaf
+  data.tar.gz: fb04716ed8084220b523ddf2946ace788bc26328
 SHA512:
-  metadata.gz: 4dd7079e75a5207ab6833ac742e03d52a4f98833ca0893e2b2b464aa37778bf9b4c99ba826d2b780024ef566136d69bf452fb13c2af97dcf1560a2ee1e686d14
-  data.tar.gz: 4ee8df2ea96dd4ced37bcfb31399146f44ff053f42078bf0d798c0c4cec6ee0c75cf631bb259eb2fe3b1fd41e72ce0c58ebb3c7fe84a0b19ddb9e07de0d0207b
+  metadata.gz: d3518b1e9e7ea1e9d40f24fe8efb2a0d656373522bdfb24c62333dd3cbf713582c4bfb804df8377ba34ec90ca1d3e419f24147120b6911f0baa2ebaf3ea70783
+  data.tar.gz: 3a7f34bdb88bc5c1a05bd64901e6c1b7423184041f3c7d3f29e500be6ebf6f8bea8fe8f04f78654ea4884fbf780de42cc372821423a2d5affceba4546afff02c

data/README.md

@@ -31,7 +31,6 @@ Note that to include the MarkerClustererPlus icons in the asset pipeline we over
 
 * imageExtension
 * imagePath
-* imageSizes
 
 This should not be a problem since the reason to using this gem in the first place is to include everything in the asset pipeline. Should you for some reason want to get the icons from somewhere else it should be possible to override this with the 'styles' property, although we have not tested this ourself.
 

data/app/assets/javascripts/markerclusterer.js.erb

@@ -28,7 +28,14 @@
 /**
  * This file modified for use with the Rails asset pipeline
  * https://github.com/RogerE/markerclustererplus-rails
+ * gem markerclustererplus-rails
+ * gem version 2.0.16.1
  * @author Roger Ertesvag
+ * NOTE: to include the MarkerClustererPlus icons in the asset pipeline the gem overrides
+ *       the original configuration for setting the icon properties. This means that changing
+ *       the following properties will not have any effect when using the gem:
+ *          imageExtension
+ *          imagePath
  */
 
 /**
@@ -812,8 +819,13 @@ MarkerClusterer.prototype.draw = function () {};
 
 /**
  * Sets up the styles object.
+ */
 MarkerClusterer.prototype.setupStyles_ = function () {
   var i, size;
+  // START rails modification
+  var icons = ['<%= asset_path 'markerclusterer/m1.png' %>', '<%= asset_path 'markerclusterer/m2.png' %>', '<%= asset_path 'markerclusterer/m3.png' %>', '<%= asset_path 'markerclusterer/m4.png' %>', '<%= asset_path 'markerclusterer/m5.png' %>'];
+  // END rails modification
+
   if (this.styles_.length > 0) {
     return;
   }
@@ -821,31 +833,12 @@ MarkerClusterer.prototype.setupStyles_ = function () {
   for (i = 0; i < this.imageSizes_.length; i++) {
     size = this.imageSizes_[i];
     this.styles_.push({
+      // START rails modification
+      url: MarkerClusterer.IMAGE_HOST + 'assets' + icons[i].split('assets').slice(-1)[0],
+      /*
       url: this.imagePath_ + (i + 1) + "." + this.imageExtension_,
-      height: size,
-      width: size
-    });
-  }
-};
- */
-
-
-/**
- * Sets up the styles object.
- */
-MarkerClusterer.prototype.setupStyles_ = function () {
-  var i, size;
-  if (this.styles_.length > 0) {
-    return;
-  }
-
-  var icons = ['<%= asset_path 'markerclusterer/m1.png' %>', '<%= asset_path 'markerclusterer/m2.png' %>', '<%= asset_path 'markerclusterer/m3.png' %>', '<%= asset_path 'markerclusterer/m4.png' %>', '<%= asset_path 'markerclusterer/m5.png' %>'];
-  var sizes = [53, 56, 66, 78, 90];
-
-  for (i = 0; i < icons.length; i++) {
-    size = sizes[i];
-    this.styles_.push({
-      url: icons[i],
+      */
+      // END rails modification
       height: size,
       width: size
     });
@@ -1671,3 +1664,10 @@ MarkerClusterer.IMAGE_EXTENSION = "png";
  * @constant
  */
 MarkerClusterer.IMAGE_SIZES = [53, 56, 66, 78, 90];
+
+// START rails modification
+// get host js file is served from
+var scriptList = document.getElementsByTagName('script');
+var thisScriptSource=scriptList[scriptList.length-1].getAttribute("src");
+MarkerClusterer.IMAGE_HOST = thisScriptSource.split('assets')[0];
+// END rails modification

data/lib/markerclustererplus-rails/version.rb

@@ -1,5 +1,5 @@
 module Markerclustererplus
   module Rails
-    VERSION = "2.0.16"
+    VERSION = "2.0.16.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markerclustererplus-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.16.1
 platform: ruby
 authors:
 - RogerE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies: []
 description: This gem provides the MarkerClustererPlus assets for your Rails application.
 email:
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: markerclustererplus-rails
-rubygems_version: 2.1.9
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Use MarkerClustererPlus with Rails Asset Pipeline