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

Merge pull request #98 from towa48/master

Browse Source 
Avoid duplicate feature title nodes. r=me
This commit is contained in:
ahocevar
2011-12-08 12:18:40 -08:00
parent 5fda8835da a1b6644b2a
commit 096fb7398b
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Renderer/SVG.js
+9 -3
View File
@@ -252,9 +252,15 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
if (style.graphicTitle) { if (style.graphicTitle) {
node.setAttributeNS(null, "title", style.graphicTitle); node.setAttributeNS(null, "title", style.graphicTitle);
//Standards-conformant SVG //Standards-conformant SVG
var label = this.nodeFactory(null, "title"); // Prevent duplicate nodes. See issue https://github.com/openlayers/openlayers/issues/92
label.textContent = style.graphicTitle; var titleNode = node.getElementsByTagName("title");
node.appendChild(label); if (titleNode.length > 0) {
titleNode[0].firstChild.textContent = style.graphicTitle;
} else {
var label = this.nodeFactory(null, "title");
label.textContent = style.graphicTitle;
node.appendChild(label);
}
} }
if (style.graphicWidth && style.graphicHeight) { if (style.graphicWidth && style.graphicHeight) {
node.setAttributeNS(null, "preserveAspectRatio", "none"); node.setAttributeNS(null, "preserveAspectRatio", "none");
lib/OpenLayers/Renderer/SVG2.js
+9 -3
View File
@@ -183,9 +183,15 @@ OpenLayers.Renderer.SVG2 = OpenLayers.Class(OpenLayers.Renderer.NG, {
if (style.graphicTitle) { if (style.graphicTitle) {
node.setAttributeNS(null, "title", style.graphicTitle); node.setAttributeNS(null, "title", style.graphicTitle);
//Standards-conformant SVG //Standards-conformant SVG
var label = this.nodeFactory(null, "title"); // Prevent duplicate nodes. See issue https://github.com/openlayers/openlayers/issues/92
label.textContent = style.graphicTitle; var titleNode = node.getElementsByTagName("title");
node.appendChild(label); if (titleNode.length > 0) {
titleNode[0].firstChild.textContent = style.graphicTitle;
} else {
var label = this.nodeFactory(null, "title");
label.textContent = style.graphicTitle;
node.appendChild(label);
}
} }
if (style.graphicWidth && style.graphicHeight) { if (style.graphicWidth && style.graphicHeight) {
node.setAttributeNS(null, "preserveAspectRatio", "none"); node.setAttributeNS(null, "preserveAspectRatio", "none");