2 files changed, 65 insertions, 18 deletions

diff --git a/js/models/element-model.js b/js/models/element-model.js
index fa02fd38..966158e4 100755
--- a/js/models/element-model.js
+++ b/js/models/element-model.js
@@ -4,7 +4,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var Montage = require("montage/core/core").Montage;
+var Montage             = require("montage/core/core").Montage,
+    Properties3D        = require("js/models/properties-3d").Properties3D,
+    ShapeModel          = require("js/models/shape-model").ShapeModel,
+    ControllerFactory   = require("js/controllers/elements/controller-factory").ControllerFactory,
+    PiData              = require("js/data/pi/pi-data").PiData;
 
 exports.ElementModel = Montage.create(Montage, {
     key:            { value: "_model_"},
@@ -16,36 +20,80 @@ exports.ElementModel = Montage.create(Montage, {
 
     id:             { value: "" },
     classList:      { value: null },
-
     defaultRule:    { value: null },
 
     top:            { value: null },
     left:           { value: null },
     width:          { value: null },
     height:         { value: null },
-
-    /**
-     * Properties 3D
-     */
     props3D:        { value: null },
 
-    /**
-     * Shape Info
-     */
     isShape:        { value: false },
     shapeModel:     { value: null },
-
-    /**
-     * SnapManager 2d Snap Cache Info
-     */
     isIn2DSnapCache : { value: false },
 
-    /**
-     * Color info
-     */
+    isComponent:    { value: false },
+
     fill:           { value: null },
     stroke:         { value: null },
 
+    initialize: {
+        value: function(el, isShape, selection, isComponent) {
+            var elementName, controller;
+
+            elementName = el.nodeName.toLowerCase();
+
+            this.type = el.nodeName;
+            this.selection = selection ? selection : elementName;
+
+            if(isComponent) {
+                controller = "component";
+                this.pi = this.elementNameToPi(selection.replace(/\s+/g, ''));
+                this.isComponent = true;
+            } else {
+                controller = this.elementNameToController(elementName);
+                this.pi = this.elementNameToPi(elementName);
+            }
+
+            this.props3D = Montage.create(Properties3D);
+
+            if(isShape) {
+                this.controller = ControllerFactory.getController("shape");
+                this.shapeModel = Montage.create(ShapeModel);
+                this.isShape = true;
+            } else {
+                this.controller = ControllerFactory.getController(controller);
+            }
+
+            return this;
+
+        }
+    },
+
+    elementNameToController: {
+        value: function(name) {
+            if(name === "div" || name === "custom") {
+                return "block";
+            } else if(name === "img") {
+                return "image";
+            } else {
+                return name;
+            }
+        }
+    },
+
+    elementNameToPi: {
+        value: function(name) {
+            var piString = name + "Pi";
+
+            if(!PiData.hasOwnProperty(piString)) {
+                piString = "blockPi";
+            }
+
+            return piString;
+        }
+    },
+
     getProperty: {
         value: function(property) {
             var key = this.key + property;
diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js
index c1270c3b..e571e505 100755
--- a/js/models/properties-3d.js
+++ b/js/models/properties-3d.js
@@ -5,8 +5,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 
 var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component,
-    NJUtils = require("js/lib/NJUtils").NJUtils;
+    Component = require("montage/ui/component").Component;
 
 exports.Properties3D = Montage.create(Component, {