From dc93269cfa7c315d22d85c8217e2412749643f28 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 3 May 2012 22:51:10 -0700
Subject: Removing unused components references

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/Timeline/Layer.reel/Layer.html                 | 4 +---
 js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'js/panels/Timeline')

diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index 10334b31..9288d718 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -17,14 +17,12 @@
 						"styleRepetition" : {"@":"repetition1"},
 						"dynamicLayerName" : {"@":"dtext1"},
 						"dynamicLayerTag" : {"@": "dtext2"},
-						"slotStyle" : {"@":"slot1"},
 						"mainCollapser" : {"@" : "mainCollapser"},
 						"positionCollapser" : {"@" : "positionCollapser"},
 						"transformCollapser" : {"@" : "transformCollapser"},
 						"styleCollapser" : {"@" : "styleCollapser"},
 						"clickerMain" : {"#" : "clicker-main"},
-						"myLabel" : {"#" : "myLabel"},
-						"dragDrop" : {"@" : "DragDrop"}
+						"myLabel" : {"#" : "myLabel"}
                     }
                 },
 	            "dtext1" : {
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 44ad9abb..5c5a8b76 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -15,7 +15,6 @@
                        "properties": {
                            "element": {"#": "track"},
                            "tweenRepetition" : {"@" : "tweenRepetition"},
-                           "styleTracksRepetition" : {"@" : "styleTracksRepetition"},
                            "tween": {"@" : "tween"},
                            "_mainCollapser" : {"@" : "mainCollapser"},
                            "_positionCollapser" : {"@" : "positionCollapser"},
-- 
cgit v1.2.3


From 22af7613f36f3a30653060284e144830f9164c45 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 4 May 2012 00:18:33 -0700
Subject: temporary commenting a timeline bug preventing nested selection

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/panels/Timeline')

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 48818e44..d1cab096 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -654,7 +654,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
                 //debugger;
                 if (typeof(this.application.ninja.currentDocument.tlCurrentSelectedContainer) !== "undefined") {
-                	this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer;
+//                	this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer;
                 }
                 
                 // Are we only showing animated layers?
-- 
cgit v1.2.3