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

Use goog.object.get to suppress compiler warning about use of [] with struct

Browse Source
This commit is contained in:
Tom Payne
2013-12-13 20:36:32 +01:00
parent 6e3bcc7478
commit d63fec80d1
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ol/object.js
View File

@@ -299,8 +299,10 @@ ol.Object.prototype.get = function(key) {
var target = accessor.target;
var targetKey = accessor.key;
var getterName = ol.Object.getGetterName(targetKey);
if (target[getterName]) {
value = target[getterName]();
var getter = /** @type {function(): *|undefined} */
(goog.object.get(target, getterName));
if (goog.isDef(getter)) {
value = getter.call(target);
} else {
value = target.get(targetKey);
}
@@ -406,10 +408,12 @@ ol.Object.prototype.set = function(key, value) {
var accessor = accessors[key];
var target = accessor.target;
var targetKey = accessor.key;
var setterName = ol.Object.getSetterName(targetKey);
value = accessor.from(value);
if (target[setterName]) {
target[setterName](value);
var setterName = ol.Object.getSetterName(targetKey);
var setter = /** @type {function(*)|undefined} */
(goog.object.get(target, setterName));
if (goog.isDef(setter)) {
setter.call(target, value);
} else {
target.set(targetKey, value);
}
@@ -426,12 +430,14 @@ ol.Object.prototype.set = function(key, value) {
* @todo stability experimental
*/
ol.Object.prototype.setValues = function(values) {
var key, value, setterName;
var key;
for (key in values) {
value = values[key];
setterName = ol.Object.getSetterName(key);
if (this[setterName]) {
this[setterName](value);
var value = values[key];
var setterName = ol.Object.getSetterName(key);
var setter = /** @type {function(*)|undefined} */
(goog.object.get(this, setterName));
if (goog.isDef(setter)) {
setter.call(this, value);
} else {
this.set(key, value);
}