diff options
| author | Jose Antonio Marquez | 2012-06-21 16:54:18 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-21 16:54:18 -0700 |
| commit | d6360c39f6cd90dd5e9a1d5ef5bd5211641dad42 (patch) | |
| tree | 564528119093e4e3408ccf180d55ac3d5e413813 /js/panels/Timeline | |
| parent | bf6bed611714053aabc0d38978bddd62873d04aa (diff) | |
| parent | 2af33f19de48bb8fe269c51ceddd1bc1f591651f (diff) | |
| download | ninja-d6360c39f6cd90dd5e9a1d5ef5bd5211641dad42.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/panels/Timeline')
| -rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js index c75e105d..66f39b5a 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | |||
| @@ -17,7 +17,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
| 17 | value:function(){ | 17 | value:function(){ |
| 18 | this.element.addEventListener("click", this, false); | 18 | this.element.addEventListener("click", this, false); |
| 19 | this.trackID = this.parentComponent.parentComponent.parentComponent.trackID; | 19 | this.trackID = this.parentComponent.parentComponent.parentComponent.trackID; |
| 20 | this.animatedElement = this.parentComponent.parentComponent.parentComponent.parentComponent.animatedElement; | 20 | this.animatedElement = this.parentComponent.parentComponent.parentComponent.animatedElement; |
| 21 | this.ninjaStylesContoller = this.application.ninja.stylesController; | 21 | this.ninjaStylesContoller = this.application.ninja.stylesController; |
| 22 | } | 22 | } |
| 23 | }, | 23 | }, |