1 files changed, 4 insertions, 10 deletions

diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index 87d5082d..e028d1db 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -7,8 +7,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage     = require("montage/core/core").Montage,
     Component   = require("montage/ui/component").Component,
     NJUtils     = require("js/lib/NJUtils").NJUtils;
-
-var PIData              = require("js/data/pi/pi-data").PiData;
+    ClassUUID   = require("js/components/core/class-uuid").ClassUuid,
+    PIData      = require("js/data/pi/pi-data").PiData;
 
 String.prototype.capitalizeFirstChar = function() {
     return this.charAt(0).toUpperCase() + this.slice(1);
@@ -295,8 +295,6 @@ exports.ComponentsPanel = Montage.create(Component, {
                     }
                 }
                 
-                instance.addEventListener('firstDraw', that, false);
-
                 that.application.ninja.currentDocument.model.setComponentInstance(instance, element);
 
                 that.application.ninja.elementMediator.addElements(element, styles);
@@ -304,12 +302,6 @@ exports.ComponentsPanel = Montage.create(Component, {
 
         }
     },
-    
-    handleFirstDraw: {
-        value: function (e) {
-                NJevent("addComponentFirstDraw");
-        }
-    },
 
     makeComponent: {
         value: function(name) {
@@ -392,6 +384,8 @@ exports.ComponentsPanel = Montage.create(Component, {
 
             }
 
+            el.setAttribute("data-montage-id", ClassUUID.generate());
+
             return el;
         }
     },