0.2.1

benkeen · Mar 11, 2017 · 9aebe14 · 9aebe14
1 parent 1db3c2e
commit 9aebe14
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -61,6 +61,7 @@ Lots! A big thanks to the developers of these scripts.
 
 ### Changelog
 
+- `0.2.1` - Mar 11, 2017. Minification fix.
 - `0.2.0` - Mar 11, 2017. Bug fixes, compatibility update for d3 version 4.
 - `0.1.9` - Jun 17, 2015. UMD fix. *This is the last version that supports d3 v3.x*. 
 - `0.1.8` - May 1, 2015. Bug fix release. 

diff --git a/d3pie-source/d3pie-source.js b/d3pie-source/d3pie-source.js
@@ -22,7 +22,7 @@
 }(this, function() {
 
 	var _scriptName = "d3pie";
-	var _version = "0.2.0";
+	var _version = "0.2.1";
 
 	// used to uniquely generate IDs and classes, ensuring no conflict between multiple pies on the same page
 	var _uniqueIDCounter = 0;
@@ -332,7 +332,7 @@
 		});
 	};
 
-	_getPercentage = function(value, total, decimalPlaces) {
+	var _getPercentage = function(value, total, decimalPlaces) {
 		var relativeAmount = value / total;
 		if (decimalPlaces <= 0) {
 			return Math.round(relativeAmount * 100);

diff --git a/d3pie/d3pie.js b/d3pie/d3pie.js
@@ -22,7 +22,7 @@
 }(this, function() {
 
 	var _scriptName = "d3pie";
-	var _version = "0.2.0";
+	var _version = "0.2.1";
 
 	// used to uniquely generate IDs and classes, ensuring no conflict between multiple pies on the same page
 	var _uniqueIDCounter = 0;
@@ -2164,7 +2164,7 @@ var tt = {
 		});
 	};
 
-	_getPercentage = function(value, total, decimalPlaces) {
+	var _getPercentage = function(value, total, decimalPlaces) {
 		var relativeAmount = value / total;
 		if (decimalPlaces <= 0) {
 			return Math.round(relativeAmount * 100);

diff --git a/d3pie/d3pie.min.js b/d3pie/d3pie.min.js
diff --git a/gruntfile.js b/gruntfile.js
@@ -167,7 +167,7 @@ module.exports = function(grunt) {
 						"* d3pie\n" +
 						"* @author Ben Keen\n" +
 						"* @version " + packageFile.version + "\n" +
-						"* @date April 2015\n" +
+						"* @date March 11, 2017\n" +
 						"* @repo http://github.com/benkeen/d3pie\n" +
 						"*/\n"
 				}

diff --git a/index.html b/index.html
@@ -7,20 +7,18 @@
 	<link href="http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700" rel="stylesheet" type="text/css">
 	<link href="http://fonts.googleapis.com/css?family=Cinzel:300italic,400italic,700italic,400,300,700" rel="stylesheet" type="text/css">
 	<link href="http://fonts.googleapis.com/css?family=Exo:400" rel="stylesheet" type="text/css">
+
+
+	<link href="build/css/core-965cf3c945afce4a3d4c1440242db649.css" type="text/css" rel="stylesheet" />
 
-	<link href="website/css/site.css" type="text/css" rel="stylesheet" />
-	<link href="website/css/bootstrap.css" type="text/css" rel="stylesheet" />
-	<link href="website/css/bootstrap-colorpicker.css" type="text/css" rel="stylesheet" />
-	<link href="website/css/prettify.css" type="text/css" rel="stylesheet" />
-	<link href="website/css/slides.css" type="text/css" rel="stylesheet" />
 </head>
 <body>
 
 <div class="navbar navbar-inverse">
 	<div class="navbar-header">
 		<div class="navbar-brand">
 			d3pie
-			<span class="scriptVersion">0.2.0</span>
+			<span class="scriptVersion">0.2.1</span>
 		</div>
 		<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
 			<span class="sr-only">Toggle navigation</span>
@@ -34,10 +32,10 @@
 			<li id="mainNav1"><a href="#about" class="selectPage">About d3pie</a></li>
 			<li id="mainNav2"><a href="#generator" class="selectPage">Generator</a></li>
 			<li><a href="#download" class="selectPage">Download</a></li>
-			<li><a href="#help" class="selectPage">Doc</a></li>
+			<li><a href="#help" class="selectPage">Help</a></li>
 		</ul>
 		<ul class="nav navbar-nav navbar-right">
-			<li><a href="https://github.com/benkeen/d3pie">Github</a></li>
+			<li><a href="https://github.com/benkeen/d3pie">Fork on Github</a></li>
 		</ul>
 	</div>
 </div>
@@ -53,20 +51,11 @@
 </div>
 
 
-<script src="website/libs/jquery.js"></script>
-<script src="website/libs/jquery-ui.js"></script>
-<script src="website/libs/jquery.slides.js"></script>
 <script src="website/libs/d3.min.js"></script>
-<script src="d3pie-source/_default-settings.js"></script>
-<script src="website/libs/modernizr.js"></script>
-<script src="d3pie/d3pie.js"></script>
-<script src="website/libs/bootstrap.min.js"></script>
-<script src="website/libs/bootstrap-colorpicker.js"></script>
-<script src="website/libs/three.js"></script>
-<script src="website/libs/prettify.js"></script>
+<script src="build/core-libs.min-da0213f392eddb155400eaebc184048b.js"></script>
 <script src="website/libs/require.js"></script>
-<script src="website/core/require.config.js"></script>
-<script>require(["appStart"], function() { });</script>
+<script src="build/core/require.config.js"></script>
+<script>require(["build/core/appStartBuild-430b2502038f35c7e79a572ccb81702a.js"], function() { });</script>
 
 <script>
 	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d3pie",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A highly configurable, re-usable library built on d3.js for creating clear, attractive pie charts.",
   "homepage": "http://d3pie.org",
   "main": "d3pie/d3pie.js",

diff --git a/website/core/constants.js b/website/core/constants.js
@@ -1,9 +1,9 @@
 define([], function() {
 
 	var C = {
-		VERSION: "0.1.9",
-		MINIMIZED: false,
-		DEBUG: true
+		VERSION: "0.2.1",
+		MINIMIZED: true,
+		DEBUG: false
 	};
 
 	C.EVENT = {
@@ -31,4 +31,4 @@ define([], function() {
 	};
 
 	return C;
-});
+});
diff --git a/website/grunt-templates/template-index.html b/website/grunt-templates/template-index.html
@@ -57,8 +57,8 @@
 </div>
 
 <% if (C.MINIMIZED) { %>
-<script src="<%=CORE_JS%>"></script>
 <script src="website/libs/d3.min.js"></script>
+<script src="<%=CORE_JS%>"></script>
 <script src="website/libs/require.js"></script>
 <script src="build/core/require.config.js"></script>
 <script>require(["<%=APP_START_FILE%>"], function() { });</script>
@@ -89,4 +89,4 @@
 </script>
 
 </body>
-</html>
+</html>