2 files changed, 29 insertions, 25 deletions

diff --git a/js/controllers/elements/component-controller.js b/js/controllers/elements/component-controller.js
index 33b9b79a..83450d0f 100755
--- a/js/controllers/elements/component-controller.js
+++ b/js/controllers/elements/component-controller.js
@@ -12,20 +12,19 @@ exports.ComponentController = Montage.create(ElementController, {
     getProperty: {
         value: function(el, prop) {
             switch(prop) {
-                case "label":
-                    return this.application.ninja.currentDocument.getComponentFromElement(el).label;
-                    break;
-                case "enabled":
-                    return this.application.ninja.currentDocument.getComponentFromElement(el).enabled;
-                    break;
-                case "disabled":
-                    return this.application.ninja.currentDocument.getComponentFromElement(el).disabled;
-                    break;
-                case "value":
-                    return this.application.ninja.currentDocument.getComponentFromElement(el).value;
-                    break;
+                case "id":
+                case "class":
+                case "left":
+                case "top":
+                case "width":
+                case "height":
+                    if(el.nodeName === "IMG" && (prop === "width" || prop === "height")) {
+                        return this.application.ninja.currentDocument.getComponentFromElement(el)[prop];
+                    } else {
+                        return ElementController.getProperty(el, prop, true);
+                    }
                 default:
-                    return ElementController.getProperty(el, prop, true);
+                    return this.application.ninja.currentDocument.getComponentFromElement(el)[prop];
             }
         }
     },
@@ -33,20 +32,24 @@ exports.ComponentController = Montage.create(ElementController, {
     setProperty: {
         value: function(el, p, value) {
             switch(p) {
-                case "label":
-                    this.application.ninja.currentDocument.getComponentFromElement(el).label = value;
-                    break;
-                case "enabled":
-                    this.application.ninja.currentDocument.getComponentFromElement(el).enabled = value;
-                    break;
-                case "disabled":
-                    this.application.ninja.currentDocument.getComponentFromElement(el).disabled = value;
-                    break;
-                case "value":
-                    this.application.ninja.currentDocument.getComponentFromElement(el).value = value;
+                case "id":
+                case "class":
+                case "left":
+                case "top":
+                case "width":
+                case "height":
+                    if(el.nodeName === "IMG" && (p === "width" || p === "height")) {
+                        this.application.ninja.currentDocument.getComponentFromElement(el)[p] = value;
+                    } else {
+                        ElementController.setProperty(el, p, value);
+                    }
                     break;
                 default:
-                    ElementController.setProperty(el, p, value);
+                    if(p === "min" || p === "max") value = parseFloat(value);
+
+                    this.application.ninja.currentDocument.getComponentFromElement(el)[p] = value;
+                    break;
+
             }
         }
     }
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index f69e6fc9..5ced8820 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -39,6 +39,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                     break;
                 case "useWebGl":
                     var canvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", el.className, true);
+                    canvas.setAttribute("data-RDGE-id", njModule.NJUtils.generateRandom());
                     canvas.width = el.width;
                     canvas.height = el.height;
                     this.application.ninja.elementMediator.replaceElement(el, canvas);