Using sans-serif instead of loaded fonts; fix IE9 dataset compatibility shim

diff --git a/web/compatibility.js b/web/compatibility.js
index b22153516e425ada7db3d3712a1e4da9425f8df4..9f139b7dd9beb793e8ffe4f2eb9a77c2f58b7a9d 100644 (file)
--- a/web/compatibility.js
+++ b/web/compatibility.js
@@ -217,12 +217,15 @@
   var div = document.createElement('div');
   if ('dataset' in div)
     return; // dataset property exists
-  Object.defineProperty(HTMLElement.prototype, 'dataset', {
-    get: function htmlElementDatasetGetter() {
-      // adding dataset field to the actual object
-      return (this.dataset = {});
+  var oldCreateElement = document.createElement;
+  document.createElement = function newCreateElement() {
+    var result = oldCreateElement.apply(document, arguments);
+    if (arguments[0] === 'div') {
+      // creating dataset property for the div elements
+      result.dataset = {};
     }
-  });
+    return result;
+  };
 })();
 
 // Check console compatability

diff --git a/web/viewer.css b/web/viewer.css
index 681e5046a61cd1127b0e1f83e9c142e27ddc6761..4d0c64dadda26f7e262c890979f85b590b2bed87 100644 (file)
--- a/web/viewer.css
+++ b/web/viewer.css
@@ -252,6 +252,7 @@ canvas {
   right: 0;
   bottom: 0;
   color: #000;
+  font-family: sans-serif;
 }
 
 .textLayer > div {

diff --git a/web/viewer.js b/web/viewer.js
index 5a1a1df03d3c2c870ec3eabd6c49e0917e6cb406..d5162a194d6fe5631b6bed5e6dbfaf5001c30117 100644 (file)
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -1083,7 +1083,6 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
     textDiv.dataset.canvasWidth = text.canvasWidth * text.geom.hScale;
 
     textDiv.style.fontSize = fontHeight + 'px';
-    textDiv.style.fontFamily = fontName || 'sans-serif';
     textDiv.style.left = text.geom.x + 'px';
     textDiv.style.top = (text.geom.y - fontHeight) + 'px';
     textDiv.textContent = text.str;