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

simplify the assignment of this.target_

Browse Source
This commit is contained in:
Bart van den Eijnden
2013-11-05 16:52:24 +01:00
parent e6c4fd973a
commit 2fc884a3d9
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ol/control/control.js
View File

@@ -30,12 +30,10 @@ ol.control.Control = function(options) {
/** /**
* @private * @private
* @type {Element|undefined} * @type {?Element}
*/ */
this.target_ = goog.isDef(options.target) ? (goog.isString(options.target) ? this.target_ = goog.isDef(options.target) ?
goog.dom.getElement(options.target) !== null ? goog.dom.getElement(options.target) : null;
goog.dom.getElement(options.target) : undefined : options.target) :
undefined;
/** /**
* @private * @private
@@ -98,7 +96,7 @@ ol.control.Control.prototype.setMap = function(map) {
} }
this.map_ = map; this.map_ = map;
if (!goog.isNull(this.map_)) { if (!goog.isNull(this.map_)) {
var target = goog.isDef(this.target_) ? var target = !goog.isNull(this.target_) ?
this.target_ : map.getOverlayContainerStopEvent(); this.target_ : map.getOverlayContainerStopEvent();
goog.dom.appendChild(target, this.element); goog.dom.appendChild(target, this.element);
if (this.handleMapPostrender !== goog.nullFunction) { if (this.handleMapPostrender !== goog.nullFunction) {

2
test/spec/ol/control/control.test.js
View File

@@ -42,7 +42,7 @@ describe('ol.control.Control\'s target', function() {
}); });
it('ignores non-existing target id', function() { it('ignores non-existing target id', function() {
var ctrl = new ol.control.Control({target: 'doesnotexist'}); var ctrl = new ol.control.Control({target: 'doesnotexist'});
expect(ctrl.target_).to.equal(undefined); expect(ctrl.target_).to.equal(null);
goog.dispose(ctrl); goog.dispose(ctrl);
}); });
}); });