Skip to content

Commit 4d1a00c

Browse files
committed
fix errors in firefox if firebug isn't enabled
1 parent 087f421 commit 4d1a00c

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

index.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
function render(osm) {
3737

38-
console.log('initing Map...');
38+
if (window.console && window.console.log) console.log('initing Map...');
3939
var t = new Date().getTime();
4040

4141
var styles = [
@@ -274,7 +274,7 @@
274274
])
275275
];
276276

277-
console.log('styles created in', new Date().getTime() - t, 'ms');
277+
if (window.console && window.console.log) console.log('styles created in', new Date().getTime() - t, 'ms');
278278
t = new Date().getTime();
279279

280280
var highwayCases = {
@@ -333,7 +333,7 @@
333333
)*/
334334
];
335335

336-
console.log('layers created in', new Date().getTime() - t, 'ms');
336+
if (window.console && window.console.log) console.log('layers created in', new Date().getTime() - t, 'ms');
337337
t = new Date().getTime();
338338

339339
////////// TODO/FIXME still not really sure where projection should happen
@@ -349,7 +349,7 @@
349349
coord[1] = y;
350350
}
351351

352-
console.log('nodes projected in', new Date().getTime() - t, 'ms');
352+
if (window.console && window.console.log) console.log('nodes projected in', new Date().getTime() - t, 'ms');
353353

354354
//////////
355355

osm.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ com.stamen.osm.POLYGON_TAGS = {
3232

3333
com.stamen.osm.OSM = function(responseXML) {
3434

35-
if (console && console.log) console.log('initing OSM object...');
35+
if (window.console && window.console.log) console.log('initing OSM object...');
3636
var t = new Date().getTime();
3737

3838
this.nodes = [];
@@ -49,7 +49,7 @@ com.stamen.osm.OSM = function(responseXML) {
4949
maxLon: parseFloat(boundsXML.attributes.getNamedItem('maxlon').value)
5050
};
5151

52-
if (console && console.log) console.log('got bounds ' + this.bounds);
52+
if (window.console && window.console.log) console.log('got bounds ' + this.bounds);
5353

5454
// so we only have to loop over the xml nodes once
5555
// (for when we're parsing node refs in ways)
@@ -76,7 +76,7 @@ com.stamen.osm.OSM = function(responseXML) {
7676
nodeHash[id] = node;
7777
}
7878

79-
if (console && console.log) console.log('got ' + this.nodes.length + ' nodes');
79+
if (window.console && window.console.log) console.log('got ' + this.nodes.length + ' nodes');
8080

8181
var wayXMLs = responseXML.getElementsByTagName("way");
8282
for (var i = 0; i < wayXMLs.length; i++) {
@@ -92,7 +92,7 @@ com.stamen.osm.OSM = function(responseXML) {
9292
coordinates.push(theNode.geometry.coordinates);
9393
}
9494
else {
95-
if (console && console.log) console.log('node ref ' + ref + ' not found');
95+
if (window.console && window.console.log) console.log('node ref ' + ref + ' not found');
9696
}
9797
}
9898

@@ -118,10 +118,10 @@ com.stamen.osm.OSM = function(responseXML) {
118118

119119
} // for each way
120120

121-
if (console && console.log) console.log('got ' + this.ways.length + ' ways');
122-
if (console && console.log) console.log('got ' + this.areas.length + ' areas');
121+
if (window.console && window.console.log) console.log('got ' + this.ways.length + ' ways');
122+
if (window.console && window.console.log) console.log('got ' + this.areas.length + ' areas');
123123

124-
if (console && console.log) console.log('done initing OSM object... ' + (new Date().getTime() - t) + ' ms');
124+
if (window.console && window.console.log) console.log('done initing OSM object... ' + (new Date().getTime() - t) + ' ms');
125125

126126
};
127127

vectormap.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ com.stamen.vectormap.Map.prototype = {
3535
// this is the most naive implementation of a render loop I could think of
3636
render: function(canvas) {
3737
var t = new Date().getTime();
38-
if (console && console.log) console.log('starting rendering...');
38+
if (window.console && window.console.log) console.log('starting rendering...');
3939
var ctx = canvas.getContext('2d');
4040
ctx.clearRect(0,0,canvas.width,canvas.height);
4141
if (this.bgColor) {
@@ -64,7 +64,7 @@ com.stamen.vectormap.Map.prototype = {
6464
} // features
6565
} // styles
6666
} // layers
67-
if (console && console.log) console.log('done rendering... ' + (new Date().getTime() - t) + ' ms');
67+
if (window.console && window.console.log) console.log('done rendering... ' + (new Date().getTime() - t) + ' ms');
6868
}
6969
};
7070

0 commit comments

Comments
 (0)