Merge branch 'master' into development

11 years ago · 37ca61f8d1
parent 6752bf5cc8 b8b06c75a4
commit 37ca61f8d1
3 changed files with 13 additions and 11 deletions
--- a/bower.json
+++ b/bower.json
@ -18,7 +18,7 @@
  ],
  "license": "Apache License, v2.0",
  "dependencies": {
-    "d3": "3.3.5"
+    "d3": "~3.3.5"
  },
  "ignore" : [
    "**/.*",
--- a/nv.d3.js
+++ b/nv.d3.js
@ -975,7 +975,8 @@ Most common instance is when the element is in a display:none; container.
 Forumla is : text.length * font-size * constant_factor
 */
 nv.utils.calcApproxTextWidth = function (svgTextElem) {
-    if (svgTextElem instanceof d3.selection) {
+    if (typeof svgTextElem.style === 'function'
+        && typeof svgTextElem.text === 'function') {
        var fontSize = parseInt(svgTextElem.style("font-size").replace("px",""));
        var textLength = svgTextElem.text().length;

--- a/src/utils.js
+++ b/src/utils.js
@ -109,7 +109,8 @@ Most common instance is when the element is in a display:none; container.
 Forumla is : text.length * font-size * constant_factor
 */
 nv.utils.calcApproxTextWidth = function (svgTextElem) {
-    if (svgTextElem instanceof d3.selection) {
+    if (typeof svgTextElem.style === 'function'
+        && typeof svgTextElem.text === 'function') {
        var fontSize = parseInt(svgTextElem.style("font-size").replace("px",""));
        var textLength = svgTextElem.text().length;