aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-10 16:51:22 -0700
committerValerio Virgillito2012-05-10 16:51:22 -0700
commitcba4e3615f9d922a4bee9a72b48db06694b9bb81 (patch)
tree7f99f56cc61cb098ca0366a7d7cdea1c9a9040e7 /js/controllers
parentc23c4bad96ebc4c2f85070e4cc2511030cac05fc (diff)
parent90d158a3372b6c8ac2deb8b82070d76135e72397 (diff)
downloadninja-cba4e3615f9d922a4bee9a72b48db06694b9bb81.tar.gz
Merge pull request #216 from mencio/dom-architecture
Dom architecture - Fixed components positions and pi
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/elements/component-controller.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/controllers/elements/component-controller.js b/js/controllers/elements/component-controller.js
index d902e4a1..5b0aaeac 100755
--- a/js/controllers/elements/component-controller.js
+++ b/js/controllers/elements/component-controller.js
@@ -11,7 +11,7 @@ exports.ComponentController = Montage.create(ElementController, {
11 11
12 getProperty: { 12 getProperty: {
13 value: function(el, prop) { 13 value: function(el, prop) {
14 var component = el.controller || this.application.ninja.currentDocument.getComponentFromElement(el); 14 var component = el.controller || this.application.ninja.currentDocument.model.getComponentFromElement(el);
15 15
16 switch(prop) { 16 switch(prop) {
17 case "id": 17 case "id":
@@ -34,7 +34,7 @@ exports.ComponentController = Montage.create(ElementController, {
34 34
35 setProperty: { 35 setProperty: {
36 value: function(el, p, value) { 36 value: function(el, p, value) {
37 var component = el.controller || this.application.ninja.currentDocument.getComponentFromElement(el); 37 var component = el.controller || this.application.ninja.currentDocument.model.getComponentFromElement(el);
38 38
39 switch(p) { 39 switch(p) {
40 case "id": 40 case "id":