X-Git-Url: https://dev.renevier.net/gitweb.cgi?a=blobdiff_plain;f=js%2Fsyp.js;h=1f4d632d087c5f2f8afa1108e1e3784329f28bed;hb=5c3bb419eb4f9728849969fe7cff84f0260066c8;hp=afb53bc0db9d2116a14379a4d40d24f51991ca15;hpb=a34fe8cb1b7f571577d4af4399d6a850fef07041;p=syp.git

diff --git a/js/syp.js b/js/syp.js
index afb53bc..1f4d632 100644
--- a/js/syp.js
+++ b/js/syp.js
@@ -3,7 +3,7 @@
 
 OpenLayers.Control.SypAttribution = OpenLayers.Class (OpenLayers.Control.Attribution, {
     updateAttribution: function() {
-        var attributions = [SypStrings.propulsedByLink];
+        var attributions = [SypStrings.poweredByLink];
         if (this.map && this.map.layers) {
             for(var i=0, len=this.map.layers.length; i<len; i++) {
                 var layer = this.map.layers[i];
@@ -111,8 +111,8 @@ var SYP = {
         }
 
         var map = this.map;
-        if (map.getControlsByClass("OpenLayers.Control.ArgParser")[0].lat
-            == undefined) { // map center was not set in ArgParser control.
+        if (map.getControlsByClass("OpenLayers.Control.ArgParser")[0].center
+            == null) { // map center was not set in ArgParser control.
             var orig = this.Utils.mbr (this.dataLayer);
             var centerBounds = new OpenLayers.Bounds();
 
@@ -212,8 +212,9 @@ var SYP = {
         }
         var contentHTML;
         if (feature.cluster[0].attributes.name) {
+            // escaping name is necessary because it's not enclosed in another html tag.
             contentHTML = "<h2>" +
-                          feature.cluster[0].attributes.name + 
+                          SYP.Utils.escapeHTML(feature.cluster[0].attributes.name) +
                           "</h2>" + 
                           feature.cluster[0].attributes.description;
         } else {
@@ -241,11 +242,12 @@ var SYP = {
     },
 
     showBigImage: function (href) {
-        try {
-            document.getElementById('bigimg_container').style.display = "table";
-        } catch(e) {
+        if (OpenLayers.Util.getBrowserName() == "msie") {
             document.getElementById('bigimg_container').style.display = "block";
+        } else {
+            document.getElementById('bigimg_container').style.display = "table";
         }
+
         var maxHeight = document.body.clientHeight * 0.9;
         var maxWidth = document.body.clientWidth * 0.9;
         document.getElementById('bigimg').style.height = "";
@@ -383,6 +385,18 @@ var SYP = {
             }
             div.style.display = "block";
             div.appendChild(textNode);
+        },
+
+        escapeHTML: function (str) {
+            if (!str) {
+                return "";
+            }
+            return str.
+             replace(/&/gm, '&amp;').
+             replace(/'/gm, '&#39;').
+             replace(/"/gm, '&quot;').
+             replace(/>/gm, '&gt;').
+             replace(/</gm, '&lt;');
         }
     }
 };