From 97e6eef62f9363fbdac5bf4227d77f21ded5c820 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Sun, 2 Jul 2017 08:39:21 -0700 Subject: [PATCH] Resolves #429 eliminate clientWidth in favor of getBoundingClientRect --- src/js/visuals/visBranch.js | 5 +++-- src/js/visuals/visTag.js | 6 +++--- src/js/visuals/visualization.js | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/js/visuals/visBranch.js b/src/js/visuals/visBranch.js index 94e45009..a492edc8 100644 --- a/src/js/visuals/visBranch.js +++ b/src/js/visuals/visBranch.js @@ -301,9 +301,10 @@ var VisBranch = VisBase.extend({ var textNode = this.get('text').node; if (this.get('isHead')) { // HEAD is a special case + var size = textNode.getBoundingClientRect(); return firefoxFix({ - w: textNode.clientWidth, - h: textNode.clientHeight + w: size.width, + h: size.height }); } diff --git a/src/js/visuals/visTag.js b/src/js/visuals/visTag.js index bf746a4a..f7ce663c 100644 --- a/src/js/visuals/visTag.js +++ b/src/js/visuals/visTag.js @@ -163,7 +163,7 @@ var VisTag = VisBase.extend({ getTextSize: function() { var getTextWidth = function(visTag) { var textNode = (visTag.get('text')) ? visTag.get('text').node : null; - return (textNode === null) ? 0 : textNode.clientWidth; + return (textNode === null) ? 0 : textNode.getBoundingClientRect().width; }; var firefoxFix = function(obj) { @@ -219,7 +219,7 @@ var VisTag = VisBase.extend({ var name = this.get('tag').getName(); var isRemote = this.getIsRemote(); var isHg = this.gitEngine.getIsHg(); - + return name; }, @@ -341,7 +341,7 @@ var VisTag = VisBase.extend({ if (this.getIsGoalAndNotCompared()) { return this.get('stroke-width') / 5.0; } - + return this.get('stroke-width'); }, diff --git a/src/js/visuals/visualization.js b/src/js/visuals/visualization.js index 0adf4930..247851cf 100644 --- a/src/js/visuals/visualization.js +++ b/src/js/visuals/visualization.js @@ -261,8 +261,9 @@ var Visualization = Backbone.View.extend({ var smaller = 1; var el = this.el; - var width = el.clientWidth - smaller; - var height = el.clientHeight - smaller; + var elSize = el.getBoundingClientRect(); + var width = elSize.width - smaller; + var height = elSize.height - smaller; // if we don't have a container, we need to set our // position absolutely to whatever we are tracking