Updates

TargetProcess · Jan 26, 2015 · abd0d94 · abd0d94
1 parent b43ada6
commit abd0d94
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "tauCharts",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "homepage": "https://github.com/TargetProcess/tauCharts",
   "description": "Simple charts library based on d3",
   "keywords": [

diff --git a/build/development/plugins/tauCharts.export.js b/build/development/plugins/tauCharts.export.js
@@ -5999,7 +5999,7 @@ define('../node_modules/requirejs-text/text',['module'], function (module) {
 });
 
 
-define('../node_modules/requirejs-text/text!print.style.css',[],function () { return 'body > * {\n    visibility: hidden;\n}\nbody {\n    overflow: hidden;\n}\nbody * {\n    visibility: hidden !important;\n}\n\n.graphical-report__print-block {\n    position: absolute;\n    top: 0;\n    left: 0;\n    visibility: visible !important;\n    display: block !important;\n    width: 100%;\n    /*height: 100%;*/\n}\n';});
+define('../node_modules/requirejs-text/text!print.style.css',[],function () { return 'body > * {\r\n    visibility: hidden;\r\n}\r\nbody {\r\n    overflow: hidden;\r\n}\r\nbody * {\r\n    visibility: hidden !important;\r\n}\r\n\r\n.graphical-report__print-block {\r\n    position: absolute;\r\n    top: 0;\r\n    left: 0;\r\n    visibility: visible !important;\r\n    display: block !important;\r\n    width: 100%;\r\n    /*height: 100%;*/\r\n}\r\n';});
 
 (function() {
 

diff --git a/build/development/tauCharts.js b/build/development/tauCharts.js
@@ -1,4 +1,4 @@
-/*! taucharts - v0.3.12 - 2015-01-26
+/*! taucharts - v0.3.13 - 2015-01-26
 * https://github.com/TargetProcess/tauCharts
 * Copyright (c) 2015 Taucraft Limited; Licensed Apache License 2.0 */
 (function (root, factory) {
@@ -4984,9 +4984,9 @@ define('node-map',["exports", "./elements/coords", "./elements/line", "./element
   var CoordsParallelLine = _elementsCoordsParallelLine.CoordsParallelLine;
 
 
-  var fitSize = function (w, h, maxRel, srcSize, minimalSize) {
+  var fitSize = function (w, h, maxRelLimit, srcSize, minimalSize) {
     var minRefPoint = Math.min(w, h);
-    var minSize = minRefPoint * maxRel;
+    var minSize = minRefPoint * maxRelLimit;
     return Math.max(minimalSize, Math.min(srcSize, minSize));
   };
 
@@ -5010,15 +5010,16 @@ define('node-map',["exports", "./elements/coords", "./elements/line", "./element
     node.options.color = node.scaleColor(node.color.scaleDim, guideColor.brewer, guideColor);
 
     if (node.size) {
-      var minimalSize = 2;
+      var minimalSize = 1;
+      var maxRelLimit = 0.035;
       var minFontSize = _.min([node.guide.x.tickFontHeight, node.guide.y.tickFontHeight].filter(function (x) {
         return x !== 0;
       })) * 0.5;
       var minTickStep = _.min([node.guide.x.density, node.guide.y.density].filter(function (x) {
         return x !== 0;
       })) * 0.5;
       var guideSize = node.guide.size || {};
-      node.options.sizeScale = node.scaleSize(node.size.scaleDim, [minimalSize, fitSize(W, H, 0.1, minTickStep, minimalSize), fitSize(W, H, 0.1, minFontSize, minimalSize)], guideSize);
+      node.options.sizeScale = node.scaleSize(node.size.scaleDim, [fitSize(W, H, maxRelLimit, 2, minimalSize), fitSize(W, H, maxRelLimit, minTickStep, minimalSize), fitSize(W, H, maxRelLimit, minFontSize, minimalSize)], guideSize);
     }
 
     return node;

diff --git a/build/production/tauCharts.min.css b/build/production/tauCharts.min.css
diff --git a/build/production/tauCharts.min.js b/build/production/tauCharts.min.js
diff --git a/component.json b/component.json
@@ -1,6 +1,6 @@
 {
   "name": "tauCharts",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "ignore": [
     "/*",
     "!build/**",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "taucharts",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "homepage": "https://github.com/TargetProcess/tauCharts",
   "description": "Simple charts library based on d3",
   "author": {
-Original file line number
+Diff line change
@@ Expand Up @@
     });
-    define('../node_modules/requirejs-text/text!print.style.css',[],function () { return 'body > * {\n    visibility: hidden;\n}\nbody {\n    overflow: hidden;\n}\nbody * {\n    visibility: hidden !important;\n}\n\n.graphical-report__print-block {\n    position: absolute;\n    top: 0;\n    left: 0;\n    visibility: visible !important;\n    display: block !important;\n    width: 100%;\n    /*height: 100%;*/\n}\n';});
+    define('../node_modules/requirejs-text/text!print.style.css',[],function () { return 'body > * {\r\n    visibility: hidden;\r\n}\r\nbody {\r\n    overflow: hidden;\r\n}\r\nbody * {\r\n    visibility: hidden !important;\r\n}\r\n\r\n.graphical-report__print-block {\r\n    position: absolute;\r\n    top: 0;\r\n    left: 0;\r\n    visibility: visible !important;\r\n    display: block !important;\r\n    width: 100%;\r\n    /*height: 100%;*/\r\n}\r\n';});
     (function() {
@@ Expand Down @@