ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove use of goog.object.setIfUndefined()

Browse Source
This commit is contained in:
Tim Schaub
2016-02-03 22:07:26 -07:00
parent fd394151fd
commit 417dbf36c8
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/format/wmscapabilitiesformat.js
View File

@@ -2,7 +2,6 @@ goog.provide('ol.format.WMSCapabilities');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.dom.NodeType'); goog.require('goog.dom.NodeType');
goog.require('goog.object');
goog.require('ol'); goog.require('ol');
goog.require('ol.format.XLink'); goog.require('ol.format.XLink');
goog.require('ol.format.XML'); goog.require('ol.format.XML');
@@ -339,9 +338,8 @@ ol.format.WMSCapabilities.readLayer_ = function(node, objectStack) {
var addKeys = ['Style', 'CRS', 'AuthorityURL']; var addKeys = ['Style', 'CRS', 'AuthorityURL'];
addKeys.forEach(function(key) { addKeys.forEach(function(key) {
if (key in parentLayerObject) { if (key in parentLayerObject) {
var childValue = goog.object.setIfUndefined(layerObject, key, []); var childValue = layerObject[key] || [];
childValue = childValue.concat(parentLayerObject[key]); layerObject[key] = childValue.concat(parentLayerObject[key]);
layerObject[key] = childValue;
} }
}); });

8
src/ol/xml.js
View File

@@ -3,7 +3,6 @@ goog.provide('ol.xml');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.dom.NodeType'); goog.require('goog.dom.NodeType');
goog.require('goog.dom.xml'); goog.require('goog.dom.xml');
goog.require('goog.object');
goog.require('goog.userAgent'); goog.require('goog.userAgent');
goog.require('ol.array'); goog.require('ol.array');
@@ -454,7 +453,12 @@ ol.xml.makeObjectPropertyPusher = function(valueReader, opt_property, opt_this)
opt_property : node.localName; opt_property : node.localName;
goog.asserts.assert(goog.isObject(object), goog.asserts.assert(goog.isObject(object),
'entity from stack was not an object'); 'entity from stack was not an object');
var array = goog.object.setIfUndefined(object, property, []); var array;
if (property in object) {
array = object[property];
} else {
array = object[property] = [];
}
array.push(value); array.push(value);
} }
}); });