ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/openlayers/openlayers into vendor-prefixes

Browse Source
This commit is contained in:
Gregers Gram Rygg
2012-06-25 14:17:19 +02:00
parent ab6b2ef008 533e5f4242
commit 93211a31bc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/OpenLayers/Projection.js
View File

@@ -62,7 +62,7 @@ OpenLayers.Projection = OpenLayers.Class({
initialize: function(projCode, options) { initialize: function(projCode, options) {
OpenLayers.Util.extend(this, options); OpenLayers.Util.extend(this, options);
this.projCode = projCode; this.projCode = projCode;
if (window.Proj4js) { if (typeof Proj4js == "object") {
this.proj = new Proj4js.Proj(projCode); this.proj = new Proj4js.Proj(projCode);
} }
}, },
@@ -115,7 +115,7 @@ OpenLayers.Projection = OpenLayers.Class({
if (!(p instanceof OpenLayers.Projection)) { if (!(p instanceof OpenLayers.Projection)) {
p = new OpenLayers.Projection(p); p = new OpenLayers.Projection(p);
} }
if (window.Proj4js && this.proj.defData && p.proj.defData) { if ((typeof Proj4js == "object") && this.proj.defData && p.proj.defData) {
equals = this.proj.defData.replace(this.titleRegEx, "") == equals = this.proj.defData.replace(this.titleRegEx, "") ==
p.proj.defData.replace(this.titleRegEx, ""); p.proj.defData.replace(this.titleRegEx, "");
} else if (p.getCode) { } else if (p.getCode) {