Skip to content

Commit 5bd1029

Browse files
committed
Update built output
1 parent 55a1151 commit 5bd1029

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

Chart.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*!
22
* Chart.js
33
* http://chartjs.org/
4+
* Version: 1.0.1-beta.3
45
*
56
* Copyright 2014 Nick Downie
67
* Released under the MIT license
@@ -405,6 +406,12 @@
405406
//Templating methods
406407
//Javascript micro templating by John Resig - source at http://ejohn.org/blog/javascript-micro-templating/
407408
template = helpers.template = function(templateString, valuesObject){
409+
// If templateString is function rather than string-template - call the function for valuesObject
410+
if(templateString instanceof Function)
411+
{
412+
return templateString(valuesObject);
413+
}
414+
408415
var cache = {};
409416
function tmpl(str, data){
410417
// Figure out if we're getting a template, or if we need to

Chart.min.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Chart.js",
3-
"version": "1.0.1-beta.2",
3+
"version": "1.0.1-beta.3",
44
"description": "Simple HTML5 Charts using the canvas element",
55
"homepage": "https://github.com/nnnick/Chart.js",
66
"author": "nnnick",

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "chart.js",
33
"homepage": "http://www.chartjs.org",
44
"description": "Simple HTML5 charts using the canvas element.",
5-
"version": "1.0.1-beta.2",
5+
"version": "1.0.1-beta.3",
66
"main": "Chart.js",
77
"repository": {
88
"type": "git",
@@ -21,4 +21,4 @@
2121
"inquirer": "^0.5.1",
2222
"semver": "^3.0.1"
2323
}
24-
}
24+
}

0 commit comments

Comments
 (0)