26 files changed, 1270 insertions, 699 deletions
diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js
index 88314c8b..9c8d4434 100644
--- a/js/panels/Timeline/Collapser.js
+++ b/js/panels/Timeline/Collapser.js
@@ -151,7 +151,6 @@ var Montage = require("montage/core/core").Montage,
        // isToggling: Bindable property. Set this (to anything) to trigger a toggle.
        _isToggling: {
-                serializable: true,
                value: true
        },
        isToggling: {
@@ -179,7 +178,6 @@ var Montage = require("montage/core/core").Montage,
        
        prepareForDraw: {
                value: function() {
                        // Get the original value of the overflow property:
                        this._origOverflowValue = window.getComputedStyle(this.myContent, null).getPropertyValue("overflow");
                        if (this.isCollapsed === false) {
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.html b/js/panels/Timeline/Keyframe.reel/Keyframe.html
index 7e917b5a..4b029874 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.html
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <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/>
@@ -11,8 +11,7 @@
        <script type="text/montage-serialization">
                    {
                        "owner": {
-                            "module": "js/panels/Timeline/Keyframe.reel",
+                            "prototype": "js/panels/Timeline/Keyframe.reel",
-                            "name": "Keyframe",
                            "properties": {
                                "element": {"#": "keyframespace"}
                            }
@@ -23,7 +22,7 @@
        </head>
        <body>
-        <div id="keyframespace" class="tween_keyframe">
+        <div data-montage-id="keyframespace" class="tween_keyframe">
        </div>
    </body>
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js
index 859cdfb1..a4f957cf 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.js
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -31,6 +31,12 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
    prepareForDraw:{
        value:function(){
            this.element.addEventListener("click", this, false);
+            
+                        // Drag and drop event handlers
+                        this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false);
+                        this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);
+                        this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
+                        this.element.addEventListener("dragend", this.handleDragend.bind(this), false);
        }
    },
@@ -56,6 +62,41 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
    handleClick:{
        value:function(ev){
            this.selectKeyframe();
+            ev.stopPropagation();
        }
-    }
+    },
+    
+        handleMouseover: {
+                value: function(event) {
+                        this.element.draggable = true;
+                }
+        },
+        handleMouseout: {
+                value: function(event) {
+                        this.element.draggable = false;
+                }
+        },
+        handleDragstart: {
+                value: function(event) {
+                        //this.parentComponent.parentComponent.dragLayerID = this.layerID;
+            event.dataTransfer.setData('Text', 'Keyframe');
+            
+            // Get my index in my track's tween array
+            var i = 0,
+                tweenRepetitionLength = this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents.length,
+                myIndex = null;
+            for (i = 0; i < tweenRepetitionLength; i++) {
+                if (this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents[i].uuid === this.parentComponent.uuid) {
+                        myIndex = i;
+                }
+            }
+            this.parentComponent.parentComponent.parentComponent.draggingIndex = myIndex;
+                }
+        },
+        handleDragend: {
+                value: function(event) {
+                        this.parentComponent.isDragging = false;
+                }
+        }
+    
 });
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index 915e8b89..c7e7b575 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <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/>
@@ -11,26 +11,21 @@
                <script type="text/montage-serialization">
            {
                "owner": {
-                    "module": "js/panels/Timeline/Layer.reel",
+                    "prototype": "js/panels/Timeline/Layer.reel",
-                    "name": "Layer",
                    "properties": {
                        "element": {"#": "layer"},
                                                "styleRepetition" : {"@":"repetition1"},
                                                "dynamicLayerName" : {"@":"dtext1"},
                                                "dynamicLayerTag" : {"@": "dtext2"},
-                                                "slotStyle" : {"@":"slot1"},
                                                "mainCollapser" : {"@" : "mainCollapser"},
                                                "positionCollapser" : {"@" : "positionCollapser"},
-                                                "transformCollapser" : {"@" : "transformCollapser"},
                                                "styleCollapser" : {"@" : "styleCollapser"},
                                                "clickerMain" : {"#" : "clicker-main"},
-                                                "myLabel" : {"#" : "myLabel"},
+                                                "myLabel" : {"#" : "myLabel"}
-                                                "dragDrop" : {"@" : "DragDrop"}
                    }
                },
                    "dtext1" : {
-                        "module" : "montage/ui/dynamic-text.reel",
+                        "prototype" : "montage/ui/dynamic-text.reel",
-                        "name" : "DynamicText",
                        "properties" : {
                                "element" : {"#" : "layer-label-text"}
                        },
@@ -43,8 +38,7 @@
                        }
                    },
                    "dtext2" : {
-