diff options
author | Eric Guzman | 2012-06-21 14:21:40 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-21 14:21:40 -0700 |
commit | 1830a7cf4150087ee12711ea75f1162e6e3c2934 (patch) | |
tree | c83aa5f7938fa36416792a231e7cfd7cfbfadab0 /js/panels/objects | |
parent | da85f402b9a8c4e1142d7e43120e5991285b89d5 (diff) | |
parent | 9ba766f77c56619cd977fce59cf1a000cbb9ecc8 (diff) | |
download | ninja-1830a7cf4150087ee12711ea75f1162e6e3c2934.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'js/panels/objects')
-rw-r--r-- | js/panels/objects/object.reel/object.js | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/js/panels/objects/object.reel/object.js b/js/panels/objects/object.reel/object.js index 6f8f5c92..1426f800 100644 --- a/js/panels/objects/object.reel/object.js +++ b/js/panels/objects/object.reel/object.js | |||
@@ -16,6 +16,17 @@ exports.Object = Montage.create(Component, { | |||
16 | iconElement : { value: null }, | 16 | iconElement : { value: null }, |
17 | type : { value: null }, | 17 | type : { value: null }, |
18 | 18 | ||
19 | |||
20 | _name : { value: null }, | ||
21 | name: { | ||
22 | get: function() { | ||
23 | return this._name; | ||
24 | }, | ||
25 | set: function(val) { | ||
26 | this.name = val; | ||
27 | } | ||
28 | }, | ||
29 | |||
19 | _sourceObject : { value: null }, | 30 | _sourceObject : { value: null }, |
20 | sourceObject : { | 31 | sourceObject : { |
21 | get: function() { | 32 | get: function() { |