Be more consistent with control options

This commit is contained in:
Tom Payne
2013-04-06 19:13:03 +02:00
parent 7e8db559fe
commit ea22f0f8cc
9 changed files with 23 additions and 26 deletions

View File

@@ -23,9 +23,9 @@ ol.control.ControlOptions;
*
* @constructor
* @extends {goog.Disposable}
* @param {ol.control.ControlOptions} controlOptions Control options.
* @param {ol.control.ControlOptions} options Control options.
*/
ol.control.Control = function(controlOptions) {
ol.control.Control = function(options) {
goog.base(this);
@@ -33,14 +33,13 @@ ol.control.Control = function(controlOptions) {
* @protected
* @type {Element}
*/
this.element = goog.isDef(controlOptions.element) ?
controlOptions.element : null;
this.element = goog.isDef(options.element) ? options.element : null;
/**
* @private
* @type {Element|undefined}
*/
this.target_ = controlOptions.target;
this.target_ = options.target;
/**
* @private
@@ -54,8 +53,8 @@ ol.control.Control = function(controlOptions) {
*/
this.listenerKeys = [];
if (goog.isDef(controlOptions.map)) {
this.setMap(controlOptions.map);
if (goog.isDef(options.map)) {
this.setMap(options.map);
}
};