mirror of
https://github.com/chartjs/Chart.js.git
synced 2024-10-06 04:09:08 +02:00
Use HTTPS instead of HTTP for URLs supporting it
This commit is contained in:
parent
2388eeaf38
commit
52b9793ba0
@ -1,4 +1,4 @@
|
|||||||
# http://editorconfig.org
|
# https://editorconfig.org
|
||||||
root = true
|
root = true
|
||||||
|
|
||||||
[*]
|
[*]
|
||||||
|
4
.github/ISSUE_TEMPLATE.md
vendored
4
.github/ISSUE_TEMPLATE.md
vendored
@ -4,8 +4,8 @@ Please consider the following before submitting an issue:
|
|||||||
- Ask questions and get support on StackOverflow: https://stackoverflow.com/questions/tagged/chart.js
|
- Ask questions and get support on StackOverflow: https://stackoverflow.com/questions/tagged/chart.js
|
||||||
- DO NOT create issues for questions or support requests.
|
- DO NOT create issues for questions or support requests.
|
||||||
- Issues are reserved for BUG reports and FEATURE requests.
|
- Issues are reserved for BUG reports and FEATURE requests.
|
||||||
- Most features should start as plugins outside of Chart.js (http://www.chartjs.org/docs/#advanced-usage-creating-plugins).
|
- Most features should start as plugins outside of Chart.js (https://www.chartjs.org/docs/#advanced-usage-creating-plugins).
|
||||||
- Bug reports MUST be submitted with an interactive example (http://codepen.io/pen?template=JXVYzq).
|
- Bug reports MUST be submitted with an interactive example (https://codepen.io/pen?template=JXVYzq).
|
||||||
- Chart.js 1.x is NOT supported anymore, new issues will be disregarded.
|
- Chart.js 1.x is NOT supported anymore, new issues will be disregarded.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
8
.github/PULL_REQUEST_TEMPLATE.md
vendored
8
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -4,8 +4,8 @@ Please consider the following before submitting a pull request:
|
|||||||
Guidelines for contributing: https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md
|
Guidelines for contributing: https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md
|
||||||
|
|
||||||
Example of changes on an interactive website such as the following:
|
Example of changes on an interactive website such as the following:
|
||||||
- http://jsbin.com/
|
- https://jsbin.com/
|
||||||
- http://jsfiddle.net/
|
- https://jsfiddle.net/
|
||||||
- http://codepen.io/pen/
|
- https://codepen.io/pen/
|
||||||
- Premade template: http://codepen.io/pen?template=JXVYzq
|
- Premade template: https://codepen.io/pen?template=JXVYzq
|
||||||
-->
|
-->
|
||||||
|
@ -5,7 +5,7 @@ Chart.js relies on [Travis CI](https://travis-ci.org/) to automate the library [
|
|||||||
### Releasing a New Version
|
### Releasing a New Version
|
||||||
|
|
||||||
1. draft release notes on [GitHub](https://github.com/chartjs/Chart.js/releases/new) for the upcoming tag
|
1. draft release notes on [GitHub](https://github.com/chartjs/Chart.js/releases/new) for the upcoming tag
|
||||||
1. update `master` `package.json` version using [semver](http://semver.org/) semantic
|
1. update `master` `package.json` version using [semver](https://semver.org/) semantic
|
||||||
1. merge `master` into the `release` branch
|
1. merge `master` into the `release` branch
|
||||||
1. follow the build process on [Travis CI](https://travis-ci.org/chartjs/Chart.js)
|
1. follow the build process on [Travis CI](https://travis-ci.org/chartjs/Chart.js)
|
||||||
|
|
||||||
|
10
README.md
10
README.md
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
[![travis](https://img.shields.io/travis/chartjs/Chart.js.svg?style=flat-square&maxAge=60)](https://travis-ci.org/chartjs/Chart.js) [![coveralls](https://img.shields.io/coveralls/chartjs/Chart.js.svg?style=flat-square&maxAge=600)](https://coveralls.io/github/chartjs/Chart.js?branch=master) [![codeclimate](https://img.shields.io/codeclimate/maintainability/chartjs/Chart.js.svg?style=flat-square&maxAge=600)](https://codeclimate.com/github/chartjs/Chart.js) [![slack](https://img.shields.io/badge/slack-chartjs-blue.svg?style=flat-square&maxAge=3600)](https://chartjs-slack.herokuapp.com/)
|
[![travis](https://img.shields.io/travis/chartjs/Chart.js.svg?style=flat-square&maxAge=60)](https://travis-ci.org/chartjs/Chart.js) [![coveralls](https://img.shields.io/coveralls/chartjs/Chart.js.svg?style=flat-square&maxAge=600)](https://coveralls.io/github/chartjs/Chart.js?branch=master) [![codeclimate](https://img.shields.io/codeclimate/maintainability/chartjs/Chart.js.svg?style=flat-square&maxAge=600)](https://codeclimate.com/github/chartjs/Chart.js) [![slack](https://img.shields.io/badge/slack-chartjs-blue.svg?style=flat-square&maxAge=3600)](https://chartjs-slack.herokuapp.com/)
|
||||||
|
|
||||||
*Simple HTML5 Charts using the canvas element* [chartjs.org](http://www.chartjs.org)
|
*Simple HTML5 Charts using the canvas element* [chartjs.org](https://www.chartjs.org)
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
@ -28,7 +28,7 @@ Files:
|
|||||||
* `dist/Chart.js`
|
* `dist/Chart.js`
|
||||||
* `dist/Chart.min.js`
|
* `dist/Chart.min.js`
|
||||||
|
|
||||||
The stand-alone build includes Chart.js as well as the color parsing library. If this version is used, you are required to include [Moment.js](http://momentjs.com/) before Chart.js for the functionality of the time axis.
|
The stand-alone build includes Chart.js as well as the color parsing library. If this version is used, you are required to include [Moment.js](https://momentjs.com/) before Chart.js for the functionality of the time axis.
|
||||||
|
|
||||||
#### Bundled Build
|
#### Bundled Build
|
||||||
Files:
|
Files:
|
||||||
@ -39,11 +39,11 @@ The bundled build includes Moment.js in a single file. You should use this versi
|
|||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
You can find documentation at [www.chartjs.org/docs](http://www.chartjs.org/docs). The markdown files that build the site are available under `/docs`. Previous version documentation is available at [www.chartjs.org/docs/latest/developers/#previous-versions](http://www.chartjs.org/docs/latest/developers/#previous-versions).
|
You can find documentation at [www.chartjs.org/docs](https://www.chartjs.org/docs). The markdown files that build the site are available under `/docs`. Previous version documentation is available at [www.chartjs.org/docs/latest/developers/#previous-versions](https://www.chartjs.org/docs/latest/developers/#previous-versions).
|
||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
||||||
Before submitting an issue or a pull request, please take a moment to look over the [contributing guidelines](https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md) first. For support using Chart.js, please post questions with the [`chartjs` tag on Stack Overflow](http://stackoverflow.com/questions/tagged/chartjs).
|
Before submitting an issue or a pull request, please take a moment to look over the [contributing guidelines](https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md) first. For support using Chart.js, please post questions with the [`chartjs` tag on Stack Overflow](https://stackoverflow.com/questions/tagged/chartjs).
|
||||||
|
|
||||||
## Building
|
## Building
|
||||||
Instructions on building and testing Chart.js can be found in [the documentation](https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md#building-and-testing).
|
Instructions on building and testing Chart.js can be found in [the documentation](https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md#building-and-testing).
|
||||||
@ -54,4 +54,4 @@ Instructions on building and testing Chart.js can be found in [the documentation
|
|||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
Chart.js is available under the [MIT license](http://opensource.org/licenses/MIT).
|
Chart.js is available under the [MIT license](https://opensource.org/licenses/MIT).
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
"chart",
|
"chart",
|
||||||
"js"
|
"js"
|
||||||
],
|
],
|
||||||
"homepage": "http://www.chartjs.org/",
|
"homepage": "https://www.chartjs.org/",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
|
@ -16,7 +16,7 @@ Latest builds are available for testing at:
|
|||||||
- https://www.chartjs.org/dist/master/Chart.min.js
|
- https://www.chartjs.org/dist/master/Chart.min.js
|
||||||
- https://www.chartjs.org/dist/master/Chart.bundle.min.js
|
- https://www.chartjs.org/dist/master/Chart.bundle.min.js
|
||||||
|
|
||||||
> Note: Development builds are currently only available via HTTP, so in order to include them in [JSFiddle](http://jsfiddle.net) or [CodePen](http://codepen.io), you need to access these tools via HTTP as well.
|
> Note: Development builds are currently only available via HTTP, so in order to include them in [JSFiddle](https://jsfiddle.net) or [CodePen](https://codepen.io), you need to access these tools via HTTP as well.
|
||||||
|
|
||||||
**WARNING: Development builds MUST not be used for production purposes or as replacement for CDN.**
|
**WARNING: Development builds MUST not be used for production purposes or as replacement for CDN.**
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
}
|
}
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
var scatterChartData = {
|
var scatterChartData = {
|
||||||
datasets: [{
|
datasets: [{
|
||||||
label: 'My First dataset',
|
label: 'My First dataset',
|
||||||
|
@ -16,8 +16,8 @@
|
|||||||
<div class="chartjs-title">Samples</div>
|
<div class="chartjs-title">Samples</div>
|
||||||
<div class="chartjs-caption">Simple yet flexible JavaScript charting for designers & developers</div>
|
<div class="chartjs-caption">Simple yet flexible JavaScript charting for designers & developers</div>
|
||||||
<div class="chartjs-links">
|
<div class="chartjs-links">
|
||||||
<a class="btn btn-chartjs" href="http://www.chartjs.org">Website</a>
|
<a class="btn btn-chartjs" href="https://www.chartjs.org">Website</a>
|
||||||
<a class="btn btn-docs" href="http://www.chartjs.org/docs">Documentation</a>
|
<a class="btn btn-docs" href="https://www.chartjs.org/docs">Documentation</a>
|
||||||
<a class="btn btn-gh" href="https://github.com/chartjs/Chart.js">GitHub</a>
|
<a class="btn btn-gh" href="https://github.com/chartjs/Chart.js">GitHub</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -405,7 +405,7 @@ module.exports = function() {
|
|||||||
|
|
||||||
return niceFraction * Math.pow(10, exponent);
|
return niceFraction * Math.pow(10, exponent);
|
||||||
};
|
};
|
||||||
// Request animation polyfill - http://www.paulirish.com/2011/requestanimationframe-for-smart-animating/
|
// Request animation polyfill - https://www.paulirish.com/2011/requestanimationframe-for-smart-animating/
|
||||||
helpers.requestAnimFrame = (function() {
|
helpers.requestAnimFrame = (function() {
|
||||||
if (typeof window === 'undefined') {
|
if (typeof window === 'undefined') {
|
||||||
return function(callback) {
|
return function(callback) {
|
||||||
@ -440,7 +440,7 @@ module.exports = function() {
|
|||||||
|
|
||||||
// Scale mouse coordinates into canvas coordinates
|
// Scale mouse coordinates into canvas coordinates
|
||||||
// by following the pattern laid out by 'jerryj' in the comments of
|
// by following the pattern laid out by 'jerryj' in the comments of
|
||||||
// http://www.html5canvastutorials.com/advanced/html5-canvas-mouse-coordinates/
|
// https://www.html5canvastutorials.com/advanced/html5-canvas-mouse-coordinates/
|
||||||
var paddingLeft = parseFloat(helpers.getStyle(canvas, 'padding-left'));
|
var paddingLeft = parseFloat(helpers.getStyle(canvas, 'padding-left'));
|
||||||
var paddingTop = parseFloat(helpers.getStyle(canvas, 'padding-top'));
|
var paddingTop = parseFloat(helpers.getStyle(canvas, 'padding-top'));
|
||||||
var paddingRight = parseFloat(helpers.getStyle(canvas, 'padding-right'));
|
var paddingRight = parseFloat(helpers.getStyle(canvas, 'padding-right'));
|
||||||
@ -489,7 +489,7 @@ module.exports = function() {
|
|||||||
// @param domNode : the node to check the constraint on
|
// @param domNode : the node to check the constraint on
|
||||||
// @param maxStyle : the style that defines the maximum for the direction we are using (maxWidth / maxHeight)
|
// @param maxStyle : the style that defines the maximum for the direction we are using (maxWidth / maxHeight)
|
||||||
// @param percentageProperty : property of parent to use when calculating width as a percentage
|
// @param percentageProperty : property of parent to use when calculating width as a percentage
|
||||||
// @see http://www.nathanaeljones.com/blog/2013/reading-max-width-cross-browser
|
// @see https://www.nathanaeljones.com/blog/2013/reading-max-width-cross-browser
|
||||||
function getConstraintDimension(domNode, maxStyle, percentageProperty) {
|
function getConstraintDimension(domNode, maxStyle, percentageProperty) {
|
||||||
var view = document.defaultView;
|
var view = document.defaultView;
|
||||||
var parentNode = helpers._getParentNode(domNode);
|
var parentNode = helpers._getParentNode(domNode);
|
||||||
|
@ -128,7 +128,7 @@ var helpers = {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns true if the `a0` and `a1` arrays have the same content, else returns false.
|
* Returns true if the `a0` and `a1` arrays have the same content, else returns false.
|
||||||
* @see http://stackoverflow.com/a/14853974
|
* @see https://stackoverflow.com/a/14853974
|
||||||
* @param {Array} a0 - The array to compare
|
* @param {Array} a0 - The array to compare
|
||||||
* @param {Array} a1 - The array to compare
|
* @param {Array} a1 - The array to compare
|
||||||
* @returns {Boolean}
|
* @returns {Boolean}
|
||||||
|
@ -305,7 +305,7 @@ function removeResizeListener(node) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function injectCSS(platform, css) {
|
function injectCSS(platform, css) {
|
||||||
// http://stackoverflow.com/q/3922139
|
// https://stackoverflow.com/q/3922139
|
||||||
var style = platform._style || document.createElement('style');
|
var style = platform._style || document.createElement('style');
|
||||||
if (!platform._style) {
|
if (!platform._style) {
|
||||||
platform._style = style;
|
platform._style = style;
|
||||||
|
@ -12,7 +12,7 @@ var Scale = require('../core/core.scale');
|
|||||||
function generateTicks(generationOptions, dataRange) {
|
function generateTicks(generationOptions, dataRange) {
|
||||||
var ticks = [];
|
var ticks = [];
|
||||||
// To get a "nice" value for the tick spacing, we will use the appropriately named
|
// To get a "nice" value for the tick spacing, we will use the appropriately named
|
||||||
// "nice number" algorithm. See http://stackoverflow.com/questions/8506881/nice-label-algorithm-for-charts-with-minimum-ticks
|
// "nice number" algorithm. See https://stackoverflow.com/questions/8506881/nice-label-algorithm-for-charts-with-minimum-ticks
|
||||||
// for details.
|
// for details.
|
||||||
|
|
||||||
var stepSize = generationOptions.stepSize;
|
var stepSize = generationOptions.stepSize;
|
||||||
|
@ -130,7 +130,7 @@ function buildLookupTable(timestamps, min, max, distribution) {
|
|||||||
return table;
|
return table;
|
||||||
}
|
}
|
||||||
|
|
||||||
// @see adapted from http://www.anujgakhar.com/2014/03/01/binary-search-in-javascript/
|
// @see adapted from https://www.anujgakhar.com/2014/03/01/binary-search-in-javascript/
|
||||||
function lookup(table, key, value) {
|
function lookup(table, key, value) {
|
||||||
var lo = 0;
|
var lo = 0;
|
||||||
var hi = table.length - 1;
|
var hi = table.length - 1;
|
||||||
@ -179,7 +179,7 @@ function interpolate(table, skey, sval, tkey) {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert the given value to a moment object using the given time options.
|
* Convert the given value to a moment object using the given time options.
|
||||||
* @see http://momentjs.com/docs/#/parsing/
|
* @see https://momentjs.com/docs/#/parsing/
|
||||||
*/
|
*/
|
||||||
function momentify(value, options) {
|
function momentify(value, options) {
|
||||||
var parser = options.parser;
|
var parser = options.parser;
|
||||||
@ -448,15 +448,15 @@ module.exports = function() {
|
|||||||
bounds: 'data',
|
bounds: 'data',
|
||||||
|
|
||||||
time: {
|
time: {
|
||||||
parser: false, // false == a pattern string from http://momentjs.com/docs/#/parsing/string-format/ or a custom callback that converts its argument to a moment
|
parser: false, // false == a pattern string from https://momentjs.com/docs/#/parsing/string-format/ or a custom callback that converts its argument to a moment
|
||||||
format: false, // DEPRECATED false == date objects, moment object, callback or a pattern string from http://momentjs.com/docs/#/parsing/string-format/
|
format: false, // DEPRECATED false == date objects, moment object, callback or a pattern string from https://momentjs.com/docs/#/parsing/string-format/
|
||||||
unit: false, // false == automatic or override with week, month, year, etc.
|
unit: false, // false == automatic or override with week, month, year, etc.
|
||||||
round: false, // none, or override with week, month, year, etc.
|
round: false, // none, or override with week, month, year, etc.
|
||||||
displayFormat: false, // DEPRECATED
|
displayFormat: false, // DEPRECATED
|
||||||
isoWeekday: false, // override week start day - see http://momentjs.com/docs/#/get-set/iso-weekday/
|
isoWeekday: false, // override week start day - see https://momentjs.com/docs/#/get-set/iso-weekday/
|
||||||
minUnit: 'millisecond',
|
minUnit: 'millisecond',
|
||||||
|
|
||||||
// defaults to unit's corresponding unitFormat below or override using pattern string from http://momentjs.com/docs/#/displaying/format/
|
// defaults to unit's corresponding unitFormat below or override using pattern string from https://momentjs.com/docs/#/displaying/format/
|
||||||
displayFormats: {
|
displayFormats: {
|
||||||
millisecond: 'h:mm:ss.SSS a', // 11:20:01.123 AM,
|
millisecond: 'h:mm:ss.SSS a', // 11:20:01.123 AM,
|
||||||
second: 'h:mm:ss a', // 11:20:01 AM
|
second: 'h:mm:ss a', // 11:20:01 AM
|
||||||
|
@ -7,7 +7,7 @@ globals:
|
|||||||
moment: true
|
moment: true
|
||||||
waitForResize: true
|
waitForResize: true
|
||||||
|
|
||||||
# http://eslint.org/docs/rules/
|
# https://eslint.org/docs/rules/
|
||||||
rules:
|
rules:
|
||||||
# Best Practices
|
# Best Practices
|
||||||
complexity: 0
|
complexity: 0
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// Code from http://stackoverflow.com/questions/4406864/html-canvas-unit-testing
|
// Code from https://stackoverflow.com/questions/4406864/html-canvas-unit-testing
|
||||||
var Context = function() {
|
var Context = function() {
|
||||||
this._calls = []; // names/args of recorded calls
|
this._calls = []; // names/args of recorded calls
|
||||||
this._initMethods();
|
this._initMethods();
|
||||||
|
@ -11,7 +11,7 @@ describe('Chart.layouts', function() {
|
|||||||
|
|
||||||
// Disable tests which need to be rewritten based on changes introduced by
|
// Disable tests which need to be rewritten based on changes introduced by
|
||||||
// the following changes: https://github.com/chartjs/Chart.js/pull/2346
|
// the following changes: https://github.com/chartjs/Chart.js/pull/2346
|
||||||
// using xit marks the test as pending: http://jasmine.github.io/2.0/introduction.html#section-Pending_Specs
|
// using xit marks the test as pending: https://jasmine.github.io/2.0/introduction.html#section-Pending_Specs
|
||||||
xit('should fit a simple chart with 2 scales', function() {
|
xit('should fit a simple chart with 2 scales', function() {
|
||||||
var chart = window.acquireChart({
|
var chart = window.acquireChart({
|
||||||
type: 'bar',
|
type: 'bar',
|
||||||
|
@ -217,7 +217,7 @@ describe('Legend block tests', function() {
|
|||||||
|
|
||||||
// NOTE(SB) We should get ride of the following tests and use image diff instead.
|
// NOTE(SB) We should get ride of the following tests and use image diff instead.
|
||||||
// For now, as discussed with Evert Timberg, simply comment out.
|
// For now, as discussed with Evert Timberg, simply comment out.
|
||||||
// See http://humblesoftware.github.io/js-imagediff/test.html
|
// See https://humblesoftware.github.io/js-imagediff/test.html
|
||||||
/* chart.legend.ctx = window.createMockContext();
|
/* chart.legend.ctx = window.createMockContext();
|
||||||
chart.update();
|
chart.update();
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ function releaseChart(chart) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function injectCSS(css) {
|
function injectCSS(css) {
|
||||||
// http://stackoverflow.com/q/3922139
|
// https://stackoverflow.com/q/3922139
|
||||||
var head = document.getElementsByTagName('head')[0];
|
var head = document.getElementsByTagName('head')[0];
|
||||||
var style = document.createElement('style');
|
var style = document.createElement('style');
|
||||||
style.setAttribute('type', 'text/css');
|
style.setAttribute('type', 'text/css');
|
||||||
|
Loading…
Reference in New Issue
Block a user