From 8ef667315ca6a81bb1369943eaf3643ae2db5037 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Mon, 26 Mar 2012 17:04:28 -0700
Subject: Timeline: Drag and Drop of layers.

---
 js/panels/Timeline/Layer.reel/Layer.html | 32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

(limited to 'js/panels/Timeline/Layer.reel/Layer.html')

diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index ef98bdd5..454c2742 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -23,7 +23,8 @@
 						"transformCollapser" : {"@" : "transformCollapser"},
 						"styleCollapser" : {"@" : "styleCollapser"},
 						"clickerMain" : {"#" : "clicker-main"},
-						"myLabel" : {"#" : "myLabel"}
+						"myLabel" : {"#" : "myLabel"},
+						"dragDrop" : {"@" : "DragDrop"}
                     }
                 },
 	            "dtext1" : {
@@ -315,34 +316,7 @@
 							"oneway" : false
 						}
 					}
-				},
-
-	            "DragDrop": {
-	                "module": "js/panels/Timeline/DragDrop.js",
-	                "name": "DragDropComposer",
-	                "properties": {
-	                    "element": {"#": "myLabel"},
-	                    "component": {"@": "owner"}
-	                },
-	                "listeners": [
-	                    {
-	                        "type": "dragStart",
-	                        "listener": {"@": "owner"}
-	                    },
-	                    {
-	                        "type": "dropHover",
-	                        "listener": {"@": "owner"}
-	                    },
-	                    {
-	                        "type": "dropped",
-	                        "listener": {"@": "owner"}
-	                    },
-	                    {
-	                        "type": "dropEnd",
-	                        "listener": {"@": "owner"}
-	                    }
-	                ]
-	            }
+				}
 				
 				
             }
-- 
cgit v1.2.3