Skip to content

Commit

Permalink
prep work for 0.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
benkeen committed Jun 6, 2014
1 parent 07fe5a8 commit a99e889
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 21 deletions.
7 changes: 3 additions & 4 deletions d3pie-source/d3pie-source.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/*!
* d3pie
* @author Ben Keen
* @version 0.1.0
* @version 0.1.2
* @date Apr 2014
* http://github.com/benkeen/d3pie
*/
;(function($) {
"use strict";

var _scriptName = "d3pie";
var _version = "0.1.0";
var _version = "0.1.2";

// used to uniquely generate IDs and classes, ensuring no conflict between multiple pies on the same page
var _uniqueIDCounter = 0;
Expand All @@ -26,7 +26,6 @@
//<%=_segments%>
//<%=_text%>


// --------------------------------------------------------------------------------------------

// our constructor
Expand All @@ -44,7 +43,7 @@

this.options = $.extend(true, {}, defaultSettings, options);

// if the user specified a custom CSS element prefix (ID, class), use it. Otherwise use the
// if the user specified a custom CSS element prefix (ID, class), use it
if (this.options.misc.cssPrefix !== null) {
this.cssPrefix = this.options.misc.cssPrefix;
} else {
Expand Down
7 changes: 3 additions & 4 deletions d3pie/d3pie.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/*!
* d3pie
* @author Ben Keen
* @version 0.1.0
* @version 0.1.2
* @date Apr 2014
* http://github.com/benkeen/d3pie
*/
;(function($) {
"use strict";

var _scriptName = "d3pie";
var _version = "0.1.0";
var _version = "0.1.2";

// used to uniquely generate IDs and classes, ensuring no conflict between multiple pies on the same page
var _uniqueIDCounter = 0;
Expand Down Expand Up @@ -1460,7 +1460,6 @@ var text = {
}
};


// --------------------------------------------------------------------------------------------

// our constructor
Expand All @@ -1478,7 +1477,7 @@ var text = {

this.options = $.extend(true, {}, defaultSettings, options);

// if the user specified a custom CSS element prefix (ID, class), use it. Otherwise use the
// if the user specified a custom CSS element prefix (ID, class), use it
if (this.options.misc.cssPrefix !== null) {
this.cssPrefix = this.options.misc.cssPrefix;
} else {
Expand Down
2 changes: 1 addition & 1 deletion d3pie/d3pie.min.js

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
module.exports = function(grunt) {
"use strict";

var fs = require('fs');
var vm = require('vm');
var fs = require("fs");
var vm = require("vm");
var _includeInThisScope = function (path) {
var code = fs.readFileSync(path);
vm.runInThisContext(code, path);
}.bind(this);
var packageFile = grunt.file.readJSON("package.json");

grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-template');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-requirejs');
grunt.loadNpmTasks('grunt-md5');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-contrib-handlebars');
grunt.loadNpmTasks("grunt-contrib-clean");
grunt.loadNpmTasks("grunt-template");
grunt.loadNpmTasks("grunt-contrib-watch");
grunt.loadNpmTasks("grunt-contrib-uglify");
grunt.loadNpmTasks("grunt-contrib-requirejs");
grunt.loadNpmTasks("grunt-md5");
grunt.loadNpmTasks("grunt-contrib-copy");
grunt.loadNpmTasks("grunt-contrib-cssmin");
grunt.loadNpmTasks("grunt-contrib-handlebars");

_includeInThisScope("website/grunt-templates/file-paths.js");
_includeInThisScope("website/grunt-templates/env-specific-constants.js");
Expand All @@ -35,6 +35,7 @@ module.exports = function(grunt) {
_validate: fs.readFileSync("d3pie-source/_validate.js", 'utf8')
};
grunt.task.run("template:d3pieBundle");
grunt.task.run("uglify:d3pie");
};

/**
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "d3pie",
"version": "0.1.1",
"version": "0.1.2",
"description": "A pie chart script and generator build on d3.js.",
"main": "index.html",
"scripts": {
Expand Down

0 comments on commit a99e889

Please sign in to comment.