Skip to content

Commit

Permalink
v8.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
TorsteinHonsi committed Jun 16, 2020
1 parent a20f9d6 commit 7f564e5
Show file tree
Hide file tree
Showing 439 changed files with 7,669 additions and 5,478 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "highcharts",
"version": "8.1.1",
"version": "8.1.2",
"main": "highcharts.js",
"license": "https://www.highcharts.com/license",
"types": "highcharts.d.ts"
Expand Down
3 changes: 0 additions & 3 deletions es-modules/annotations/annotations.src.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,6 @@ var Annotation = /** @class */ (function () {
* Constructors
*
* */
/**
* @private
*/
function Annotation(chart, userOptions) {
/* *
*
Expand Down
8 changes: 4 additions & 4 deletions es-modules/annotations/eventEmitterMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var eventEmitterMixin = {
*/
addEvents: function () {
var emitter = this, addMouseDownEvent = function (element) {
addEvent(element, Highcharts.isTouchDevice ? 'touchstart' : 'mousedown', function (e) {
addEvent(element, H.isTouchDevice ? 'touchstart' : 'mousedown', function (e) {
emitter.onMouseDown(e);
});
};
Expand All @@ -49,7 +49,7 @@ var eventEmitterMixin = {
}
});
if (emitter.options.draggable) {
addEvent(emitter, Highcharts.isTouchDevice ? 'touchmove' : 'drag', emitter.onDrag);
addEvent(emitter, H.isTouchDevice ? 'touchmove' : 'drag', emitter.onDrag);
if (!emitter.graphic.renderer.styledMode) {
var cssPointer_1 = {
cursor: {
Expand Down Expand Up @@ -98,7 +98,7 @@ var eventEmitterMixin = {
prevChartY = e.chartY;
emitter.cancelClick = false;
emitter.chart.hasDraggedAnnotation = true;
emitter.removeDrag = addEvent(H.doc, Highcharts.isTouchDevice ? 'touchmove' : 'mousemove', function (e) {
emitter.removeDrag = addEvent(H.doc, H.isTouchDevice ? 'touchmove' : 'mousemove', function (e) {
emitter.hasDragged = true;
e = pointer.normalize(e);
e.prevChartX = prevChartX;
Expand All @@ -107,7 +107,7 @@ var eventEmitterMixin = {
prevChartX = e.chartX;
prevChartY = e.chartY;
});
emitter.removeMouseUp = addEvent(H.doc, Highcharts.isTouchDevice ? 'touchend' : 'mouseup', function (e) {
emitter.removeMouseUp = addEvent(H.doc, H.isTouchDevice ? 'touchend' : 'mouseup', function (e) {
emitter.cancelClick = emitter.hasDragged;
emitter.hasDragged = false;
emitter.chart.hasDraggedAnnotation = false;
Expand Down
6 changes: 3 additions & 3 deletions es-modules/annotations/navigationBindings.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ var NavigationBindings = /** @class */ (function () {
navigation.bindingsChartClick(this, e);
}
}));
navigation.eventsToUnbind.push(addEvent(chart.container, Highcharts.isTouchDevice ? 'touchmove' : 'mousemove', function (e) {
navigation.eventsToUnbind.push(addEvent(chart.container, H.isTouchDevice ? 'touchmove' : 'mousemove', function (e) {
navigation.bindingsContainerMouseMove(this, e);
}));
};
Expand Down Expand Up @@ -676,7 +676,7 @@ function selectableAnnotation(annotationType) {
function selectAndshowPopup(event) {
var annotation = this, navigation = annotation.chart.navigationBindings, prevAnnotation = navigation.activeAnnotation;
if (originalClick) {
originalClick.click.call(annotation, event);
originalClick.call(annotation, event);
}
if (prevAnnotation !== annotation) {
// Select current:
Expand Down Expand Up @@ -972,7 +972,7 @@ setOptions({
* from a different server.
*
* @type {string}
* @default https://code.highcharts.com/8.1.1/gfx/stock-icons/
* @default https://code.highcharts.com/8.1.2/gfx/stock-icons/
* @since 7.1.3
* @apioption navigation.iconsURL
*/
Expand Down
2 changes: 1 addition & 1 deletion es-modules/annotations/popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ addEvent(NavigationBindings, 'showPopup', function (config) {
this.popup = new H.Popup(this.chart.container, (this.chart.options.navigation.iconsURL ||
(this.chart.options.stockTools &&
this.chart.options.stockTools.gui.iconsURL) ||
'https://code.highcharts.com/8.1.1/gfx/stock-icons/'));
'https://code.highcharts.com/8.1.2/gfx/stock-icons/'));
}
this.popup.showForm(config.formType, this.chart, config.options, config.onSubmit);
});
Expand Down
65 changes: 49 additions & 16 deletions es-modules/annotations/types/BasicAnnotation.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,54 @@
*
* */
'use strict';
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
import Annotation from '../annotations.src.js';
import H from '../../parts/Globals.js';
import MockPoint from '../MockPoint.js';
import U from '../../parts/Utilities.js';
var merge = U.merge;
/* eslint-disable no-invalid-this */
var BasicAnnotation = function () {
Annotation.apply(this, arguments);
};
H.extendAnnotation(BasicAnnotation, null, {
basicControlPoints: {
var BasicAnnotation = /** @class */ (function (_super) {
__extends(BasicAnnotation, _super);
/* *
*
* Constructors
*
* */
function BasicAnnotation(chart, options) {
return _super.call(this, chart, options) || this;
}
/* *
*
* Functions
*
* */
BasicAnnotation.prototype.addControlPoints = function () {
var options = this.options, controlPoints = BasicAnnotation.basicControlPoints, langKey = options.langKey, optionsGroup = options.labels || options.shapes;
optionsGroup.forEach(function (group) {
if (langKey) {
// @todo langKey === 'label' / 'circle' / 'rectangle' ???
group.controlPoints = controlPoints[langKey];
}
});
};
/* *
*
* Static Properties
*
* */
BasicAnnotation.basicControlPoints = {
label: [{
symbol: 'triangle-down',
positioner: function (target) {
Expand Down Expand Up @@ -117,15 +156,9 @@ H.extendAnnotation(BasicAnnotation, null, {
}
}
}]
},
addControlPoints: function () {
var options = this.options, controlPoints = this.basicControlPoints, langKey = options.langKey, optionsGroup = options.labels || options.shapes;
optionsGroup.forEach(function (group) {
if (langKey) {
group.controlPoints = controlPoints[langKey];
}
});
}
});
};
return BasicAnnotation;
}(Annotation));
BasicAnnotation.prototype.defaultOptions = merge(Annotation.prototype.defaultOptions, {});
Annotation.types.basicAnnotation = BasicAnnotation;
export default BasicAnnotation;
59 changes: 42 additions & 17 deletions es-modules/annotations/types/CrookedLine.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,44 +4,67 @@
*
* */
'use strict';
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
import Annotation from '../annotations.src.js';
import ControlPoint from '../ControlPoint.js';
import H from '../../parts/Globals.js';
import MockPoint from '../MockPoint.js';
import U from '../../parts/Utilities.js';
var merge = U.merge;
/* eslint-disable no-invalid-this, valid-jsdoc */
var CrookedLine = function () {
Annotation.apply(this, arguments);
};
H.extendAnnotation(CrookedLine, null, {
var CrookedLine = /** @class */ (function (_super) {
__extends(CrookedLine, _super);
/* *
*
* Constructors
*
* */
function CrookedLine(chart, options) {
return _super.call(this, chart, options) || this;
}
/* *
*
* Functions
*
* */
/**
* Overrides default setter to get axes from typeOptions.
* @private
*/
setClipAxes: function () {
CrookedLine.prototype.setClipAxes = function () {
this.clipXAxis = this.chart.xAxis[this.options.typeOptions.xAxis];
this.clipYAxis = this.chart.yAxis[this.options.typeOptions.yAxis];
},
getPointsOptions: function () {
};
CrookedLine.prototype.getPointsOptions = function () {
var typeOptions = this.options.typeOptions;
return typeOptions.points.map(function (pointOptions) {
return (typeOptions.points || []).map(function (pointOptions) {
pointOptions.xAxis = typeOptions.xAxis;
pointOptions.yAxis = typeOptions.yAxis;
return pointOptions;
});
},
getControlPointsOptions: function () {
};
CrookedLine.prototype.getControlPointsOptions = function () {
return this.getPointsOptions();
},
addControlPoints: function () {
};
CrookedLine.prototype.addControlPoints = function () {
this.getControlPointsOptions().forEach(function (pointOptions, i) {
var controlPoint = new ControlPoint(this.chart, this, merge(this.options.controlPointOptions, pointOptions.controlPoint), i);
this.controlPoints.push(controlPoint);
pointOptions.controlPoint = controlPoint.options;
}, this);
},
addShapes: function () {
};
CrookedLine.prototype.addShapes = function () {
var typeOptions = this.options.typeOptions, shape = this.initShape(merge(typeOptions.line, {
type: 'path',
points: this.points.map(function (_point, i) {
Expand All @@ -51,8 +74,10 @@ H.extendAnnotation(CrookedLine, null, {
})
}), false);
typeOptions.line = shape.options;
}
},
};
return CrookedLine;
}(Annotation));
CrookedLine.prototype.defaultOptions = merge(Annotation.prototype.defaultOptions,
/**
* A crooked line annotation.
*
Expand Down
42 changes: 31 additions & 11 deletions es-modules/annotations/types/ElliottWave.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,48 @@
*
* */
'use strict';
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
import Annotation from '../annotations.src.js';
import H from '../../parts/Globals.js';
import CrookedLine from './CrookedLine.js';
import U from '../../parts/Utilities.js';
var merge = U.merge;
var CrookedLine = Annotation.types.crookedLine;
/* eslint-disable no-invalid-this, valid-jsdoc */
var ElliottWave = function () {
CrookedLine.apply(this, arguments);
};
H.extendAnnotation(ElliottWave, CrookedLine, {
addLabels: function () {
var ElliottWave = /** @class */ (function (_super) {
__extends(ElliottWave, _super);
function ElliottWave(chart, options) {
return _super.call(this, chart, options) || this;
}
/* *
*
* Functions
*
* */
ElliottWave.prototype.addLabels = function () {
this.getPointsOptions().forEach(function (point, i) {
var label = this.initLabel(merge(point.label, {
text: this.options.typeOptions.labels[i],
var typeOptions = this.options.typeOptions, label = this.initLabel(merge(point.label, {
text: typeOptions.labels[i],
point: function (target) {
return target.annotation.points[i];
}
}), false);
point.label = label.options;
}, this);
}
},
};
return ElliottWave;
}(CrookedLine));
ElliottWave.prototype.defaultOptions = merge(CrookedLine.prototype.defaultOptions,
/**
* An elliott wave annotation.
*
Expand Down
Loading

0 comments on commit 7f564e5

Please sign in to comment.