Squashed commit of the following:

commit fe0d1578305db78eb5a744c354dbbb3cec67be2a
Author: Kruti Shah <kruti.shah@motorola.com>
Date:   Thu Feb 9 11:43:53 2012 -0800

    Removing a flag

    Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

commit 7a7e5d9a07c85a9a35297efe74f8b45bc4bd3c62
Author: Kruti Shah <kruti.shah@motorola.com>
Date:   Thu Feb 9 11:42:39 2012 -0800

    Timeline : Selection Handling depending on layer selected

    Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

commit d0a4d88ddef2f1690da490cf8f3d167f1eb01945
Merge: ad214f9 f6ad57e
Author: Kruti Shah <kruti.shah@motorola.com>
Date:   Thu Feb 9 09:54:42 2012 -0800

    Merge branch 'refs/heads/Timeline' into Timeline_updated

    Conflicts:
    	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

    Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

commit ad214f9b5bc19c43eac39e4c9d93cd9645aed2ea
Author: Kruti Shah <kruti.shah@motorola.com>
Date:   Thu Feb 9 09:40:14 2012 -0800

    Timeline : When element selected the corresponding layer highlights

    Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

Signed-off-by: Jonathan Duran <jduran@motorola.com>

2 files changed, 89 insertions, 0 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 9aefbca6..95aec2a3 100644
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -105,6 +105,25 @@ exports.ElementMediator = Montage.create(NJComponent, {
         }
     },
 
+    deleteElements: {
+         value: function(items) {
+            // Add the Undo/Redo
+            var len, el;
+
+            len = items.length;
+
+            if(len) {
+
+                for(var i = len - 1; i >= 0; i--) {
+                    el = items[i]._element || items[i];
+                    this._removeElement(el);
+                }
+
+                NJevent( "deleteSelection", items );
+            }
+         }
+    },
+
     _removeElement: {
         value: function(el, rules) {
             ElementController.removeElement(el, rules);
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index b3f4318a..4586c4eb 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -3,6 +3,7 @@ var Component = require("montage/ui/component").Component;
 var Layer = require("js/panels/Timeline/Layer.reel").Layer;
 var TimelineTrack = require("js/panels/Timeline/TimelineTrack.reel").TimelineTrack;
 var nj = require("js/lib/NJUtils").NJUtils;
+var ElementMediator = require("js/mediators/element-mediator").ElementMediator;
 
 var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
@@ -121,6 +122,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:true,
         writable:true
     },
+
+    _captureSelection:{
+        value:false,
+        writable:true
+    },
     /* === END: Models === */
 
     /* === BEGIN: Draw cycle === */
@@ -134,9 +140,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.eventManager.addEventListener("elementAdded", this, false);
             this.eventManager.addEventListener("elementDeleted", this, false);
             this.eventManager.addEventListener("deleteSelection", this, false);
+            this.eventManager.addEventListener("selectionChange", this, true);
             this.hashInstance = this.createLayerHashTable();
             this.hashTrackInstance = this.createTrackHashTable();
             this.hashLayerNumber = this.createLayerNumberHash();
+            this.hashElementMapToLayer = this.createElementMapToLayer();
             this.initTimelineView();
         }
     },
@@ -182,6 +190,23 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
+    captureSelectionChange:{
+        value:function(){
+            var key , switchSelectedLayer,layerIndex;
+            if(this.application.ninja.selectedElements[0]){
+                key = this.application.ninja.selectedElements[0].uuid;
+                switchSelectedLayer = this.hashElementMapToLayer.getItem(key);
+                if(switchSelectedLayer!==undefined){
+                    layerIndex = this.getLayerIndexByID(switchSelectedLayer.layerID)
+                    this._captureSelection=false;
+                    this.selectLayer(layerIndex);
+                    this._captureSelection=true;
+
+                }
+            }
+        }
+    },
+
     updateTimeText:{
         value:function (millisec) {
             var timeText;
@@ -398,11 +423,16 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     this.hashLayerNumber.setItem(this._hashKey, thingToPush);
                     this.hashInstance.setItem(this._hashKey, thingToPush, thingToPush.layerPosition);
                     this.hashTrackInstance.setItem(this._hashKey, newTrack, newTrack.trackPosition);
+
                 }
                 this._LayerUndoObject = thingToPush;
                 this._LayerUndoIndex = thingToPush.layerID;
                 this._LayerUndoStatus = true;
                 this._TrackUndoObject = newTrack;
+                if(_firstLayerDraw){
+                this.application.ninja.selectionController.executeSelectElement();
+                }
+
             }
         }
     },
@@ -427,6 +457,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                                 while (this.arrLayers.length) {
                                     if (dLayer[hashVariable]._layerID === this.arrLayers[k]._layerID) {
                                         dLayer[hashVariable].deleted = true;
+                                        ElementMediator.deleteElements(dLayer[myIndex].element);
                                         this.arrLayers.splice(k, 1);
                                         this.arrTracks.splice(k, 1);
                                         break;
@@ -442,6 +473,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         while (dLayer[hashVariable]) {
                             if (dLayer[hashVariable]._layerID === event.detail._el._layerID) {
                                 dLayer[hashVariable].deleted = true;
+                                ElementMediator.deleteElements(dLayer[myIndex].element);
                                 parentNode = dLayer[hashVariable].parentElement;
                                 break;
                             }
@@ -459,6 +491,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                                 while (this.arrLayers.length) {
                                     if (dLayer[hashVariable]._layerID === this.arrLayers[k]._layerID) {
                                         dLayer[hashVariable].deleted = true;
+                                        ElementMediator.deleteElements(dLayer[myIndex].element);
                                         this.arrLayers.splice(k, 1);
                                         this.arrTracks.splice(k, 1);
                                         break;
@@ -479,6 +512,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         dLayer = this.hashInstance.getItem(this._hashKey);
                         dTrack = this.hashTrackInstance.getItem(this._hashKey);
                         dLayer[myIndex].deleted = true;
+                        ElementMediator.deleteElements(dLayer[myIndex].element);
 
                         this.arrLayers.splice(myIndex, 1);
                         this.arrTracks.splice(myIndex, 1);
@@ -488,6 +522,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         dLayer = this.hashInstance.getItem(this._hashKey);
                         dTrack = this.hashTrackInstance.getItem(this._hashKey);
                         dLayer[this.arrLayers.length - 1].deleted = true;
+                        ElementMediator.deleteElements(dLayer[this.arrLayers.length - 1].element);
                         this._LayerUndoPosition = this.arrLayers.length - 1;
                         this._LayerUndoObject = this.arrLayers.pop();
                         this._LayerUndoIndex = this._LayerUndoObject.layerID;
@@ -500,7 +535,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     handleElementAdded:{
         value:function (event) {
+
+            this.hashElementMapToLayer.setItem(event.detail.uuid , event.detail,this.currentLayerSelected)
             this.currentLayerSelected.element.push(event.detail);
+
         }
     },
 
@@ -667,6 +705,35 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             return hashLayerNumberObject;
         }
     },
+   
+    createElementMapToLayer:{
+        value:function(){
+            var hashMappingObject
+            hashMappingObject = Object.create(Object.prototype, {
+                mappi