From 8c087f7c13a2bd72e1640e99e339a74fc2250901 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 3 Jul 2012 15:47:50 -0700
Subject: Timeline: First pass at cleaning up TimelineTrack code.  Changes
 propagated to PropertyTrack, TimelineTrack, and Tween classes.

---
 js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 9f2b2eb0..7c497dd9 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -619,7 +619,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.application.ninja.timeline.updateTimeText(currentMillisec);
             if (ev.shiftKey) {
 	            var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
-	            this.application.ninja.timeline.selectLayer(selectedIndex, true);
+	            // this.application.ninja.timeline.selectLayer(selectedIndex, true); // deprecated
+	            this.application.ninja.timeline.selectLayers([selectedIndex]);
+	            this.application.ninja.timeine.updateStageSelection();
                 if (this.tweens.length < 1) {
                     this.insertTween(0);
                     this.addAnimationRuleToElement(ev);
@@ -718,7 +720,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:function (ev) {
             if (ev.offsetX > this.tweens[this.tweens.length - 1].tweenData.keyFramePosition) {
                 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
-                this.application.ninja.timeline.selectLayer(selectedIndex, false);
+                // this.application.ninja.timeline.selectLayer(selectedIndex, false); // deprecated
+                this.application.ninja.timeline.selectLayers([selectedIndex]);
                 this.insertTween(ev.offsetX);
             } else {
 	            if (typeof(ev.currentTarget) === "undefined") {
-- 
cgit v1.2.3


From a869cd3619b783e29cf320f46713b0c790edb15f Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 10:57:37 -0700
Subject: Update copyright boilerplate

---
 .../Timeline/TimelineTrack.reel/TimelineTrack.js   | 32 +++++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

(limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 26ce526f..11d275ce 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -1,8 +1,32 @@
 /* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
+Copyright (c) 2012, Motorola Mobility, Inc
+All Rights Reserved.
+BSD License.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+  - Neither the name of Motorola Mobility nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</copyright> */
 
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
-- 
cgit v1.2.3