Always use goog.json.parse and set goog.json.USE_NATIVE_JSON=true
This commit is contained in:
@@ -236,6 +236,7 @@ def examples_star_json(name, match):
|
|||||||
],
|
],
|
||||||
"define": [
|
"define": [
|
||||||
"goog.dom.ASSUME_STANDARDS_MODE=true",
|
"goog.dom.ASSUME_STANDARDS_MODE=true",
|
||||||
|
"goog.json.USE_NATIVE_JSON=true",
|
||||||
"goog.DEBUG=false"
|
"goog.DEBUG=false"
|
||||||
],
|
],
|
||||||
"jscomp_error": [
|
"jscomp_error": [
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
],
|
],
|
||||||
"define": [
|
"define": [
|
||||||
"goog.dom.ASSUME_STANDARDS_MODE=true",
|
"goog.dom.ASSUME_STANDARDS_MODE=true",
|
||||||
|
"goog.json.USE_NATIVE_JSON=true",
|
||||||
"goog.DEBUG=false"
|
"goog.DEBUG=false"
|
||||||
],
|
],
|
||||||
"jscomp_error": [
|
"jscomp_error": [
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
],
|
],
|
||||||
"define": [
|
"define": [
|
||||||
"goog.dom.ASSUME_STANDARDS_MODE=true",
|
"goog.dom.ASSUME_STANDARDS_MODE=true",
|
||||||
|
"goog.json.USE_NATIVE_JSON=true",
|
||||||
"goog.DEBUG=false"
|
"goog.DEBUG=false"
|
||||||
],
|
],
|
||||||
"jscomp_error": [
|
"jscomp_error": [
|
||||||
|
|||||||
@@ -89,14 +89,6 @@ ol.BrowserFeature.HAS_DOM = ol.ENABLE_DOM;
|
|||||||
ol.BrowserFeature.HAS_GEOLOCATION = 'geolocation' in goog.global.navigator;
|
ol.BrowserFeature.HAS_GEOLOCATION = 'geolocation' in goog.global.navigator;
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @const
|
|
||||||
* @type {boolean}
|
|
||||||
*/
|
|
||||||
ol.BrowserFeature.HAS_JSON_PARSE =
|
|
||||||
'JSON' in goog.global && 'parse' in goog.global.JSON;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* True if browser supports touch events.
|
* True if browser supports touch events.
|
||||||
* @const
|
* @const
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ goog.provide('ol.format.JSONFeature');
|
|||||||
|
|
||||||
goog.require('goog.asserts');
|
goog.require('goog.asserts');
|
||||||
goog.require('goog.json');
|
goog.require('goog.json');
|
||||||
goog.require('ol.BrowserFeature');
|
|
||||||
goog.require('ol.format.Feature');
|
goog.require('ol.format.Feature');
|
||||||
goog.require('ol.format.FormatType');
|
goog.require('ol.format.FormatType');
|
||||||
|
|
||||||
@@ -32,12 +31,7 @@ ol.format.JSONFeature.prototype.getObject_ = function(source) {
|
|||||||
if (goog.isObject(source)) {
|
if (goog.isObject(source)) {
|
||||||
return source;
|
return source;
|
||||||
} else if (goog.isString(source)) {
|
} else if (goog.isString(source)) {
|
||||||
var object;
|
var object = goog.json.parse(source);
|
||||||
if (ol.BrowserFeature.HAS_JSON_PARSE) {
|
|
||||||
object = /** @type {Object} */ (JSON.parse(source));
|
|
||||||
} else {
|
|
||||||
object = goog.json.parse(source);
|
|
||||||
}
|
|
||||||
return goog.isDef(object) ? object : null;
|
return goog.isDef(object) ? object : null;
|
||||||
} else {
|
} else {
|
||||||
goog.asserts.fail();
|
goog.asserts.fail();
|
||||||
|
|||||||
Reference in New Issue
Block a user