1 files changed, 10 insertions, 16 deletions

diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index 4169423b..3ad1763d 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);
@@ -278,7 +278,7 @@ exports.ComponentsPanel = Montage.create(Component, {
             that = this;
             element = this.makeComponent(component.component);
 
-            this.application.ninja.currentDocument._window.addComponent(element, {name: component.name, path: component.module}, function(instance, element) {
+            this.application.ninja.currentDocument.model.views.design.iframe.contentWindow.addComponent(element, {name: component.name, path: component.module}, function(instance, element) {
 
                 //var pos = that.getStageCenter();
 
@@ -295,21 +295,13 @@ exports.ComponentsPanel = Montage.create(Component, {
                     }
                 }
                 
-                instance.addEventListener('firstDraw', that, false);
-
-                that.application.ninja.currentDocument.setComponentInstance(instance, element);
+                that.application.ninja.currentDocument.model.setComponentInstance(instance, element);
 
                 that.application.ninja.elementMediator.addElements(element, styles);
             });
 
         }
     },
-    
-    handleFirstDraw: {
-        value: function (e) {
-                NJevent("addComponentFirstDraw");
-        }
-    },
 
     makeComponent: {
         value: function(name) {
@@ -346,7 +338,7 @@ exports.ComponentsPanel = Montage.create(Component, {
                     break;
                 case "select":
                     el = document.application.njUtils.make("select", null, this.application.ninja.currentDocument);
-                    document.application.njUtils.createModelForComponent(el, "Select");
+                    document.application.njUtils.createModelForComponent(el, "SelectInput");
                     break;
                 case "radioButton":
                     el = document.application.njUtils.make("input", null, this.application.ninja.currentDocument);
@@ -366,7 +358,7 @@ exports.ComponentsPanel = Montage.create(Component, {
                     break;
                 case "textarea":
                     el = document.application.njUtils.make("textarea", null, this.application.ninja.currentDocument);
-                    document.application.njUtils.createModelForComponent(el, "TextArea");
+                    document.application.njUtils.createModelForComponent(el, "Textarea");
                     break;
                 case "toggleButton":
                     el = document.application.njUtils.make("button", null, this.application.ninja.currentDocument);
@@ -392,6 +384,8 @@ exports.ComponentsPanel = Montage.create(Component, {
 
             }
 
+            el.setAttribute("data-montage-id", ClassUUID.generate());
+
             return el;
         }
     },
@@ -404,8 +398,8 @@ exports.ComponentsPanel = Montage.create(Component, {
             //if(!this.centerStage) {
                 var top, left;
 
-                top = ~~((parseFloat(this.application.ninja.elementMediator.getProperty(this.application.ninja.currentDocument.documentRoot, "height"))) / 2);
-                left = ~~((parseFloat(this.application.ninja.elementMediator.getProperty(this.application.ninja.currentDocument.documentRoot, "width"))) / 2);
+                top = (this.application.ninja.stage.canvas.height / 2); // ~~((parseFloat(this.application.ninja.elementMediator.getProperty(this.application.ninja.currentDocument.model.documentRoot, "height"))) / 2);
+                left = (this.application.ninja.stage.canvas.width / 2); //~~((parseFloat(this.application.ninja.elementMediator.getProperty(this.application.ninja.currentDocument.model.documentRoot, "width"))) / 2);
                 //this.centerStage = [top, left];
                 return [left, top];
             //}