aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-05 11:32:10 -0700
committerValerio Virgillito2012-06-05 11:32:10 -0700
commit73a62c95b5635fee903457279f0f5b57f164e0b5 (patch)
tree2d93494abb9d9d6d446655d7006341336e4b64cc /js/controllers
parent7933020ed6261052b01ac29bdb29794a3f2c8c8b (diff)
parent563935933c191093b8ccd88fd1377775c5641b0d (diff)
downloadninja-73a62c95b5635fee903457279f0f5b57f164e0b5.tar.gz
Merge pull request #266 from mencio/element-model-fixes
components fix: adding a first draw event to components
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 5b0aaeac..dd0766df 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.model.getComponentFromElement(el); 14 var component = el.controller;
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.model.getComponentFromElement(el); 37 var component = el.controller;
38 38
39 switch(p) { 39 switch(p) {
40 case "id": 40 case "id":