Merge pull request #1397 from elemoine/observable

Make Interaction inherit from Observable
This commit is contained in:
Éric Lemoine
2013-12-17 01:46:23 -08:00

View File

@@ -3,8 +3,8 @@
goog.provide('ol.interaction.Interaction'); goog.provide('ol.interaction.Interaction');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.events.EventTarget');
goog.require('ol.MapBrowserEvent'); goog.require('ol.MapBrowserEvent');
goog.require('ol.Observable');
goog.require('ol.View2D'); goog.require('ol.View2D');
goog.require('ol.animation'); goog.require('ol.animation');
goog.require('ol.easing'); goog.require('ol.easing');
@@ -13,7 +13,7 @@ goog.require('ol.easing');
/** /**
* @constructor * @constructor
* @extends {goog.events.EventTarget} * @extends {ol.Observable}
*/ */
ol.interaction.Interaction = function() { ol.interaction.Interaction = function() {
goog.base(this); goog.base(this);
@@ -25,7 +25,7 @@ ol.interaction.Interaction = function() {
this.map_ = null; this.map_ = null;
}; };
goog.inherits(ol.interaction.Interaction, goog.events.EventTarget); goog.inherits(ol.interaction.Interaction, ol.Observable);
/** /**