Permalink
Browse files

Merge branch 'release'

  • Loading branch information...
2 parents aa653ba + b140a98 commit 6cc4513810c3c063229f7f74d474418ce1929d6c @mbostock mbostock committed Jun 14, 2011
Showing with 28 additions and 24 deletions.
  1. +6 −4 polymaps.js
  2. +16 −16 polymaps.min.js
  3. +4 −2 src/Map.js
  4. +1 −1 src/Queue.js
  5. +1 −1 src/start.js
View
@@ -2,7 +2,7 @@ if (!org) var org = {};
if (!org.polymaps) org.polymaps = {};
(function(po){
- po.version = "2.5.0"; // semver.org
+ po.version = "2.5.1"; // semver.org
var zero = {x: 0, y: 0};
po.ns = {
@@ -293,7 +293,7 @@ po.queue = (function() {
function send() {
req = new XMLHttpRequest();
- if (mimeType) {
+ if (mimeType && req.overrideMimeType) {
req.overrideMimeType(mimeType);
}
req.open("GET", url, true);
@@ -684,8 +684,10 @@ resizer.remove = function(map) {
};
// Note: assumes single window (no frames, iframes, etc.)!
-window.addEventListener("resize", resizer, false);
-window.addEventListener("load", resizer, false);
+if (window.addEventListener) {
+ window.addEventListener("resize", resizer, false);
+ window.addEventListener("load", resizer, false);
+}
// See http://wiki.openstreetmap.org/wiki/Mercator
Oops, something went wrong.

0 comments on commit 6cc4513

Please sign in to comment.