Remove goog.isObject not in assertions

2016-07-16 09:31:27 +00:00
parent 34d5cc228e
commit 53a7aad431
3 changed files with 5 additions and 5 deletions
--- a/src/ol/format/jsonfeatureformat.js
+++ b/src/ol/format/jsonfeatureformat.js
@@ -26,11 +26,11 @@ ol.inherits(ol.format.JSONFeature, ol.format.Feature);
 * @return {Object} Object.
 */
 ol.format.JSONFeature.prototype.getObject_ = function(source) {
-  if (goog.isObject(source)) {
-    return source;
-  } else if (typeof source === 'string') {
+  if (typeof source === 'string') {
    var object = JSON.parse(source);
    return object ? /** @type {Object} */ (object) : null;
+  } else if (source !== null) {
+    return source;
  } else {
    goog.asserts.fail();
    return null;