diff options
| author | Jonathan Duran | 2012-06-21 12:54:10 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-21 12:54:10 -0700 |
| commit | 4e11d379a12f4edf888cc038ab94cf2ce222c625 (patch) | |
| tree | bf822ee2fa768231afe0595ccdbb1354ce10c4b8 /js | |
| parent | c8fc6d15e1570e89243abe527cd149e354f7e11f (diff) | |
| parent | cb9fbfeba90b5b76d3f3f2b9303129ca4651e5be (diff) | |
| download | ninja-4e11d379a12f4edf888cc038ab94cf2ce222c625.tar.gz | |
Merge branch 'refs/heads/Timeline-local-kruti' into Timeline-merge-candidate
Diffstat (limited to 'js')
| -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 | }, |