commit 0b489ad2f4b4b3f1400b2c9e816a09a9ebb018c4
author Akron <nils@diewald-online.de> Fri Feb 02 16:49:32 2018 +0100
committer Akron <nils@diewald-online.de> Fri Feb 02 16:49:32 2018 +0100
tree 9228b20decc116c78c799d4291faf014699e0e56
parent 151bc87aaa0a17e81cc7d0e712b94060e0ca0464

Cleanup and simplify JS code

Change-Id: I393e22763c1a1d18878026bf459b747b150429fb

dev/js/src/match/relations.js

diff --git a/dev/js/src/match/relations.js b/dev/js/src/match/relations.js
index 4a1ddc2..badbacf 100644
--- a/dev/js/src/match/relations.js
+++ b/dev/js/src/match/relations.js
@@ -7,8 +7,9 @@
 define([], function () {

   "use strict";

 

-  var svgNS = "http://www.w3.org/2000/svg";

-  var _TermRE = new RegExp("^(?:([^\/]+?)\/)?([^:]+?):(.+?)$");

+  const svgNS = "http://www.w3.org/2000/svg";

+  const _TermRE = new RegExp("^(?:([^\/]+?)\/)?([^:]+?):(.+?)$");

+  const d = document;

 

   return {

     create : function (snippet) {

@@ -40,7 +41,7 @@
         return this;

 

       // Parse the snippet

-      var html = document.createElement("div");

+      var html = d.createElement("div");

       html.innerHTML = snippet;

 

       // Establish temporary parsing memory

@@ -253,13 +254,13 @@
     

     // This is a shorthand for SVG element creation

     _c : function (tag) {

-      return document.createElementNS(svgNS, tag);

+      return d.createElementNS(svgNS, tag);

     },

 

     // Get bounding box - with workaround for text nodes

     _rect : function (node) {

       if (node.tagName == "tspan" && !navigator.userAgent.match(/Edge/)) {

-        var range = document.createRange();

+        var range = d.createRange();

         range.selectNode(node);

         var rect = range.getBoundingClientRect();

         range.detach();

@@ -399,7 +400,7 @@
       labelE.setAttribute("x", x + middle);

       labelE.setAttribute("y", middleY + 3);

       labelE.setAttribute("text-anchor", "middle");

-      var textNode = document.createTextNode(arc.label);

+      var textNode = d.createTextNode(arc.label);

       labelE.appendChild(textNode);

 

       var labelBox   = labelE.getBBox();

@@ -662,7 +663,7 @@
 

       // Introduce some prepending whitespace (yeah - I know ...)

       var ws = text.appendChild(this._c("tspan"));

-      ws.appendChild(document.createTextNode('\u00A0'));

+      ws.appendChild(d.createTextNode('\u00A0'));

       ws.style.textAnchor = "start";

       

       var lastRight = 0;

@@ -670,7 +671,7 @@
         // Append svg

         // var x = text.appendChild(this._c("text"));

         var tspan = text.appendChild(this._c("tspan"));

-        tspan.appendChild(document.createTextNode(this._tokens[node_i]));

+        tspan.appendChild(d.createTextNode(this._tokens[node_i]));

         tspan.setAttribute("text-anchor", "middle");

         

         this._tokenElements.push(tspan);