Skip to content
This repository has been archived by the owner on Jun 16, 2019. It is now read-only.

Commit

Permalink
Merge pull request #72 from googlemaps/localurl
Browse files Browse the repository at this point in the history 
Moves image references to use relative paths
  • Loading branch information
@markmcd
markmcd committed May 25, 2016
2 parents 2f659a3 + cb2ead3 commit c259d33
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 61 deletions.
14 changes: 1 addition & 13 deletions examples/advanced_example.html
View file
Expand Up @@ -39,15 +39,7 @@

<script src="https://maps.googleapis.com/maps/api/js"></script>
<script src="data.json"></script>
<script>
var script = '<script type="text/javascript" src="../src/markerclusterer';
if (document.location.search.indexOf('compiled') !== -1) {
script += '_compiled';
}
script += '.js"><' + '/script>';
document.write(script);
</script>

<script type="text/javascript" src="../src/markerclusterer.js"></script>
<script>
var styles = [[{
url: '../images/people35.png',
Expand Down Expand Up @@ -187,10 +179,6 @@
</head>
<body>
<h3>An example of MarkerClusterer v3</h3>
<p>
<a href="?compiled">Compiled</a> |
<a href="?">Standard</a> version of the script.
</p>
<div id="map-container">
<div id="map"></div>
</div>
Expand Down
13 changes: 1 addition & 12 deletions examples/simple_example.html
View file
Expand Up @@ -28,14 +28,7 @@

<script src="https://maps.googleapis.com/maps/api/js"></script>
<script src="data.json"></script>
<script>
var script = '<script type="text/javascript" src="../src/markerclusterer';
if (document.location.search.indexOf('compiled') !== -1) {
script += '_compiled';
}
script += '.js"><' + '/script>';
document.write(script);
</script>
<script type="text/javascript" src="../src/markerclusterer.js"></script>

<script>
function initialize() {
Expand Down Expand Up @@ -75,10 +68,6 @@
</head>
<body>
<h3>A simple example of MarkerClusterer (100 markers)</h3>
<p>
<a href="?compiled">Compiled</a> |
<a href="?">Standard</a> version of the script.
</p>
<div id="map-container"><div id="map"></div></div>
</body>
</html>
13 changes: 1 addition & 12 deletions examples/speed_test_example.html
View file
Expand Up @@ -69,14 +69,7 @@

<script src="https://maps.googleapis.com/maps/api/js"></script>
<script src="data.json"></script>
<script>
var script = '<script type="text/javascript" src="../src/markerclusterer';
if (document.location.search.indexOf('compiled') !== -1) {
script += '_compiled';
}
script += '.js"><' + '/script>';
document.write(script);
</script>
<script type="text/javascript" src="../src/markerclusterer.js"></script>
<script src="speed_test.js"></script>

<script>
Expand All @@ -98,10 +91,6 @@
<body>
<div id="panel">
<h3>An example of MarkerClusterer v3</h3>
<p>
<a href="?compiled">Compiled</a> |
<a href="?">Standard</a> version of the script.
</p>

<div>
<input type="checkbox" checked="checked" id="usegmm"/>
Expand Down
4 changes: 1 addition & 3 deletions src/markerclusterer.js
View file
Expand Up @@ -187,9 +187,7 @@ function MarkerClusterer(map, opt_markers, opt_options) {
* @type {string}
* @private
*/
MarkerClusterer.prototype.MARKER_CLUSTER_IMAGE_PATH_ =
'https://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/' +
'images/m';
MarkerClusterer.prototype.MARKER_CLUSTER_IMAGE_PATH_ = '../images/m';


/**
Expand Down
21 changes: 0 additions & 21 deletions src/markerclusterer_compiled.js
View file

This file was deleted.

3 comments on commit c259d33

@wouterhendriks
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The removal of markercluster_compiled.js will break some web pages, at least the ones that rely on the compiled version as discussed here:
http://stackoverflow.com/questions/37179980/markercluster-v3-stopped-working-properly

(like a site of ours did :-))

@markmcd
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately trying to include it from GitHub won't work, and even if you get it to work, it could break at any time. My reasoning is that it's better to set the expectation that users should not try to use source control as a form of CDN, so that they are less likely to experience unexpected breakages.

My fear is that we may again end up in the same unfortunate situation that's just happened, and I'd like to prevent that.

@PeterTheOne
Copy link
Contributor

@PeterTheOne PeterTheOne commented on c259d33 May 28, 2016 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please upvote: http://stackoverflow.com/a/37499989/782920 and http://stackoverflow.com/a/37500068/782920

Please sign in to comment.