Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

3 files changed, 2 insertions, 2 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index b2683d30..12e87636 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -303,7 +303,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
                 newTween;
 
             selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
-            this.application.ninja.timeline.selectLayer(selectedIndex, true);
+            this.application.ninja.timeline.selectLayers([selectedIndex]);
 
             currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
             currentMillisec = currentMillisecPerPixel * clickPos;
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index f443553c..c9516d1f 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -645,7 +645,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                     var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
                     // this.application.ninja.timeline.selectLayer(selectedIndex, true); // deprecated
                     this.application.ninja.timeline.selectLayers([selectedIndex]);
-                    this.application.ninja.timeine.updateStageSelection();
+                    this.application.ninja.timeline.updateStageSelection();
                 if (this.tweens.length < 1) {
                     this.insertTween(0);
                     this.addAnimationRuleToElement(ev);
diff --git a/js/panels/Timeline/Track.reel/images/gridline.jpg b/js/panels/Timeline/Track.reel/images/gridline.jpg
new file mode 100644
index 00000000..9f451b0a
--- /dev/null
+++ b/js/panels/Timeline/Track.reel/images/gridline.jpg