highcharts 7.1.1 → 7.1.2

package/modules/annotations-advanced.src.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v7.1.1 (2019-04-09)
+ * @license Highcharts JS v7.1.2 (2019-06-04)
  *
  * Annotations module
  *
@@ -39,6 +39,7 @@
          *   The units of the distance are specific to a transformation,
          *   e.g. for rotation they are radians, for scaling they are scale factors.
          *
+         * @private
          * @mixin
          * @memberOf Annotation
          */
@@ -326,7 +327,7 @@
          *        a control point
          * @param {Annotation.ControlPoint.Options} options an options object
          * @param {number} [index]
-         **/
+         */
         function ControlPoint(chart, target, options, index) {
             this.chart = chart;
             this.target = target;
@@ -452,19 +453,49 @@
     _registerModule(_modules, 'annotations/MockPoint.js', [_modules['parts/Globals.js']], function (H) {
 
         /**
-         * A point-like object, a mock point or a point uses in series.
+         * A mock point label configuration.
          *
-         * @typedef {Highcharts.Point | Annotation.MockPoint} Annotation.PointLike
+         * @interface Annotation.MockLabelOptionsObject
+         *//**
+         * X value translated to x axis scale
+         * @name Annotation.MockLabelOptionsObject#x
+         * @type {number|undefined}
+         *//**
+         * Y value translated to y axis scale
+         * @name Annotation.MockLabelOptionsObject#y
+         * @type {number|undefined}
+         *//**
+         * @name Annotation.MockLabelOptionsObject#point
+         * @type {Highcharts.Point}
          */
 
         /**
          * A mock point configuration.
          *
-         * @typedef {Object} Annotation.MockPoint.Options
-         * @property {number} x x value for the point in xAxis scale or pixels
-         * @property {number} y y value for the point in yAxis scale or pixels
-         * @property {string|number|Highcharts.Axis} [xAxis] xAxis instance, index or id
-         * @property {string|number|Highcharts.Axis} [yAxis] yAxis instance, index or id
+         * @interface Highcharts.MockPointOptionsObject
+         *//**
+         * x value for the point in xAxis scale or pixels
+         * @name Highcharts.MockPointOptionsObject#x
+         * @type {number}
+         *//**
+         * y value for the point in yAxis scale or pixels
+         * @name Highcharts.MockPointOptionsObject#y
+         * @type {number}
+         *//**
+         * xAxis index or id
+         * @name Highcharts.MockPointOptionsObject#xAxis
+         * @type {Highcharts.Axis|number|string|undefined}
+         *//**
+         * yAxis index or id
+         * @name Highcharts.MockPointOptionsObject#yAxis
+         * @property {Highcharts.Axis|number|string|undefined}
+         */
+
+        /**
+         * A point-like object, a mock point or a point uses in series.
+         *
+         * @private
+         * @typedef {Highcharts.Point|Highcharts.MockPoint} Highcharts.PointLike
          */
 
         /**
@@ -472,12 +503,15 @@
          * It is created when there is a need of pointing to some chart's position
          * using axis values or pixel values
          *
+         * @private
          * @class
-         * @memberOf Annotation
+         * @name Highcharts.MockPoint
+         *
+         * @param {Highcharts.Chart} chart
+         *        The chart object
          *
-         * @param {Chart} chart a chart instance
-         * @param {Controllable} [target] a controllable instance
-         * @param {Annotation.MockPoint.Options} options an options object
+         * @param {Highcharts.MockPointOptionsObject} options
+         *        The options object
          */
         function MockPoint(chart, target, options) {
             /**
@@ -502,7 +536,7 @@
             /**
              * Options for the mock point.
              *
-             * @type {Annotation.MockPoint.Options}
+             * @type {Highcharts.MockPointOptionsObject}
              */
             this.options = options;
 
@@ -870,6 +904,7 @@
          * It provides methods for handling points, control points
          * and points transformations.
          *
+         * @private
          * @mixin
          * @memberOf Annotation
          */
@@ -1003,10 +1038,13 @@
             /**
              * Map point's options to a point-like object.
              *
-             * @param {Annotation.MockPoint.Options} pointOptions point's options
-             * @param {Annotation.PointLike} point a point like instance
-             * @return {Annotation.PointLike|null} if the point is
-             *         found/set returns this point, otherwise null
+             * @param {Highcharts.MockPointOptionsObject} pointOptions
+             *        point's options
+             * @param {Highcharts.PointLike} point
+             *        a point like instance
+             *
+             * @return {Highcharts.PointLike|null}
+             *         if the point is found/set returns this point, otherwise null
              */
             point: function (pointOptions, point) {
                 if (pointOptions && pointOptions.series) {
@@ -1192,6 +1230,30 @@
                 this.transformPoint('translate', null, null, dx, dy, i);
             },
 
+            /**
+             * Translate shape within controllable item.
+             * Replaces `controllable.translate` method.
+             *
+             * @param {number} dx translation for x coordinate
+             * @param {number} dy translation for y coordinate
+             */
+            translateShape: function (dx, dy) {
+                var chart = this.annotation.chart,
+                    // Annotation.options
+                    shapeOptions = this.annotation.userOptions,
+                    // Chart.options.annotations
+                    annotationIndex = chart.annotations.indexOf(this.annotation),
+                    chartOptions = chart.options.annotations[annotationIndex];
+
+                this.translatePoint(dx, dy, 0);
+
+                // Options stored in:
+                // - chart (for exporting)
+                // - current config (for redraws)
+                chartOptions[this.collection][this.index].point = this.options.point;
+                shapeOptions[this.collection][this.index].point = this.options.point;
+            },
+
             /**
              * Rotate a controllable.
              *
@@ -1370,6 +1432,7 @@
         };
 
         /**
+         * @private
          * @mixin
          */
         var markerMixin = {
@@ -1701,6 +1764,8 @@
                  */
                 type: 'rect',
 
+                translate: controllableMixin.translateShape,
+
                 render: function (parent) {
                     var attrs = this.attrsFromOptions(this.options);
 
@@ -1732,16 +1797,6 @@
                     this.graphic.placed = Boolean(position);
 
                     controllableMixin.redraw.call(this, animation);
-                },
-
-                translate: function (dx, dy) {
-                    var annotationOptions = this.annotation.userOptions,
-                        shapeOptions = annotationOptions[this.collection][this.index];
-
-                    this.translatePoint(dx, dy, 0);
-
-                    // Options stored in chart:
-                    shapeOptions.point = this.options.point;
                 }
             }
         );
@@ -1783,6 +1838,8 @@
                  */
                 type: 'circle',
 
+                translate: controllableMixin.translateShape,
+
                 render: function (parent) {
                     var attrs = this.attrsFromOptions(this.options);
 
@@ -1815,16 +1872,6 @@
                     controllableMixin.redraw.call(this, animation);
                 },
 
-                translate: function (dx, dy) {
-                    var annotationOptions = this.annotation.userOptions,
-                        shapeOptions = annotationOptions[this.collection][this.index];
-
-                    this.translatePoint(dx, dy, 0);
-
-                    // Options stored in chart:
-                    shapeOptions.point = this.options.point;
-                },
-
                 /**
                  * Set the radius.
                  *
@@ -1841,15 +1888,50 @@
     });
     _registerModule(_modules, 'annotations/controllable/ControllableLabel.js', [_modules['parts/Globals.js'], _modules['annotations/controllable/controllableMixin.js'], _modules['annotations/MockPoint.js']], function (H, controllableMixin, MockPoint) {
 
+
+        /**
+         * @private
+         * @interface Highcharts.AnnotationAnchorObject
+         *//**
+         * Relative to the plot area position
+         * @name Highcharts.AnnotationAnchorObject#relativePosition
+         * @type {Highcharts.AnnotationAnchorPositionObject}
+         *//**
+         * Absolute position
+         * @name Highcharts.AnnotationAnchorObject#absolutePosition
+         * @type {Highcharts.AnnotationAnchorPositionObject}
+         */
+
+        /**
+         * An object which denotes an anchor position
+         *
+         * @private
+         * @interface Highcharts.AnnotationAnchorPositionObject
+         *//**
+         * @name Highcharts.AnnotationAnchorPositionObject#x
+         * @property {number}
+         *//**
+         * @name Highcharts.AnnotationAnchorPositionObject#y
+         * @property {number}
+         *//**
+         * @name Highcharts.AnnotationAnchorPositionObject#height
+         * @property {number}
+         *//**
+         * @name Highcharts.AnnotationAnchorPositionObject#width
+         * @property {number}
+         */
+
         /**
          * A controllable label class.
          *
+         * @private
          * @class
+         * @name Annotation.ControllableLabel
+         *
          * @mixes Annotation.controllableMixin
-         * @memberOf Annotation
          *
          * @param {Highcharts.Annotation} annotation an annotation instance
-         * @param {Object} options a label's options
+         * @param {object} options a label's options
          * @param {number} index of the label
          **/
         function ControllableLabel(annotation, options, index) {
@@ -1861,7 +1943,7 @@
          * Shapes which do not have background - the object is used for proper
          * setting of the contrast color.
          *
-         * @type {Array<String>}
+         * @type {Array<string>}
          */
         ControllableLabel.shapesWithoutBackground = ['connector'];
 
@@ -2031,16 +2113,24 @@
                  * @param {number} dy translation for y coordinate
                  **/
                 translate: function (dx, dy) {
-                    var annotationOptions = this.annotation.userOptions,
-                        labelOptions = annotationOptions[this.collection][this.index];
+                    var chart = this.annotation.chart,
+                        // Annotation.options
+                        labelOptions = this.annotation.userOptions,
+                        // Chart.options.annotations
+                        annotationIndex = chart.annotations.indexOf(this.annotation),
+                        chartAnnotations = chart.options.annotations,
+                        chartOptions = chartAnnotations[annotationIndex];
 
                     // Local options:
                     this.options.x += dx;
                     this.options.y += dy;
 
                     // Options stored in chart:
-                    labelOptions.x = this.options.x;
-                    labelOptions.y = this.options.y;
+                    chartOptions[this.collection][this.index].x = this.options.x;
+                    chartOptions[this.collection][this.index].y = this.options.y;
+
+                    labelOptions[this.collection][this.index].x = this.options.x;
+                    labelOptions[this.collection][this.index].y = this.options.y;
                 },
 
                 render: function (parent) {
@@ -2148,8 +2238,9 @@
                 /**
                  * Returns the label position relative to its anchor.
                  *
-                 * @param {Annotation.controllableMixin.Anchor} anchor
-                 * @return {Annotation.controllableMixin.Position|null} position
+                 * @param {Highcharts.AnnotationAnchorObject} anchor
+                 *
+                 * @return {Highcharts.AnnotationAnchorPositionObject|null} position
                  */
                 position: function (anchor) {
                     var item = this.graphic,
@@ -2243,6 +2334,7 @@
 
         /**
          * General symbol definition for labels with connector
+         * @private
          */
         H.SVGRenderer.prototype.symbols.connector = function (x, y, w, h, options) {
             var anchorX = options && options.anchorX,
@@ -2333,6 +2425,8 @@
                  */
                 type: 'image',
 
+                translate: controllableMixin.translateShape,
+
                 render: function (parent) {
                     var attrs = this.attrsFromOptions(this.options),
                         options = this.options;
@@ -2370,16 +2464,6 @@
                     this.graphic.placed = Boolean(position);
 
                     controllableMixin.redraw.call(this, animation);
-                },
-
-                translate: function (dx, dy) {
-                    var annotationOptions = this.annotation.userOptions,
-                        shapeOptions = annotationOptions[this.collection][this.index];
-
-                    this.translatePoint(dx, dy, 0);
-
-                    // Options stored in chart:
-                    shapeOptions.point = this.options.point;
                 }
             }
         );
@@ -2388,11 +2472,15 @@
         return ControllableImage;
     });
     _registerModule(_modules, 'annotations/annotations.src.js', [_modules['parts/Globals.js'], _modules['annotations/controllable/controllableMixin.js'], _modules['annotations/controllable/ControllableRect.js'], _modules['annotations/controllable/ControllableCircle.js'], _modules['annotations/controllable/ControllablePath.js'], _modules['annotations/controllable/ControllableImage.js'], _modules['annotations/controllable/ControllableLabel.js'], _modules['annotations/eventEmitterMixin.js'], _modules['annotations/MockPoint.js'], _modules['annotations/ControlPoint.js']], function (H, controllableMixin, ControllableRect, ControllableCircle, ControllablePath, ControllableImage, ControllableLabel, eventEmitterMixin, MockPoint, ControlPoint) {
-        /**
-         * (c) 2009-2017 Highsoft, Black Label
+        /* *
          *
-         * License: www.highcharts.com/license
-         */
+         *  (c) 2009-2017 Highsoft, Black Label
+         *
+         *  License: www.highcharts.com/license
+         *
+         * */
+
+
 
         var merge = H.merge,
             addEvent = H.addEvent,
@@ -2404,7 +2492,8 @@
             pick = H.pick,
             reduce = H.reduce,
             splat = H.splat,
-            destroyObjectProperties = H.destroyObjectProperties;
+            destroyObjectProperties = H.destroyObjectProperties,
+            chartProto = H.Chart.prototype;
 
         /* *********************************************************************
          *
@@ -2432,8 +2521,7 @@
          * existing points or created mock points
          *
          * @class
-         * @mixes Annotation.controllableMixin
-         * @mixes Annotation.eventEmitterMixin
+         * @name Highcharts.Annotation
          *
          * @param {Highcharts.Chart} chart a chart instance
          * @param {Highcharts.AnnotationsOptions} options the options object
@@ -2451,7 +2539,7 @@
             /**
              * The array of points which defines the annotation.
              *
-             * @type {Array<Annotation.PointLike>}
+             * @type {Array<Highcharts.Point>}
              */
             this.points = [];
 
@@ -2474,7 +2562,7 @@
             /**
              * The array of shapes which belong to the annotation.
              *
-             * @type {Array<Highcharts.Annotation.Shape>}
+             * @type {Array<Annotation.Shape>}
              */
             this.shapes = [];
 
@@ -2543,7 +2631,10 @@
             true,
             Annotation.prototype,
             controllableMixin,
-            eventEmitterMixin, /** @lends Annotation# */ {
+            eventEmitterMixin,
+            /** @lends Annotation# */
+            {
+
                 /**
                  * List of events for `annotation.options.events` that should not be
                  * added to `annotation.graphic` but to the `annotation`.
@@ -2551,14 +2642,12 @@
                  * @type {Array<string>}
                  */
                 nonDOMEvents: ['add', 'afterUpdate', 'remove'],
+
                 /**
                  * A basic type of an annotation. It allows to add custom labels
                  * or shapes. The items  can be tied to points, axis coordinates
                  * or chart pixel coordinates.
                  *
-                 * @private
-                 * @type {Object}
-                 * @ignore-options base, annotations.crookedLine
                  * @sample highcharts/annotations/basic/
                  *         Basic annotations
                  * @sample highcharts/demo/annotations/
@@ -2566,13 +2655,25 @@
                  * @sample highcharts/css/annotations
                  *         Styled mode
                  * @sample highcharts/annotations-advanced/controllable
-                 *          Controllable items
+                 *         Controllable items
                  * @sample {highstock} stock/annotations/fibonacci-retracements
                  *         Custom annotation, Fibonacci retracement
-                 * @since 6.0.0
-                 * @optionparent annotations.crookedLine
+                 *
+                 * @type         {Array<*>}
+                 * @since        6.0.0
+                 * @optionparent annotations
                  */
                 defaultOptions: {
+
+                    /**
+                     * Sets an ID for an annotation. Can be user later when removing an
+                     * annotation in [Chart#removeAnnotation(id)](
+                     * /class-reference/Highcharts.Chart#removeAnnotation) method.
+                     *
+                     * @type      {string}
+                     * @apioption annotations.id
+                     */
+
                     /**
                      * Whether the annotation is visible.
                      *
@@ -2585,7 +2686,10 @@
                      * Allow an annotation to be draggable by a user. Possible
                      * values are `"x"`, `"xy"`, `"y"` and `""` (disabled).
                      *
-                     * @type {string}
+                     * @sample highcharts/annotations/draggable/
+                     *         Annotations draggable: 'xy'
+                     *
+                     * @type       {string}
                      * @validvalue ["x", "xy", "y", ""]
                      */
                     draggable: 'xy',
@@ -2621,18 +2725,20 @@
                         /**
                          * The background color or gradient for the annotation's label.
                          *
-                         * @type {Color}
                          * @sample highcharts/annotations/label-presentation/
                          *         Set labels graphic options
+                         *
+                         * @type {Highcharts.ColorString|Highcharts.GradientColorObject|Highcharts.PatternObject}
                          */
                         backgroundColor: 'rgba(0, 0, 0, 0.75)',
 
                         /**
                          * The border color for the annotation's label.
                          *
-                         * @type {Color}
                          * @sample highcharts/annotations/label-presentation/
                          *         Set labels graphic options
+                         *
+                         * @type {Highcharts.ColorString}
                          */
                         borderColor: 'black',
 
@@ -2657,6 +2763,7 @@
                          *
                          * @sample highcharts/css/annotations
                          *         Styled mode annotations
+                         *
                          * @since 6.0.5
                          */
                         className: '',
@@ -2673,67 +2780,70 @@
                         /**
                          * The label's pixel distance from the point.
                          *
-                         * @type {number}
                          * @sample highcharts/annotations/label-position/
                          *         Set labels position
-                         * @default undefined
-                         * @apioption annotations.crookedLine.labelOptions.distance
+                         *
+                         * @type      {number}
+                         * @apioption annotations.labelOptions.distance
                          */
 
                         /**
-                         * A [format](https://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting) string for the data label.
+                         * A
+                         * [format](https://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting)
+                         * string for the data label.
+                         *
+                         * @see [plotOptions.series.dataLabels.format](plotOptions.series.dataLabels.format.html)
                          *
-                         * @type {string}
-                         * @see    [plotOptions.series.dataLabels.format](
-                         *         plotOptions.series.dataLabels.format.html)
                          * @sample highcharts/annotations/label-text/
                          *         Set labels text
-                         * @default undefined
-                         * @apioption annotations.crookedLine.labelOptions.format
+                         *
+                         * @type      {string}
+                         * @apioption annotations.labelOptions.format
                          */
 
                         /**
                          * Alias for the format option.
                          *
-                         * @type {string}
                          * @see [format](annotations.labelOptions.format.html)
+                         *
                          * @sample highcharts/annotations/label-text/
                          *         Set labels text
-                         * @default undefined
-                         * @apioption annotations.crookedLine.labelOptions.text
+                         *
+                         * @type      {string}
+                         * @apioption annotations.labelOptions.text
                          */
 
                         /**
-                         * Callback JavaScript function to format
-                         * the annotation's label. Note that if a `format` or `text`
-                         * are defined, the format or text take precedence and
-                         * the formatter is ignored. `This` refers to a * point object.
+                         * Callback JavaScript function to format the annotation's
+                         * label. Note that if a `format` or `text` are defined, the
+                         * format or text take precedence and the formatter is ignored.
+                         * `This` refers to a point object.
                          *
-                         * @type {function}
                          * @sample highcharts/annotations/label-text/
                          *         Set labels text
-                         * @default function () {
-                         *  return defined(this.y) ? this.y : 'Annotation label';
-                         * }
+                         *
+                         * @type    {Highcharts.FormatterCallbackFunction<Highcharts.Point>}
+                         * @default function () { return defined(this.y) ? this.y : 'Annotation label'; }
                          */
                         formatter: function () {
                             return defined(this.y) ? this.y : 'Annotation label';
                         },
 
                         /**
-                         * How to handle the annotation's label that flow
-                         * outside the plot area. The justify option aligns the label
-                         * inside the plot area.
+                         * How to handle the annotation's label that flow outside the
+                         * plot area. The justify option aligns the label inside the
+                         * plot area.
                          *
-                         * @validvalue ["allow", "justify"]
                          * @sample highcharts/annotations/label-crop-overflow/
                          *         Crop or justify labels
+                         *
+                         * @validvalue ["allow", "justify"]
                          */
                         overflow: 'justify',
 
                         /**
                          * When either the borderWidth or the backgroundColor is set,
-                         * this is the padding within the box.
+                         * this    is the padding within the box.
                          *
                          * @sample highcharts/annotations/label-presentation/
                          *         Set labels graphic options
@@ -2741,13 +2851,14 @@
                         padding: 5,
 
                         /**
-                         * The shadow of the box. The shadow can be
-                         * an object configuration containing
-                         * `color`, `offsetX`, `offsetY`, `opacity` and `width`.
+                         * The shadow of the box. The shadow can be an object
+                         * configuration containing `color`, `offsetX`, `offsetY`,
+                         * `opacity` and `width`.
                          *
-                         * @type {Boolean|Object}
                          * @sample highcharts/annotations/label-presentation/
                          *         Set labels graphic options
+                         *
+                         * @type {boolean|Highcharts.ShadowOptionsObject}
                          */
                         shadow: false,
 
@@ -2755,7 +2866,6 @@
                          * The name of a symbol to use for the border around the label.
                          * Symbols are predefined functions on the Renderer object.
                          *
-                         * @type {string}
                          * @sample highcharts/annotations/shapes/
                          *         Available shapes for labels
                          */
@@ -2764,24 +2874,25 @@
                         /**
                          * Styles for the annotation's label.
                          *
-                         * @type {CSSObject}
+                         * @see [plotOptions.series.dataLabels.style](plotOptions.series.dataLabels.style.html)
+                         *
                          * @sample highcharts/annotations/label-presentation/
                          *         Set labels graphic options
-                         * @see    [plotOptions.series.dataLabels.style](
-                         *         plotOptions.series.dataLabels.style.html)
+                         *
+                         * @type {Highcharts.CSSObject}
                          */
                         style: {
+                            /** @ignore */
                             fontSize: '11px',
+                            /** @ignore */
                             fontWeight: 'normal',
+                            /** @ignore */
                             color: 'contrast'
                         },
 
                         /**
-                         * Whether to [use HTML](http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html)
+                         * Whether to [use HTML](https://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html)
                          * to render the annotation's label.
-                         *
-                         * @type {boolean}
-                         * @default false
                          */
                         useHTML: false,
 
@@ -2821,60 +2932,58 @@
                      * multiple labels, they can be added to the
                      * [labelOptions](annotations.labelOptions.html).
                      *
-                     * @type {Array<Object>}
-                     * @extends annotations.crookedLine.labelOptions
-                     * @apioption annotations.crookedLine.labels
+                     * @type      {Array<*>}
+                     * @extends   annotations.labelOptions
+                     * @apioption annotations.labels
                      */
 
                     /**
-                     * This option defines the point to which the label
-                     * will be connected.
-                     * It can be either the point which exists in the series - it is
-                     * referenced by the point's id - or a new point with defined x, y
-                     * properies and optionally axes.
+                     * This option defines the point to which the label will be
+                     * connected. It can be either the point which exists in the
+                     * series - it is referenced by the point's id - or a new point with
+                     * defined x, y properties and optionally axes.
                      *
-                     * @type {string|MockPointOptions}
                      * @sample highcharts/annotations/mock-point/
                      *         Attach annotation to a mock point
-                     * @apioption annotations.crookedLine.labels.point
+                     *
+                     * @type      {string|Highcharts.MockPointOptionsObject}
+                     * @apioption annotations.labels.point
                      */
 
                     /**
                      * The x position of the point. Units can be either in axis
                      * or chart pixel coordinates.
                      *
-                     * @type {number}
-                     * @apioption annotations.crookedLine.labels.point.x
+                     * @type      {number}
+                     * @apioption annotations.labels.point.x
                      */
 
                     /**
                      * The y position of the point. Units can be either in axis
                      * or chart pixel coordinates.
                      *
-                     * @type {number}
-                     * @apioption annotations.crookedLine.labels.point.y
+                     * @type      {number}
+                     * @apioption annotations.labels.point.y
                      */
 
                     /**
-                     * This number defines which xAxis the point is connected to.
-                     * It refers to either the axis id or the index of the axis
-                     * in the xAxis array. If the option is not configured or
-                     * the axis is not found the point's
-                     * x coordinate refers to the chart pixels.
+                     * This number defines which xAxis the point is connected to. It
+                     * refers to either the axis id or the index of the axis in the
+                     * xAxis array. If the option is not configured or the axis is not
+                     * found the point's x coordinate refers to the chart pixels.
                      *
-                     * @type {number|string}
-                     * @apioption annotations.crookedLine.labels.point.xAxis
+                     * @type      {number|string}
+                     * @apioption annotations.labels.point.xAxis
                      */
 
                     /**
-                     * This number defines which yAxis the point is connected to.
-                     * It refers to either the axis id or the index of the axis
-                     * in the yAxis array. If the option is not configured or
-                     * the axis is not found the point's
-                     * y coordinate refers to the chart pixels.
+                     * This number defines which yAxis the point is connected to. It
+                     * refers to either the axis id or the index of the axis in the
+                     * yAxis array. If the option is not configured or the axis is not
+                     * found the point's y coordinate refers to the chart pixels.
                      *
-                     * @type {number|string}
-                     * @apioption annotations.crookedLine.labels.point.yAxis
+                     * @type      {number|string}
+                     * @apioption annotations.labels.point.yAxis
                      */
 
 
@@ -2883,119 +2992,126 @@
                      * multiple shapes, then can be added to the
                      * [shapeOptions](annotations.shapeOptions.html).
                      *
-                     * @type {Array<Object>}
-                     * @extends annotations.crookedLine.shapeOptions
-                     * @apioption annotations.crookedLine.shapes
+                     * @type      {Array<*>}
+                     * @extends   annotations.shapeOptions
+                     * @apioption annotations.shapes
                      */
 
                     /**
                      * This option defines the point to which the shape will be
-                     * connected.
-                     * It can be either the point which exists in the series - it is
-                     * referenced by the point's id - or a new point with defined x, y
-                     * properties and optionally axes.
+                     * connected. It can be either the point which exists in the
+                     * series - it is referenced by the point's id - or a new point with
+                     * defined x, y properties and optionally axes.
                      *
-                     * @type {string|MockPointOptions}
-                     * @extends annotations.crookedLine.labels.point
-                     * @apioption annotations.crookedLine.shapes.point
+                     * @type      {string|Highcharts.MockPointOptionsObject}
+                     * @extends   annotations.labels.point
+                     * @apioption annotations.shapes.point
                      */
 
                     /**
-                     * An array of points for the shape. This option is available
-                     * for shapes which can use multiple points such as path.
-                     * A point can be either a point object or a point's id.
+                     * An array of points for the shape. This option is available for
+                     * shapes which can use multiple points such as path. A point can be
+                     * either a point object or a point's id.
                      *
-                     * @type {Array<string|Highcharts.MockPoint.Options>}
                      * @see [annotations.shapes.point](annotations.shapes.point.html)
-                     * @apioption annotations.crookedLine.shapes.points
+                     *
+                     * @type      {Array<string|Highcharts.MockPointOptionsObject>}
+                     * @extends   annotations.labels.point
+                     * @apioption annotations.shapes.points
                      */
 
                     /**
-                     * Id of the marker which will be drawn at the final
-                     * vertex of the path.
-                     * Custom markers can be defined in defs property.
+                     * Id of the marker which will be drawn at the final vertex of the
+                     * path. Custom markers can be defined in defs property.
                      *
-                     * @type {string}
                      * @see [defs.markers](defs.markers.html)
+                     *
                      * @sample highcharts/annotations/custom-markers/
                      *         Define a custom marker for annotations
-                     * @apioption annotations.crookedLine.shapes.markerEnd
+                     *
+                     * @type      {string}
+                     * @apioption annotations.shapes.markerEnd
                      */
 
                     /**
-                     * Id of the marker which will be drawn at the first
-                     * vertex of the path.
-                     * Custom markers can be defined in defs property.
+                     * Id of the marker which will be drawn at the first vertex of the
+                     * path. Custom markers can be defined in defs property.
                      *
-                     * @type {string}
                      * @see [defs.markers](defs.markers.html)
+                     *
                      * @sample {highcharts} highcharts/annotations/custom-markers/
                      *         Define a custom marker for annotations
-                     * @apioption annotations.crookedLine.shapes.markerStart
+                     *
+                     * @type      {string}
+                     * @apioption annotations.shapes.markerStart
                      */
 
 
                     /**
-                     * Options for annotation's shapes. Each shape inherits options
-                     * from the shapeOptions object. An option from the shapeOptions
-                     * can be overwritten by config for a specific shape.
-                     *
-                     * @type {Object}
+                     * Options for annotation's shapes. Each shape inherits options from
+                     * the shapeOptions object. An option from the shapeOptions can be
+                     * overwritten by config for a specific shape.
                      */
                     shapeOptions: {
+
                         /**
                          * The width of the shape.
                          *
-                         * @type {number}
                          * @sample highcharts/annotations/shape/
                          *         Basic shape annotation
-                         * @apioption annotations.crookedLine.shapeOptions.width
+                         *
+                         * @type      {number}
+                         * @apioption annotations.shapeOptions.width
                          **/
 
                         /**
                          * The height of the shape.
                          *
-                         * @type {number}
                          * @sample highcharts/annotations/shape/
                          *         Basic shape annotation
-                         * @apioption annotations.crookedLine.shapeOptions.height
+                         *
+                         * @type      {number}
+                         * @apioption annotations.shapeOptions.height
                          */
 
                         /**
-                         * The color of the shape's stroke.
+                         * The type of the shape, e.g. circle or rectangle.
                          *
-                         * @type {Color}
                          * @sample highcharts/annotations/shape/
                          *         Basic shape annotation
+                         *
+                         * @type      {string}
+                         * @default   'rect'
+                         * @apioption annotations.shapeOptions.type
                          */
-                        stroke: 'rgba(0, 0, 0, 0.75)',
 
                         /**
-                         * The pixel stroke width of the shape.
+                         * The color of the shape's stroke.
                          *
                          * @sample highcharts/annotations/shape/
                          *         Basic shape annotation
+                         *
+                         * @type {Highcharts.ColorString}
                          */
-                        strokeWidth: 1,
+                        stroke: 'rgba(0, 0, 0, 0.75)',
 
                         /**
-                         * The color of the shape's fill.
+                         * The pixel stroke width of the shape.
                          *
-                         * @type {Color}
                          * @sample highcharts/annotations/shape/
                          *         Basic shape annotation
                          */
-                        fill: 'rgba(0, 0, 0, 0.75)',
+                        strokeWidth: 1,
 
                         /**
-                         * The type of the shape, e.g. circle or rectangle.
+                         * The color of the shape's fill.
                          *
-                         * @type {string}
                          * @sample highcharts/annotations/shape/
                          *         Basic shape annotation
-                         * @default 'rect'
-                         * @apioption annotations.crookedLine.shapeOptions.type
+                         *
+                         * @type {Highcharts.ColorString|Highcharts.GradientColorObject|Highcharts.PatternObject}
                          */
+                        fill: 'rgba(0, 0, 0, 0.75)',
 
                         /**
                          * The radius of the shape.
@@ -3018,10 +3134,16 @@
                      * Options from the controlPointOptions can be overwritten
                      * by options in a specific control point.
                      *
-                     * @type {Annotation.ControlPoint.Options}
-                     * @apioption annotations.crookedLine.controlPointOptions
+                     * @type      {Annotation.ControlPoint.Options}
+                     * @apioption annotations.controlPointOptions
                      */
                     controlPointOptions: {
+
+                        /**
+                         * @function {Annotation.ControlPoint.Positioner}
+                         * @apioption annotations.controlPointOptions.positioner
+                         */
+
                         symbol: 'circle',
                         width: 10,
                         height: 10,
@@ -3031,57 +3153,53 @@
                             fill: 'white'
                         },
                         visible: false,
-
-                        /**
-                         * @function {Annotation.ControlPoint.Positioner}
-                         * @apioption annotations.crookedLine.controlPointOptions.positioner
-                         */
-
-
                         events: {}
                     },
 
-
-                    /**
-                     * Events available in annotations.
-                     *
-                     * @type {Object}
-                     */
                     /**
                      * Event callback when annotation is added to the chart.
                      *
-                     * @since 7.1.0
-                     * @apioption annotations.crookedLine.events.add
+                     * @type      {Highcharts.EventCallbackFunction<Highcharts.Annotation>}
+                     * @since     7.1.0
+                     * @apioption annotations.events.add
                      */
+
                     /**
                      * Event callback when annotation is updated (e.g. drag and
                      * droppped or resized by control points).
                      *
-                     * @since 7.1.0
-                     * @apioption annotations.crookedLine.events.afterUpdate
+                     * @type      {Highcharts.EventCallbackFunction<Highcharts.Annotation>}
+                     * @since     7.1.0
+                     * @apioption annotations.events.afterUpdate
                      */
+
                     /**
                      * Event callback when annotation is removed from the chart.
                      *
-                     * @since 7.1.0
-                     * @apioption annotations.crookedLine.events.remove
+                     * @type      {Highcharts.EventCallbackFunction<Highcharts.Annotation>}
+                     * @since     7.1.0
+                     * @apioption annotations.events.remove
+                     */
+
+                    /**
+                     * Events available in annotations.
                      */
                     events: {},
 
                     /**
                      * The Z index of the annotation.
-                     *
-                     * @type {number}
-                     * @default 6
                      */
                     zIndex: 6
+
                 },
 
                 /**
                  * Initialize the annotation.
                  *
-                 * @param {Highcharts.Chart} - the chart
-                 * @param {Highcharts.AnnotationsOptions} - the user options for the annotation
+                 * @param {Highcharts.Chart}
+                 *        The chart
+                 * @param {Highcharts.AnnotationsOptions}
+                 *        The user options for the annotation
                  */
                 init: function () {
                     this.linkPoints();
@@ -3330,10 +3448,11 @@
                 },
 
                 /**
-                 * See {@link Highcharts.Annotation#destroy}.
+                 * See {@link Highcharts.Chart#removeAnnotation}.
                  */
                 remove: function () {
-                    return this.destroy();
+                    // Let chart.update() remove annoations on demand
+                    return this.chart.removeAnnotation(this);
                 },
 
                 update: function (userOptions) {
@@ -3369,7 +3488,7 @@
                  * Initialisation of a single shape
                  *
                  * @param {Object} shapeOptions - a confg object for a single shape
-                 **/
+                 */
                 initShape: function (shapeOptions, index) {
                     var options = merge(
                             this.options.shapeOptions,
@@ -3481,7 +3600,7 @@
                     item.destroy();
                 },
 
-                /*
+                /**
                  * @private
                  */
                 renderItem: function (item) {
@@ -3498,7 +3617,7 @@
          * An object uses for mapping between a shape type and a constructor.
          * To add a new shape type extend this object with type name as a key
          * and a constructor as its value.
-         **/
+         */
         Annotation.shapesMap = {
             'rect': ControllableRect,
             'circle': ControllableCircle,
@@ -3538,10 +3657,7 @@
          *
          ******************************************************************** */
 
-        // Let chart.update() work with annotations
-        H.Chart.prototype.collectionsWithUpdate.push('annotations');
-
-        H.extend(H.Chart.prototype, /** @lends Highcharts.Chart# */ {
+        H.extend(chartProto, /** @lends Highcharts.Chart# */ {
             initAnnotation: function (userOptions) {
                 var Constructor =
                     Annotation.types[userOptions.type] || Annotation,
@@ -3609,8 +3725,13 @@
             }
         });
 
+        // Let chart.update() update annotations
+        chartProto.collectionsWithUpdate.push('annotations');
+
+        // Let chart.update() create annoations on demand
+        chartProto.collectionsWithInit.annotations = [chartProto.addAnnotation];
 
-        H.Chart.prototype.callbacks.push(function (chart) {
+        chartProto.callbacks.push(function (chart) {
             chart.annotations = [];
 
             if (!chart.options.annotations) {
@@ -3724,13 +3845,24 @@
             /**
              * A crooked line annotation.
              *
-             * @excluding labels, shapes
              * @sample highcharts/annotations-advanced/crooked-line/
              *         Crooked line
-             * @product highstock
+             *
+             * @product      highstock
              * @optionparent annotations.crookedLine
              */
             {
+
+                /**
+                 * @extends   annotations.labelOptions
+                 * @apioption annotations.crookedLine.labelOptions
+                 */
+
+                /**
+                 * @extends   annotations.shapeOptions
+                 * @apioption annotations.crookedLine.shapeOptions
+                 */
+
                 /**
                  * Additional options for an annotation with the type.
                  */
@@ -3749,24 +3881,26 @@
                     yAxis: 0,
 
                     /**
-                     * @type {Array<Object>}
+                     * @type      {Array<*>}
                      * @apioption annotations.crookedLine.typeOptions.points
                      */
 
                     /**
                      * The x position of the point.
-                     * @type {number}
+                     *
+                     * @type      {number}
                      * @apioption annotations.crookedLine.typeOptions.points.x
                      */
 
                     /**
                      * The y position of the point.
-                     * @type {number}
+                     *
+                     * @type      {number}
                      * @apioption annotations.crookedLine.typeOptions.points.y
                      */
 
                     /**
-                     * @type {number}
+                     * @type      {number}
                      * @excluding positioner, events
                      * @apioption annotations.crookedLine.typeOptions.points.controlPoint
                      */
@@ -3774,7 +3908,6 @@
                     /**
                      * Line options.
                      *
-                     * @type {Object}
                      * @excluding height, point, points, r, type, width
                      */
                     line: {
@@ -3867,22 +4000,23 @@
             /**
              * An elliott wave annotation.
              *
-             * @extends annotations.crookedLine
              * @sample highcharts/annotations-advanced/elliott-wave/
              *         Elliott wave
-             * @product highstock
+             *
+             * @extends      annotations.crookedLine
+             * @product      highstock
              * @optionparent annotations.elliottWave
              */
             {
                 typeOptions: {
+
                     /**
-                     * @type {Object}
-                     * @extends annotations.crookedLine.labelOptions
-                     * @apioption annotations.crookedLine.typeOptions.points.label
+                     * @extends   annotations.crookedLine.labelOptions
+                     * @apioption annotations.elliottWave.typeOptions.points.label
                      */
 
                     /**
-                     * @ignore
+                     * @ignore-options
                      */
                     labels: ['(0)', '(A)', '(B)', '(C)', '(D)', '(E)'],
                     line: {
@@ -4291,7 +4425,8 @@
         H.extendAnnotation(
             InfinityLine,
             CrookedLine,
-            /** @lends Annotation.InfinityLine# */{
+            /** @lends Annotation.InfinityLine# */
+            {
                 addShapes: function () {
                     var typeOptions = this.options.typeOptions,
                         points = [
@@ -4320,12 +4455,11 @@
         /**
          * An infinity line annotation.
          *
-         * @extends annotations.crookedLine
          * @sample highcharts/annotations-advanced/infinity-line/
          *         Infinity Line
          *
-         * @product highstock
-         *
+         * @extends   annotations.crookedLine
+         * @product   highstock
          * @apioption annotations.infinityLine
          */
 
@@ -4503,11 +4637,11 @@
             /**
              * A fibonacci annotation.
              *
-             * @extends annotations.crookedLine
              * @sample highcharts/annotations-advanced/fibonacci/
              *         Fibonacci
              *
-             * @product highstock
+             * @extends      annotations.crookedLine
+             * @product      highstock
              * @optionparent annotations.fibonacci
              */
             {
@@ -4520,16 +4654,16 @@
                     /**
                      * An array of background colors:
                      * Default to:
-                     * <pre>
-        [
-          'rgba(130, 170, 255, 0.4)',
-          'rgba(139, 191, 216, 0.4)',
-          'rgba(150, 216, 192, 0.4)',
-          'rgba(156, 229, 161, 0.4)',
-          'rgba(162, 241, 130, 0.4)',
-          'rgba(169, 255, 101, 0.4)'
-        ]
-                      </pre>
+                     * ```
+                     * [
+                     * 'rgba(130, 170, 255, 0.4)',
+                     * 'rgba(139, 191, 216, 0.4)',
+                     * 'rgba(150, 216, 192, 0.4)',
+                     * 'rgba(156, 229, 161, 0.4)',
+                     * 'rgba(162, 241, 130, 0.4)',
+                     * 'rgba(169, 255, 101, 0.4)'
+                     * ]
+                     * ```
                      */
                     backgroundColors: [
                         'rgba(130, 170, 255, 0.4)',
@@ -4553,8 +4687,8 @@
                     /**
                      * An array with options for the labels.
                      *
-                     * @type {Array<Object>}
-                     * @extends annotations.crookedLine.labelOptions
+                     * @type      {Array<object>}
+                     * @extends   annotations.crookedLine.labelOptions
                      * @apioption annotations.fibonacci.typeOptions.labels
                      */
                     labels: []
@@ -4748,10 +4882,11 @@
             /**
              * A pitchfork annotation.
              *
-             * @extends annotations.infinityLine
              * @sample highcharts/annotations-advanced/pitchfork/
              *         Pitchfork
-             * @product highstock
+             *
+             * @extends      annotations.infinityLine
+             * @product      highstock
              * @optionparent annotations.pitchfork
              */
             {
@@ -4759,7 +4894,7 @@
                     /**
                      * Inner background options.
                      *
-                     * @extends annotations.crookedLine.shapeOptions
+                     * @extends   annotations.crookedLine.shapeOptions
                      * @excluding height, r, type, width
                      */
                     innerBackground: {
@@ -4769,7 +4904,7 @@
                     /**
                      * Outer background options.
                      *
-                     * @extends annotations.crookedLine.shapeOptions
+                     * @extends   annotations.crookedLine.shapeOptions
                      * @excluding height, r, type, width
                      */
                     outerBackground: {
@@ -4793,7 +4928,7 @@
          * @class
          * @extends Annotation
          * @memberOf Highcharts
-         **/
+         */
         function VerticalLine() {
             H.Annotation.apply(this, arguments);
         }
@@ -4890,11 +5025,12 @@
             /**
              * A vertical line annotation.
              *
-             * @extends annotations.crookedLine
-             * @excluding labels, shapes, controlPointOptions
              * @sample highcharts/annotations-advanced/vertical-line/
              *         Vertical line
-             * @product highstock
+             *
+             * @extends      annotations.crookedLine
+             * @excluding    labels, shapes, controlPointOptions
+             * @product      highstock
              * @optionparent annotations.verticalLine
              */
             {
@@ -4926,7 +5062,7 @@
                     /**
                      * Connector options.
                      *
-                     * @extends annotations.crookedLine.shapeOptions
+                     * @extends   annotations.crookedLine.shapeOptions
                      * @excluding height, r, type, width
                      */
                     connector: {
@@ -4963,9 +5099,7 @@
             /** @lends Annotation.Measure# */
             {
                 /**
-                 *
                  * Init annotation object.
-                 *
                  */
                 init: function () {
                     Annotation.prototype.init.apply(this, arguments);
@@ -5064,8 +5198,7 @@
                 /**
                  * Add label with calculated values (min, max, average, bins).
                  *
-                 * @param {Boolean} resize - the flag for resize shape
-                 *
+                 * @param {boolean} resize - the flag for resize shape
                  */
                 addValues: function (resize) {
                     var options = this.options.typeOptions,
@@ -5116,8 +5249,7 @@
                     }
                 },
                 /**
-                 * add shapes - crosshair, background (rect)
-                 *
+                 * Crosshair, background (rect)
                  */
                 addShapes: function () {
                     this.addCrosshairs();
@@ -5316,9 +5448,10 @@
                     this.options.typeOptions.point.y = this.startYMin;
                 },
                 calculations: {
-                    /*
-                    * Set starting points
-                    */
+                    /**
+                     * Set starting points
+                     * @private
+                     */
                     init: function () {
                         var options = this.options.typeOptions,
                             chart = this.chart,
@@ -5366,12 +5499,12 @@
                         }
 
                     },
-                    /*
-                    * Set current xAxisMin, xAxisMax, yAxisMin, yAxisMax.
-                    * Calculations of measure values (min, max, average, bins).
-                    *
-                    * @param {Boolean} resize - flag if shape is resized
-                    */
+                    /**
+                     * Set current xAxisMin, xAxisMax, yAxisMin, yAxisMax.
+                     * Calculations of measure values (min, max, average, bins).
+                     * @private
+                     * @param {Boolean} resize - flag if shape is resized
+                     */
                     recalculate: function (resize) {
                         var calc = this.calculations,
                             options = this.options.typeOptions,
@@ -5396,27 +5529,27 @@
                         }
 
                     },
-                    /*
-                    * Set current xAxisMin, xAxisMax, yAxisMin, yAxisMax.
-                    * Calculations of measure values (min, max, average, bins).
-                    *
-                    * @param {Object} axis - x or y axis reference
-                    * @param {Number} value - point's value (x or y)
-                    * @param {Number} offset - amount of pixels
-                    */
+                    /**
+                     * Set current xAxisMin, xAxisMax, yAxisMin, yAxisMax.
+                     * Calculations of measure values (min, max, average, bins).
+                     * @private
+                     * @param {Object} axis - x or y axis reference
+                     * @param {Number} value - point's value (x or y)
+                     * @param {Number} offset - amount of pixels
+                     */
                     getPointPos: function (axis, value, offset) {
                         return axis.toValue(
                             axis.toPixels(value) + offset
                         );
                     },
-                    /*
-                    * Update position of start points
-                    * (startXMin, startXMax, startYMin, startYMax)
-                    *
-                    * @param {Boolean} redraw - flag if shape is redraw
-                    * @param {Boolean} resize - flag if shape is resized
-                    * @param {Boolean} cpIndex - index of controlPoint
-                    */
+                    /**
+                     * Update position of start points
+                     * (startXMin, startXMax, startYMin, startYMax)
+                     * @private
+                     * @param {Boolean} redraw - flag if shape is redraw
+                     * @param {Boolean} resize - flag if shape is resized
+                     * @param {Boolean} cpIndex - index of controlPoint
+                     */
                     updateStartPoints: function (redraw, resize, cpIndex, dx, dy) {
                         var options = this.options.typeOptions,
                             selectType = options.selectType,
@@ -5459,19 +5592,21 @@
                             this.offsetY = 0;
                         }
                     },
-                    /*
-                    * Default formatter of label's content
-                    */
+                    /**
+                     * Default formatter of label's content
+                     * @private
+                     */
                     defaultFormatter: function () {
                         return 'Min: ' + this.min +
                             '<br>Max: ' + this.max +
                             '<br>Average: ' + this.average +
                             '<br>Bins: ' + this.bins;
                     },
-                    /*
-                    * Set values for xAxisMin, xAxisMax, yAxisMin, yAxisMax, also
-                    * when chart is inverted
-                    */
+                    /**
+                     * Set values for xAxisMin, xAxisMax, yAxisMin, yAxisMax, also
+                     * when chart is inverted
+                     * @private
+                     */
                     getExtremes: function (xAxisMin, xAxisMax, yAxisMin, yAxisMax) {
                         return {
                             xAxisMin: Math.min(xAxisMax, xAxisMin),
@@ -5480,9 +5615,10 @@
                             yAxisMax: Math.max(yAxisMax, yAxisMin)
                         };
                     },
-                    /*
-                    * Definitions of calculations (min, max, average, bins)
-                    */
+                    /**
+                     * Definitions of calculations (min, max, average, bins)
+                     * @private
+                     */
                     min: function () {
                         var min = Infinity,
                             series = this.chart.series,
@@ -5931,11 +6067,13 @@
         return chartNavigation;
     });
     _registerModule(_modules, 'annotations/navigationBindings.js', [_modules['parts/Globals.js'], _modules['mixins/navigation.js']], function (H, chartNavigationMixin) {
-        /**
-         * (c) 2009-2017 Highsoft, Black Label
+        /* *
          *
-         * License: www.highcharts.com/license
-         */
+         *  (c) 2009-2017 Highsoft, Black Label
+         *
+         *  License: www.highcharts.com/license
+         *
+         * */
 
         var doc = H.doc,
             win = H.win,
@@ -6148,13 +6286,15 @@
                 });
 
                 objectEach(options.events || {}, function (callback, eventName) {
-                    navigation.eventsToUnbind.push(
-                        addEvent(
-                            navigation,
-                            eventName,
-                            callback
-                        )
-                    );
+                    if (H.isFunction(callback)) {
+                        navigation.eventsToUnbind.push(
+                            addEvent(
+                                navigation,
+                                eventName,
+                                callback
+                            )
+                        );
+                    }
                 });
 
                 navigation.eventsToUnbind.push(
@@ -7269,13 +7409,15 @@
 
     });
     _registerModule(_modules, 'annotations/popup.js', [_modules['parts/Globals.js']], function (H) {
-        /**
-         * Popup generator for Stock tools
+        /* *
          *
-         * (c) 2009-2017 Sebastian Bochan
+         *  Popup generator for Stock tools
          *
-         * License: www.highcharts.com/license
-         */
+         *  (c) 2009-2017 Sebastian Bochan
+         *
+         *  License: www.highcharts.com/license
+         *
+         * */
 
         var addEvent = H.addEvent,
             createElement = H.createElement,
@@ -7318,13 +7460,11 @@
         };
 
         H.Popup.prototype = {
-            /*
+            /**
              * Initialize the popup. Create base div and add close button.
-             *
+             * @private
              * @param {HTMLDOMElement} - container where popup should be placed
-             *
              * @return {HTMLDOMElement} - return created popup's div
-             *
              */
             init: function (parentDiv) {
 
@@ -7338,9 +7478,9 @@
                 // add close button
                 this.addCloseBtn();
             },
-            /*
+            /**
              * Create HTML element and attach click event (close popup).
-             *
+             * @private
              */
             addCloseBtn: function () {
                 var _self = this,
@@ -7357,13 +7497,11 @@
                     });
                 });
             },
-            /*
+            /**
              * Create two columns (divs) in HTML.
-             *
+             * @private
              * @param {HTMLDOMElement} - container of columns
-             *
              * @return {Object} - reference to two HTML columns
-             *
              */
             addColsContainer: function (container) {
                 var rhsCol,
@@ -7389,15 +7527,14 @@
                     rhsCol: rhsCol
                 };
             },
-            /*
+            /**
              * Create input with label.
-             *
+             * @private
              * @param {String} - chain of fields i.e params.styles.fontSize
              * @param {String} - indicator type
              * @param {HTMLDOMElement} - container where elements should be added
              * @param {String} - dafault value of input i.e period value is 14,
              * extracted from defaultOptions (ADD mode) or series options (EDIT mode)
-             *
              */
             addInput: function (option, type, parentDiv, value) {
                 var optionParamList = option.split('.'),
@@ -7430,15 +7567,14 @@
                     parentDiv
                 ).setAttribute(PREFIX + 'data-name', option);
             },
-            /*
+            /**
              * Create button.
-             *
+             * @private
              * @param {HTMLDOMElement} - container where elements should be added
              * @param {String} - text placed as button label
              * @param {String} - add | edit | remove
              * @param {Function} - on click callback
              * @param {HTMLDOMElement} - container where inputs are generated
-             *
              * @return {HTMLDOMElement} - html button
              */
             addButton: function (parentDiv, label, type, callback, fieldsDiv) {
@@ -7463,12 +7599,11 @@
 
                 return button;
             },
-            /*
+            /**
              * Get values from all inputs and create JSON.
-             *
+             * @private
              * @param {HTMLDOMElement} - container where inputs are created
              * @param {String} - add | edit | remove
-             *
              * @return {Object} - fields
              */
             getFields: function (parentDiv, type) {
@@ -7510,12 +7645,11 @@
 
                 return fieldsOutput;
             },
-            /*
+            /**
              * Reset content of the current popup and show.
-             *
+             * @private
              * @param {Chart} - chart
              * @param {Function} - on click callback
-             *
              * @return {Object} - fields
              */
             showPopup: function () {
@@ -7540,21 +7674,20 @@
                 popupDiv.appendChild(popupCloseBtn);
                 popupDiv.style.display = 'block';
             },
-            /*
+            /**
              * Hide popup.
-             *
+             * @private
              */
             closePopup: function () {
                 this.popup.container.style.display = 'none';
             },
-            /*
+            /**
              * Create content and show popup.
-             *
+             * @private
              * @param {String} - type of popup i.e indicators
              * @param {Chart} - chart
              * @param {Object} - options
              * @param {Function} - on click callback
-             *
              */
             showForm: function (type, chart, options, callback) {
 
@@ -7583,23 +7716,22 @@
                     this.annotations.addForm.call(this, chart, options, callback, true);
                 }
             },
-            /*
+            /**
              * Return lang definitions for popup.
-             *
+             * @private
              * @return {Object} - elements translations.
              */
             getLangpack: function () {
                 return H.getOptions().lang.navigation.popup;
             },
             annotations: {
-                /*
+                /**
                  * Create annotation simple form. It contains two buttons
                  * (edit / remove) and text label.
-                 *
+                 * @private
                  * @param {Chart} - chart
                  * @param {Object} - options
                  * @param {Function} - on click callback
-                 *
                  */
                 addToolbar: function (chart, options, callback) {
                     var _self = this,
@@ -7656,15 +7788,14 @@
 
                     button.className += ' ' + PREFIX + 'annotation-edit-button';
                 },
-                /*
+                /**
                  * Create annotation simple form.
                  * It contains fields with param names.
-                 *
+                 * @private
                  * @param {Chart} - chart
                  * @param {Object} - options
                  * @param {Function} - on click callback
                  * @param {Boolean} - if it is a form declared for init annotation
-                 *
                  */
                 addForm: function (chart, options, callback, isInit) {
                     var popupDiv = this.popup.container,
@@ -7707,16 +7838,15 @@
                         popupDiv
                     );
                 },
-                /*
+                /**
                  * Create annotation's form fields.
-                 *
+                 * @private
                  * @param {HTMLDOMElement} - div where inputs are placed
                  * @param {Chart} - chart
                  * @param {String} - name of parent to create chain of names
                  * @param {Object} - options
                  * @param {Array} - storage - array where all items are stored
                  * @param {Boolean} - isRoot - recursive flag for root
-                 *
                  */
                 addFormFields: function (
                     parentDiv,
@@ -7796,14 +7926,13 @@
                 }
             },
             indicators: {
-                /*
+                /**
                  * Create indicator's form. It contains two tabs (ADD and EDIT) with
                  * content.
-                 *
+                 * @private
                  * @param {Chart} - chart
                  * @param {Object} - options
                  * @param {Function} - on click callback
-                 *
                  */
                 addForm: function (chart, options, callback) {
 
@@ -7866,14 +7995,13 @@
                         buttonParentDiv
                     );
                 },
-                /*
+                /**
                  * Create HTML list of all indicators (ADD mode) or added indicators
                  * (EDIT mode).
-                 *
+                 * @private
                  * @param {Chart} - chart
                  * @param {HTMLDOMElement} - container where list is added
                  * @param {String} - 'edit' or 'add' mode
-                 *
                  */
                 addIndicatorList: function (chart, parentDiv, listType) {
                     var _self = this,
@@ -7947,15 +8075,13 @@
                         indicatorList.childNodes[0].click();
                     }
                 },
-                /*
+                /**
                  * Extract full name and type of requested indicator.
-                 *
+                 * @private
                  * @param {Series} - series which name is needed.
                  * (EDIT mode - defaultOptions.series, ADD mode - indicator series).
                  * @param {String} - indicator type like: sma, ema, etc.
-                 *
                  * @return {Object} - series name and type like: sma, ema, etc.
-                 *
                  */
                 getNameType: function (series, type) {
                     var options = series.options,
@@ -7976,15 +8102,14 @@
                         type: seriesType
                     };
                 },
-                /*
+                /**
                  * List all series with unique ID. Its mandatory for indicators to set
                  * correct linking.
-                 *
+                 * @private
                  * @param {String} - indicator type like: sma, ema, etc.
                  * @param {String} - type of select i.e series or volume.
                  * @param {Chart} - chart
                  * @param {HTMLDOMElement} - element where created HTML list is added
-                 *
                  */
                 listAllSeries: function (type, optionName, chart, parentDiv) {
                     var selectName = PREFIX + optionName + '-type-' + type,
@@ -8036,18 +8161,17 @@
                         }
                     });
                 },
-                /*
+                /**
                  * Create typical inputs for chosen indicator. Fields are extracted from
                  * defaultOptions (ADD mode) or current indicator (ADD mode). Two extra
                  * fields are added:
                  * - hidden input - contains indicator type (required for callback)
                  * - select - list of series which can be linked with indicator
-                 *
+                 * @private
                  * @param {Chart} - chart
                  * @param {Series} - indicator
                  * @param {String} - indicator type like: sma, ema, etc.
                  * @param {HTMLDOMElement} - element where created HTML list is added
-                 *
                  */
                 addFormFields: function (chart, series, seriesType, rhsColWrapper) {
                     var fields = series.params || series.options.params,
@@ -8108,17 +8232,16 @@
                         rhsColWrapper
                     );
                 },
-                /*
+                /**
                  * Recurent function which lists all fields, from params object and
                  * create them as inputs. Each input has unique `data-name` attribute,
                  * which keeps chain of fields i.e params.styles.fontSize.
-                 *
+                 * @private
                  * @param {Chart} - chart
                  * @param {String} - name of parent to create chain of names
                  * @param {Series} - fields - params which are based for input create
                  * @param {String} - indicator type like: sma, ema, etc.
                  * @param {HTMLDOMElement} - element where created HTML list is added
-                 *
                  */
                 addParamInputs: function (chart, parentNode, fields, type, parentDiv) {
                     var _self = this,
@@ -8153,9 +8276,9 @@
                         }
                     });
                 },
-                /*
+                /**
                  * Get amount of indicators added to chart.
-                 *
+                 * @private
                  * @return {Number} - Amount of indicators
                  */
                 getAmount: function () {
@@ -8177,11 +8300,10 @@
                 }
             },
             tabs: {
-                /*
+                /**
                  * Init tabs. Create tab menu items, tabs containers
-                 *
+                 * @private
                  * @param {Chart} - reference to current chart
-                 *
                  */
                 init: function (chart) {
                     var tabs = this.tabs,
@@ -8201,12 +8323,11 @@
                     // activate first tab
                     tabs.selectTab.call(this, firstTab, 0);
                 },
-                /*
+                /**
                  * Create tab menu item
-                 *
+                 * @private
                  * @param {String} - `add` or `edit`
                  * @param {Number} - Disable tab when 0
-                 *
                  * @return {HTMLDOMElement} - created HTML tab-menu element
                  */
                 addMenuItem: function (tabName, disableTab) {
@@ -8234,11 +8355,10 @@
 
                     return menuItem;
                 },
-                /*
+                /**
                  * Create tab content
-                 *
+                 * @private
                  * @return {HTMLDOMElement} - created HTML tab-content element
-                 *
                  */
                 addContentItem: function () {
                     var popupDiv = this.popup.container;
@@ -8252,11 +8372,10 @@
                         popupDiv
                     );
                 },
-                /*
+                /**
                  * Add click event to each tab
-                 *
+                 * @private
                  * @param {Number} - Disable tab when 0
-                 *
                  */
                 switchTabs: function (disableTab) {
                     var _self = this,
@@ -8282,12 +8401,11 @@
                         });
                     });
                 },
-                /*
+                /**
                  * Set tab as visible
-                 *
+                 * @private
                  * @param {HTMLDOMElement} - current tab
                  * @param {Number} - Index of tab in menu
-                 *
                  */
                 selectTab: function (tab, index) {
                     var allTabs = this.popup.container
@@ -8296,9 +8414,9 @@
                     tab.className += ' ' + PREFIX + 'tab-item-active';
                     allTabs[index].className += ' ' + PREFIX + 'tab-item-show';
                 },
-                /*
+                /**
                  * Set all tabs as invisible.
-                 *
+                 * @private
                  */
                 deselectAll: function () {
                     var popupDiv = this.popup.container,