Merge pull request #731 from palantir/slate-quickfix

fix _getParsedStyle() and Label._requestedSpace
palantir · Jul 22, 2014 · bd6bbaa · bd6bbaa
2 parents af33ff1 + 08c1079
commit bd6bbaa
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/plottable.js b/plottable.js
@@ -1017,10 +1017,11 @@ var Plottable;
 
             function _getParsedStyleValue(style, prop) {
                 var value = style.getPropertyValue(prop);
-                if (value == null) {
+                var parsedValue = parseFloat(value);
+                if (parsedValue !== parsedValue) {
                     return 0;
                 }
-                return parseFloat(value);
+                return parsedValue;
             }
 
             //
@@ -5403,6 +5404,14 @@ var Plottable;
 
             Legend.prototype._requestedSpace = function (offeredWidth, offeredY) {
                 var textHeight = this.measureTextHeight();
+                if (textHeight === 0) {
+                    return {
+                        width: 0,
+                        height: 0,
+                        wantsWidth: false,
+                        wantsHeight: false
+                    };
+                }
                 var totalNumRows = this.colorScale.domain().length;
                 var rowsICanFit = Math.min(totalNumRows, Math.floor(offeredY / textHeight));
 

diff --git a/src/components/legend.ts b/src/components/legend.ts
@@ -140,6 +140,14 @@ export module Component {
 
     public _requestedSpace(offeredWidth: number, offeredY: number): ISpaceRequest {
       var textHeight = this.measureTextHeight();
+      if (textHeight === 0) {
+          return {
+              width: 0,
+              height: 0,
+              wantsWidth: false,
+              wantsHeight: false
+          };
+      }
       var totalNumRows = this.colorScale.domain().length;
       var rowsICanFit = Math.min(totalNumRows, Math.floor(offeredY / textHeight));
 

diff --git a/src/utils/domUtils.ts b/src/utils/domUtils.ts
@@ -22,10 +22,11 @@ export module Util {
 
     function _getParsedStyleValue(style: CSSStyleDeclaration, prop: string): number {
       var value: any = style.getPropertyValue(prop);
-      if (value == null){
-        return 0;
+      var parsedValue = parseFloat(value);
+      if (parsedValue !== parsedValue) {
+          return 0;
       }
-      return parseFloat(value);
+      return parsedValue;
     }
 
     //