diff options
author | Pushkar Joshi | 2012-06-05 14:55:17 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-05 14:55:17 -0700 |
commit | f6584f0704be628a91e3749e0607e855aeda2477 (patch) | |
tree | c7f69d015ef0d56b492904bd14b44be590389766 /js/controllers/elements/component-controller.js | |
parent | 3293b0b730227c14bd4f7bd53c125b48f9886764 (diff) | |
parent | 783097854612a292ac1be18ff15d88343013f773 (diff) | |
download | ninja-f6584f0704be628a91e3749e0607e855aeda2477.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/controllers/elements/component-controller.js')
-rwxr-xr-x | js/controllers/elements/component-controller.js | 4 |
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": |