diff --git a/src/ol/render/canvas/Replay.js b/src/ol/render/canvas/Replay.js index eb331b8612..5d743c264b 100644 --- a/src/ol/render/canvas/Replay.js +++ b/src/ol/render/canvas/Replay.js @@ -482,7 +482,7 @@ CanvasReplay.prototype.fill_ = function(context) { * @param {Array.<*>} instruction Instruction. */ CanvasReplay.prototype.setStrokeStyle_ = function(context, instruction) { - context.strokeStyle = /** @type {ol.ColorLike} */ (instruction[1]); + context.strokeStyle = /** @type {module:ol/colorlike~ColorLike} */ (instruction[1]); context.lineWidth = /** @type {number} */ (instruction[2]); context.lineCap = /** @type {string} */ (instruction[3]); context.lineJoin = /** @type {string} */ (instruction[4]); @@ -814,7 +814,7 @@ CanvasReplay.prototype.replay_ = function( } } - context.fillStyle = /** @type {ol.ColorLike} */ (instruction[1]); + context.fillStyle = /** @type {module:ol/colorlike~ColorLike} */ (instruction[1]); ++i; break; case CanvasInstruction.SET_STROKE_STYLE: diff --git a/src/ol/render/webgl/TextReplay.js b/src/ol/render/webgl/TextReplay.js index f287a6ea5b..57c1275c07 100644 --- a/src/ol/render/webgl/TextReplay.js +++ b/src/ol/render/webgl/TextReplay.js @@ -44,14 +44,14 @@ const WebGLTextReplay = function(tolerance, maxExtent) { /** * @private - * @type {{strokeColor: (ol.ColorLike|null), + * @type {{strokeColor: (module:ol/colorlike~ColorLike|null), * lineCap: (string|undefined), * lineDash: Array., * lineDashOffset: (number|undefined), * lineJoin: (string|undefined), * lineWidth: number, * miterLimit: (number|undefined), - * fillColor: (ol.ColorLike|null), + * fillColor: (module:ol/colorlike~ColorLike|null), * font: (string|undefined), * scale: (number|undefined)}} */ diff --git a/src/ol/style/Fill.js b/src/ol/style/Fill.js index edfd102109..b0ce0803f4 100644 --- a/src/ol/style/Fill.js +++ b/src/ol/style/Fill.js @@ -18,7 +18,7 @@ const Fill = function(opt_options) { /** * @private - * @type {ol.Color|ol.ColorLike} + * @type {ol.Color|module:ol/colorlike~ColorLike} */ this.color_ = options.color !== undefined ? options.color : null; @@ -31,7 +31,7 @@ const Fill = function(opt_options) { /** - * Clones the style. The color is not cloned if it is an {@link ol.ColorLike}. + * Clones the style. The color is not cloned if it is an {@link module:ol/colorlike~ColorLike}. * @return {ol.style.Fill} The cloned style. * @api */ @@ -45,7 +45,7 @@ Fill.prototype.clone = function() { /** * Get the fill color. - * @return {ol.Color|ol.ColorLike} Color. + * @return {ol.Color|module:ol/colorlike~ColorLike} Color. * @api */ Fill.prototype.getColor = function() { @@ -56,7 +56,7 @@ Fill.prototype.getColor = function() { /** * Set the color. * - * @param {ol.Color|ol.ColorLike} color Color. + * @param {ol.Color|module:ol/colorlike~ColorLike} color Color. * @api */ Fill.prototype.setColor = function(color) { diff --git a/src/ol/style/Stroke.js b/src/ol/style/Stroke.js index cde489a8ee..63ab1ce76b 100644 --- a/src/ol/style/Stroke.js +++ b/src/ol/style/Stroke.js @@ -20,7 +20,7 @@ const Stroke = function(opt_options) { /** * @private - * @type {ol.Color|ol.ColorLike} + * @type {ol.Color|module:ol/colorlike~ColorLike} */ this.color_ = options.color !== undefined ? options.color : null; @@ -89,7 +89,7 @@ Stroke.prototype.clone = function() { /** * Get the stroke color. - * @return {ol.Color|ol.ColorLike} Color. + * @return {ol.Color|module:ol/colorlike~ColorLike} Color. * @api */ Stroke.prototype.getColor = function() { @@ -160,7 +160,7 @@ Stroke.prototype.getWidth = function() { /** * Set the color. * - * @param {ol.Color|ol.ColorLike} color Color. + * @param {ol.Color|module:ol/colorlike~ColorLike} color Color. * @api */ Stroke.prototype.setColor = function(color) { diff --git a/src/ol/typedefs.js b/src/ol/typedefs.js index 33f3a19b44..ad1fa4e681 100644 --- a/src/ol/typedefs.js +++ b/src/ol/typedefs.js @@ -70,7 +70,7 @@ ol.Attribution; /** - * @typedef {{fillStyle: ol.ColorLike}} + * @typedef {{fillStyle: module:ol/colorlike~ColorLike}} */ ol.CanvasFillState; @@ -91,8 +91,8 @@ ol.CanvasFunctionType; /** - * @typedef {{currentFillStyle: (ol.ColorLike|undefined), - * currentStrokeStyle: (ol.ColorLike|undefined), + * @typedef {{currentFillStyle: (module:ol/colorlike~ColorLike|undefined), + * currentStrokeStyle: (module:ol/colorlike~ColorLike|undefined), * currentLineCap: (string|undefined), * currentLineDash: Array., * currentLineDashOffset: (number|undefined), @@ -100,8 +100,8 @@ ol.CanvasFunctionType; * currentLineWidth: (number|undefined), * currentMiterLimit: (number|undefined), * lastStroke: (number|undefined), - * fillStyle: (ol.ColorLike|undefined), - * strokeStyle: (ol.ColorLike|undefined), + * fillStyle: (module:ol/colorlike~ColorLike|undefined), + * strokeStyle: (module:ol/colorlike~ColorLike|undefined), * lineCap: (string|undefined), * lineDash: Array., * lineDashOffset: (number|undefined), @@ -119,7 +119,7 @@ ol.CanvasFillStrokeState; * lineJoin: string, * lineWidth: number, * miterLimit: number, - * strokeStyle: ol.ColorLike}} + * strokeStyle: module:ol/colorlike~ColorLike}} */ ol.CanvasStrokeState; @@ -133,7 +133,7 @@ ol.CanvasTextState; /** - * @typedef {{strokeStyle: (ol.ColorLike|undefined), strokeWidth: number, + * @typedef {{strokeStyle: (module:ol/colorlike~ColorLike|undefined), strokeWidth: number, * size: number, lineDash: Array.}} */ ol.CircleRenderOptions; @@ -223,7 +223,7 @@ ol.RasterOperation; /** * @typedef {{ - * strokeStyle: (ol.ColorLike|undefined), + * strokeStyle: (module:ol/colorlike~ColorLike|undefined), * strokeWidth: number, * size: number, * lineCap: string,