diff options
| author | Armen Kesablyan | 2012-06-01 13:13:21 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-01 13:13:21 -0700 |
| commit | 10d97af27fca224752ad04551ca5c41982222d1f (patch) | |
| tree | 27d2899cca3a9f28a0b6e222d39436d83009fafc /js/panels/objects | |
| parent | 9e187e40d9982654081e52be656e00b3ca4d36b5 (diff) | |
| parent | 77677e5ffb08a5dec4bf0be279130d7b1a99d03f (diff) | |
| download | ninja-10d97af27fca224752ad04551ca5c41982222d1f.tar.gz | |
Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding
Diffstat (limited to 'js/panels/objects')
| -rw-r--r-- | js/panels/objects/object.reel/object.html | 2 | ||||
| -rw-r--r-- | js/panels/objects/object.reel/object.js | 32 |
2 files changed, 6 insertions, 28 deletions
diff --git a/js/panels/objects/object.reel/object.html b/js/panels/objects/object.reel/object.html index efc66d79..a072ab5e 100644 --- a/js/panels/objects/object.reel/object.html +++ b/js/panels/objects/object.reel/object.html | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | <body> | 38 | <body> |
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | <li data-montage-id="object"> | 41 | <li data-montage-id="object" draggable="true"> |
| 42 | <div class="object-icon"></div> | 42 | <div class="object-icon"></div> |
| 43 | <span data-montage-id="label" class="object-label"></span> | 43 | <span data-montage-id="label" class="object-label"></span> |
| 44 | </li> | 44 | </li> |
diff --git a/js/panels/objects/object.reel/object.js b/js/panels/objects/object.reel/object.js index 953c1baf..43abafad 100644 --- a/js/panels/objects/object.reel/object.js +++ b/js/panels/objects/object.reel/object.js | |||
| @@ -57,41 +57,19 @@ exports.Object = Montage.create(Component, { | |||
| 57 | get: function() { | 57 | get: function() { |
| 58 | return this._montageLabel; | 58 | return this._montageLabel; |
| 59 | }, | 59 | }, |
| 60 | set: function(value) { | 60 | set: function(data) { |
| 61 | if(this._montageMetaData === value) { return false; } | 61 | if(this._montageMetaData === data) { return false; } |
| 62 | 62 | ||
| 63 | this._montageMetaData = value; | 63 | this._montageMetaData = data; |
| 64 | 64 | ||
| 65 | if(!this.identifier && value.label) { | 65 | if(!this.identifier && data.label) { |
| 66 | this.label = value.label; | 66 | this.label = data.label; |
| 67 | this.needsDraw = true; | 67 | this.needsDraw = true; |
| 68 | } | 68 | } |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | }, | 71 | }, |
| 72 | 72 | ||
| 73 | templateDidLoad: { | ||
| 74 | value: function() { | ||
| 75 | console.log('object loaded'); | ||
| 76 | } | ||
| 77 | }, | ||
| 78 | |||
| 79 | prepareForDraw : { | ||
| 80 | value: function() { | ||
| 81 | |||
| 82 | } | ||
| 83 | }, | ||
| 84 | |||
| 85 | willDraw : { | ||
| 86 | value: function() { | ||
| 87 | if(this._needsPropertyInspection) { | ||
| 88 | |||
| 89 | } | ||
| 90 | |||
| 91 | console.log("This label ", this.label); | ||
| 92 | } | ||
| 93 | }, | ||
| 94 | |||
| 95 | draw : { | 73 | draw : { |
| 96 | value: function() { | 74 | value: function() { |
| 97 | 75 | ||