Merge pull request #5495 from fredj/rm_goog.isFunction
Get rid of goog.isFunction
This commit is contained in:
+1
-1
@@ -294,7 +294,7 @@ ol.Feature.prototype.setGeometryName = function(name) {
|
|||||||
ol.Feature.createStyleFunction = function(obj) {
|
ol.Feature.createStyleFunction = function(obj) {
|
||||||
var styleFunction;
|
var styleFunction;
|
||||||
|
|
||||||
if (goog.isFunction(obj)) {
|
if (typeof obj === 'function') {
|
||||||
styleFunction = obj;
|
styleFunction = obj;
|
||||||
} else {
|
} else {
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ ol.featureloader.loadFeaturesXhr = function(url, format, success, failure) {
|
|||||||
function(extent, resolution, projection) {
|
function(extent, resolution, projection) {
|
||||||
var xhr = new XMLHttpRequest();
|
var xhr = new XMLHttpRequest();
|
||||||
xhr.open('GET',
|
xhr.open('GET',
|
||||||
goog.isFunction(url) ? url(extent, resolution, projection) : url,
|
typeof url === 'function' ? url(extent, resolution, projection) : url,
|
||||||
true);
|
true);
|
||||||
if (format.getType() == ol.format.FormatType.ARRAY_BUFFER) {
|
if (format.getType() == ol.format.FormatType.ARRAY_BUFFER) {
|
||||||
xhr.responseType = 'arraybuffer';
|
xhr.responseType = 'arraybuffer';
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ ol.interaction.Select = function(opt_options) {
|
|||||||
|
|
||||||
var layerFilter;
|
var layerFilter;
|
||||||
if (options.layers) {
|
if (options.layers) {
|
||||||
if (goog.isFunction(options.layers)) {
|
if (typeof options.layers === 'function') {
|
||||||
/**
|
/**
|
||||||
* @param {ol.layer.Layer} layer Layer.
|
* @param {ol.layer.Layer} layer Layer.
|
||||||
* @return {boolean} Include.
|
* @return {boolean} Include.
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ ol.interaction.Translate = function(options) {
|
|||||||
|
|
||||||
var layerFilter;
|
var layerFilter;
|
||||||
if (options.layers) {
|
if (options.layers) {
|
||||||
if (goog.isFunction(options.layers)) {
|
if (typeof options.layers === 'function') {
|
||||||
/**
|
/**
|
||||||
* @param {ol.layer.Layer} layer Layer.
|
* @param {ol.layer.Layer} layer Layer.
|
||||||
* @return {boolean} Include.
|
* @return {boolean} Include.
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ ol.layer.Heatmap = function(opt_options) {
|
|||||||
} else {
|
} else {
|
||||||
weightFunction = weight;
|
weightFunction = weight;
|
||||||
}
|
}
|
||||||
goog.asserts.assert(goog.isFunction(weightFunction),
|
goog.asserts.assert(typeof weightFunction === 'function',
|
||||||
'weightFunction should be a function');
|
'weightFunction should be a function');
|
||||||
|
|
||||||
this.setStyle(function(feature, resolution) {
|
this.setStyle(function(feature, resolution) {
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ ol.layer.Vector = function(opt_options) {
|
|||||||
|
|
||||||
goog.asserts.assert(
|
goog.asserts.assert(
|
||||||
options.renderOrder === undefined || !options.renderOrder ||
|
options.renderOrder === undefined || !options.renderOrder ||
|
||||||
goog.isFunction(options.renderOrder),
|
typeof options.renderOrder === 'function',
|
||||||
'renderOrder must be a comparator function');
|
'renderOrder must be a comparator function');
|
||||||
|
|
||||||
var baseOptions = ol.object.assign({}, options);
|
var baseOptions = ol.object.assign({}, options);
|
||||||
@@ -161,7 +161,7 @@ ol.layer.Vector.prototype.getUpdateWhileInteracting = function() {
|
|||||||
ol.layer.Vector.prototype.setRenderOrder = function(renderOrder) {
|
ol.layer.Vector.prototype.setRenderOrder = function(renderOrder) {
|
||||||
goog.asserts.assert(
|
goog.asserts.assert(
|
||||||
renderOrder === undefined || !renderOrder ||
|
renderOrder === undefined || !renderOrder ||
|
||||||
goog.isFunction(renderOrder),
|
typeof renderOrder === 'function',
|
||||||
'renderOrder must be a comparator function');
|
'renderOrder must be a comparator function');
|
||||||
this.set(ol.layer.VectorProperty.RENDER_ORDER, renderOrder);
|
this.set(ol.layer.VectorProperty.RENDER_ORDER, renderOrder);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ ol.style.Style.prototype.getZIndex = function() {
|
|||||||
* @api
|
* @api
|
||||||
*/
|
*/
|
||||||
ol.style.Style.prototype.setGeometry = function(geometry) {
|
ol.style.Style.prototype.setGeometry = function(geometry) {
|
||||||
if (goog.isFunction(geometry)) {
|
if (typeof geometry === 'function') {
|
||||||
this.geometryFunction_ = geometry;
|
this.geometryFunction_ = geometry;
|
||||||
} else if (typeof geometry === 'string') {
|
} else if (typeof geometry === 'string') {
|
||||||
this.geometryFunction_ = function(feature) {
|
this.geometryFunction_ = function(feature) {
|
||||||
@@ -202,7 +202,7 @@ ol.style.Style.prototype.setZIndex = function(zIndex) {
|
|||||||
ol.style.createStyleFunction = function(obj) {
|
ol.style.createStyleFunction = function(obj) {
|
||||||
var styleFunction;
|
var styleFunction;
|
||||||
|
|
||||||
if (goog.isFunction(obj)) {
|
if (typeof obj === 'function') {
|
||||||
styleFunction = obj;
|
styleFunction = obj;
|
||||||
} else {
|
} else {
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user