Merge branch 'refs/heads/master' into binding

Conflicts:
	js/document/models/html.js
	js/document/views/design.js
	js/ninja.reel/ninja.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

2 files changed, 125 insertions, 1 deletions

diff --git a/js/models/app-model.js b/js/models/app-model.js
index 1c599a32..ceba653e 100755
--- a/js/models/app-model.js
+++ b/js/models/app-model.js
@@ -9,6 +9,32 @@ var Montage = require("montage/core/core").Montage,
 
 exports.AppModel = Montage.create(Component, {
 
+    _currentDocument: {
+        value : null
+    },
+
+    currentDocument : {
+        get : function() {
+            return this._currentDocument;
+        },
+        set : function(value) {
+            if (value === this._currentDocument) {
+                return;
+            }
+
+            if(this._currentDocument && this._currentDocument.currentView === "design") {
+                this._currentDocument.model.draw3DGrid = this.show3dGrid;
+            }
+
+            this._currentDocument = value;
+
+            if(this._currentDocument && this._currentDocument.currentView === "design") {
+                this.show3dGrid = this._currentDocument.model.draw3DGrid;
+            }
+
+        }
+    },
+
     _livePreview: {
         value: false
     },
diff --git a/js/models/element-model.js b/js/models/element-model.js
index 966158e4..76f15b21 100755
--- a/js/models/element-model.js
+++ b/js/models/element-model.js
@@ -10,7 +10,105 @@ var Montage             = require("montage/core/core").Montage,
     ControllerFactory   = require("js/controllers/elements/controller-factory").ControllerFactory,
     PiData              = require("js/data/pi/pi-data").PiData;
 
-exports.ElementModel = Montage.create(Montage, {
+var modelGenerator = exports.modelGenerator = function() {
+    var info = getInfoForElement(this);
+
+    Object.defineProperty(this, "_model", {
+        configurable: true,
+        enumerable: false,
+        writable: true,
+        value: Montage.create(elmo, {
+            type:           { value: info.type},
+            selection:      { value: info.selection},
+            controller:     { value: info.controller},
+            pi:             { value: info.pi},
+            props3D:        { value: info.props3d},
+            shapeModel:     { value: info.shapeModel},
+            isShape:        { value: info.isShape}
+        })
+    });
+
+    if(this._model.selection !== "body") {
+        this._model.props3D.init(this, false);
+    }
+
+    return this._model;
+};
+
+var getInfoForElement = function(el) {
+    var elementName, controller, pi, shapeModel = null, isShape = false, isComponent = false;
+
+    elementName = el.nodeName.toLowerCase();
+    controller = elementNameToController(elementName);
+    pi = elementNameToPi(elementName);
+
+    // Element is a shape
+    if(el.getAttribute("data-RDGE-id")) {
+        controller = "shape";
+        shapeModel = Montage.create(ShapeModel);
+        isShape = true;
+    }
+
+    if(el.nodeName.toLowerCase() === "ninja-content") {
+        elementName = "body";
+        controller = elementNameToController(elementName);
+        pi = elementNameToPi(elementName);
+    }
+
+    // TODO: Add this in case there is no controller for the component
+    /*
+    if(el.getAttribute("data-montage-id")) {
+        elementName = null;
+        this.isComponent = true;
+    }
+    */
+
+    // Element is a component
+    if(el.controller) {
+        var componentInfo = Montage.getInfoForObject(el.controller);
+        var componentName = componentInfo.objectName;//.toLowerCase();
+
+        controller = "component";
+        elementName = componentName;
+        pi = elementNameToPi(componentName.replace(/\s+/g, ''));
+        isComponent = true;
+    }
+
+    return {
+        type: el.nodeName,
+        selection: elementName,
+        controller: ControllerFactory.getController(controller),
+        pi: pi,
+        props3d: Montage.create(Properties3D),
+        shapeModel: shapeModel,
+        isShape: isShape,
+        isComponent: isComponent
+    }
+};
+
+var elementNameToController = function(name) {
+    if(name === "div" || name === "custom") {
+        return "block";
+    } else if(name === "img") {
+        return "image";
+    } else {
+        return name;
+    }
+};
+
+var elementNameToPi = function(name) {
+    if(!name) return null;
+
+    var piString = name + "Pi";
+
+    if(!PiData.hasOwnProperty(piString)) {
+        piString = "blockPi";
+    }
+
+    return piString;
+};
+
+var elmo = exports.ElementModel = Montage.create(Montage, {
     key:            { value: "_model_"},
 
     type:           { value: null },                // Tag type that was created