geojs 1.12.1 → 1.12.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.12.1",
+  "version": "1.12.3",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",

package/src/mapInteractor.js

@@ -1665,6 +1665,7 @@ var mapInteractor = function (args) {
     // add information about the button state to the event information
     var details = m_this.mouse();
     details.buttonsDown = m_clickMaybe.buttons;
+    details.evt = evt;
 
     // reset click detector variable
     m_this._setClickMaybe(false);

package/src/util/common.js

@@ -971,11 +971,22 @@ var util = {
    * @memberof geo.util
    */
   escapeUnicodeHTML: function (text) {
-    return text.replace(/./g, function (k) {
+    return text.replace(/[^- 0-9A-Za-z~`!@#$%^&*()_+={}|[\]\\:";'<>?,./]/g, function (k, pos) {
       var code = k.charCodeAt(0);
       if (code < 127) {
         return k;
       }
+      /* decode utf016 surrogate pairs */
+      if (code >= 0xD800 && code <= 0xE000) {
+        if (code < 0xDC00 || pos) {
+          return '';
+        }
+        var code0 = text.charCodeAt(pos - 1);
+        if (code0 < 0xD800 || code0 >= 0xDC00) {
+          return '';
+        }
+        code = (code0 - 0xD800) * 0x400 + (code - 0xDC00);
+      }
       return '&#' + code.toString(10) + ';';
     });
   },