From 735798a88c0df4f41871f031e5f9fbbd1bad9b97 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 7 Mar 2018 17:07:53 +0100 Subject: [PATCH] Add some typecast for the closure-compiler --- src/ol/array.js | 8 +++----- src/ol/xml.js | 13 +++++-------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/ol/array.js b/src/ol/array.js index 6ccb81c310..99b5a7a9af 100644 --- a/src/ol/array.js +++ b/src/ol/array.js @@ -126,15 +126,13 @@ export function reverseSubArray(arr, begin, end) { /** * @param {Array.} arr The array to modify. - * @param {Array.|VALUE} data The elements or arrays of elements - * to add to arr. + * @param {!Array.|VALUE} data The elements or arrays of elements to add to arr. * @template VALUE */ export function extend(arr, data) { - let i; const extension = Array.isArray(data) ? data : [data]; const length = extension.length; - for (i = 0; i < length; i++) { + for (let i = 0; i < length; i++) { arr[arr.length] = extension[i]; } } @@ -160,7 +158,7 @@ export function remove(arr, obj) { * @param {Array.} arr The array to search in. * @param {function(VALUE, number, ?) : boolean} func The function to compare. * @template VALUE - * @return {VALUE} The element found. + * @return {VALUE|null} The element found or null. */ export function find(arr, func) { const length = arr.length >>> 0; diff --git a/src/ol/xml.js b/src/ol/xml.js index 224e4fc00a..c7194f0e1d 100644 --- a/src/ol/xml.js +++ b/src/ol/xml.js @@ -420,11 +420,10 @@ export function parseNode(parsersNS, node, objectStack, opt_this) { * @return {T} Object. * @template T */ -export function pushParseAndPop( - object, parsersNS, node, objectStack, opt_this) { +export function pushParseAndPop(object, parsersNS, node, objectStack, opt_this) { objectStack.push(object); parseNode(parsersNS, node, objectStack, opt_this); - return objectStack.pop(); + return /** @type {T} */ (objectStack.pop()); } @@ -491,10 +490,8 @@ export function serialize( * @return {O|undefined} Object. * @template O, T */ -export function pushSerializeAndPop(object, - serializersNS, nodeFactory, values, objectStack, opt_keys, opt_this) { +export function pushSerializeAndPop(object, serializersNS, nodeFactory, values, objectStack, opt_keys, opt_this) { objectStack.push(object); - serialize( - serializersNS, nodeFactory, values, objectStack, opt_keys, opt_this); - return objectStack.pop(); + serialize(serializersNS, nodeFactory, values, objectStack, opt_keys, opt_this); + return /** @type {O|undefined} */ (objectStack.pop()); }