Avoid block scope issues in transpiled code

This commit is contained in:
ahocevar
2018-08-09 10:22:42 +02:00
parent 7f8b2d2e1f
commit fc19e3e12e

View File

@@ -428,9 +428,7 @@ class View extends BaseObject {
this.setRotation(state.rotation); this.setRotation(state.rotation);
} }
if (callback) { if (callback) {
setTimeout(function() { animationCallback(callback, true);
callback(true);
}, 0);
} }
return; return;
} }
@@ -517,7 +515,7 @@ class View extends BaseObject {
for (let i = 0, ii = this.animations_.length; i < ii; ++i) { for (let i = 0, ii = this.animations_.length; i < ii; ++i) {
const series = this.animations_[i]; const series = this.animations_[i];
if (series[0].callback) { if (series[0].callback) {
series[0].callback(false); animationCallback(series[0].callback, false);
} }
} }
this.animations_.length = 0; this.animations_.length = 0;
@@ -592,9 +590,7 @@ class View extends BaseObject {
this.setHint(ViewHint.ANIMATING, -1); this.setHint(ViewHint.ANIMATING, -1);
const callback = series[0].callback; const callback = series[0].callback;
if (callback) { if (callback) {
setTimeout(function() { animationCallback(callback, true);
callback(true);
}, 0);
} }
} }
} }
@@ -1069,7 +1065,7 @@ class View extends BaseObject {
} else { } else {
this.setResolution(resolution); this.setResolution(resolution);
this.setCenter(center); this.setCenter(center);
setTimeout(callback.bind(undefined, true), 0); animationCallback(callback, true);
} }
} }
@@ -1181,6 +1177,17 @@ class View extends BaseObject {
} }
/**
* @param {Function} callback Callback.
* @param {*} returnValue Return value.
*/
function animationCallback(callback, returnValue) {
setTimeout(function() {
callback(returnValue);
}, 0);
}
/** /**
* @param {module:ol/View~ViewOptions} options View options. * @param {module:ol/View~ViewOptions} options View options.
* @return {module:ol/centerconstraint~Type} The constraint. * @return {module:ol/centerconstraint~Type} The constraint.