changed vml namespace prefix from "v" to "olv" to avoid conflicts with other libraries that use vml. r=pgiraud,crschmidt. (Pullup #1477)
git-svn-id: http://svn.openlayers.org/trunk/openlayers@6764 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -37,10 +37,10 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
||||
if (!this.supported()) {
|
||||
return;
|
||||
}
|
||||
if (!document.namespaces.v) {
|
||||
document.namespaces.add("v", this.xmlns);
|
||||
if (!document.namespaces.olv) {
|
||||
document.namespaces.add("olv", this.xmlns);
|
||||
var style = document.createStyleSheet();
|
||||
style.addRule('v\\:*', "behavior: url(#default#VML); " +
|
||||
style.addRule('olv\\:*', "behavior: url(#default#VML); " +
|
||||
"position: absolute; display: inline-block;");
|
||||
}
|
||||
OpenLayers.Renderer.Elements.prototype.initialize.apply(this,
|
||||
@@ -120,17 +120,17 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
||||
var nodeType = null;
|
||||
switch (geometry.CLASS_NAME) {
|
||||
case "OpenLayers.Geometry.Point":
|
||||
nodeType = style.externalGraphic ? "v:rect" : "v:oval";
|
||||
nodeType = style.externalGraphic ? "olv:rect" : "olv:oval";
|
||||
break;
|
||||
case "OpenLayers.Geometry.Rectangle":
|
||||
nodeType = "v:rect";
|
||||
nodeType = "olv:rect";
|
||||
break;
|
||||
case "OpenLayers.Geometry.LineString":
|
||||
case "OpenLayers.Geometry.LinearRing":
|
||||
case "OpenLayers.Geometry.Polygon":
|
||||
case "OpenLayers.Geometry.Curve":
|
||||
case "OpenLayers.Geometry.Surface":
|
||||
nodeType = "v:shape";
|
||||
nodeType = "olv:shape";
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -195,7 +195,7 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
||||
}
|
||||
} else {
|
||||
if (!fill) {
|
||||
fill = this.createNode('v:fill', node.id + "_fill");
|
||||
fill = this.createNode('olv:fill', node.id + "_fill");
|
||||
}
|
||||
fill.setAttribute("opacity", style.fillOpacity);
|
||||
|
||||
@@ -236,7 +236,7 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
||||
}
|
||||
} else {
|
||||
if (!stroke) {
|
||||
stroke = this.createNode('v:stroke', node.id + "_stroke");
|
||||
stroke = this.createNode('olv:stroke', node.id + "_stroke");
|
||||
node.appendChild(stroke);
|
||||
}
|
||||
stroke.setAttribute("opacity", style.strokeOpacity);
|
||||
@@ -379,7 +379,7 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
||||
* {DOMElement} The main root element to which we'll add vectors
|
||||
*/
|
||||
createRoot: function() {
|
||||
return this.nodeFactory(this.container.id + "_root", "v:group");
|
||||
return this.nodeFactory(this.container.id + "_root", "olv:group");
|
||||
},
|
||||
|
||||
/**************************************
|
||||
|
||||
Reference in New Issue
Block a user