Fix #507 - calculate container width and heigh without padding

diff --git a/src/Chart.Core.js b/src/Chart.Core.js
index 03b99b45a582e69ae57ea79f3ed3e5bbae3bb0d1..fb171451dd8f61948c11440ae28defb62c70a06d 100755 (executable)
--- a/src/Chart.Core.js
+++ b/src/Chart.Core.js
@@ -238,7 +238,7 @@
                                if (filterCallback(currentItem)){
                                        return currentItem;
                                }
-                       };
+                       }
                },
                findPreviousWhere = helpers.findPreviousWhere = function(arrayToSearch, filterCallback, startIndex){
                        // Default to end of the array
@@ -250,7 +250,7 @@
                                if (filterCallback(currentItem)){
                                        return currentItem;
                                }
-                       };
+                       }
                },
                inherits = helpers.inherits = function(extensions){
                        //Basic javascript inheritance based on the model created in Backbone.js
@@ -738,14 +738,21 @@
                        });
                },
                getMaximumWidth = helpers.getMaximumWidth = function(domNode){
-                       var container = domNode.parentNode;
+                       var container = domNode.parentNode,
+                           padding = parseInt(getStyle(container, 'padding-left')) + parseInt(getStyle(container, 'padding-right'));
                        // TODO = check cross browser stuff with this.
-                       return container.clientWidth;
+                       return container.clientWidth - padding;
                },
                getMaximumHeight = helpers.getMaximumHeight = function(domNode){
-                       var container = domNode.parentNode;
+                       var container = domNode.parentNode,
+                           padding = parseInt(getStyle(container, 'padding-bottom')) + parseInt(getStyle(container, 'padding-top'));
                        // TODO = check cross browser stuff with this.
-                       return container.clientHeight;
+                       return container.clientHeight - padding;
+               },
+               getStyle = helpers.getStyle = function (el, property) {
+                       return el.currentStyle ?
+                               el.currentStyle[property] :
+                               document.defaultView.getComputedStyle(el, null).getPropertyValue(property);
                },
                getMaximumSize = helpers.getMaximumSize = helpers.getMaximumWidth, // legacy support
                retinaScale = helpers.retinaScale = function(chart){