Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/components/tools-properties/brush-properties.reel/brush-properties.html
	js/components/tools-properties/fill-properties.reel/fill-properties.html
	js/components/tools-properties/pen-properties.reel/pen-properties.html
	js/components/tools-properties/pencil-properties.reel/pencil-properties.html
	js/components/tools-properties/selection-properties.reel/selection-properties.html
	js/components/tools-properties/shape-properties.reel/shape-properties.html
	js/components/tools-properties/tag-properties.reel/tag-properties.html
	js/components/tools-properties/text-properties.reel/text-properties.html

1 files changed, 60 insertions, 15 deletions

diff --git a/js/models/element-model.js b/js/models/element-model.js
index 0e199a67..966158e4 100755
--- a/js/models/element-model.js
+++ b/js/models/element-model.js
@@ -4,10 +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,
-    Properties3D    = require("js/models/properties-3d").Properties3D,
-    ShapeModel    = require("js/models/shape-model").ShapeModel,
-    ControllerFactory   = require("js/controllers/elements/controller-factory").ControllerFactory;
+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_"},
@@ -31,21 +32,65 @@ exports.ElementModel = Montage.create(Montage, {
     shapeModel:     { value: null },
     isIn2DSnapCache : { value: false },
 
+    isComponent:    { value: false },
+
     fill:           { value: null },
     stroke:         { value: null },
 
     initialize: {
-        value: function(type, selection, controller, isShape) {
-            /*
-            this.type = type;
-            this.selection = selection;
-
-            controller: { value: ControllerFactory.getController(controller)},
-            pi:         { value: pi},
-            props3D:    { value: p3d},
-            shapeModel: { value: shapeProps},
-            isShape:    { value: isShape}
-            */
+        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;
         }
     },