diff options
author | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
commit | c59eb371559a3061ce53223e249ca97daace5968 (patch) | |
tree | f9540e26c0f273d35f92010605da65dd85bbe70c /node_modules/montage/ui/slot.reel/slot.js | |
parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
download | ninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'node_modules/montage/ui/slot.reel/slot.js')
-rwxr-xr-x | node_modules/montage/ui/slot.reel/slot.js | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/node_modules/montage/ui/slot.reel/slot.js b/node_modules/montage/ui/slot.reel/slot.js index 9d7ceb6f..36341552 100755 --- a/node_modules/montage/ui/slot.reel/slot.js +++ b/node_modules/montage/ui/slot.reel/slot.js | |||
@@ -21,6 +21,12 @@ exports.Slot = Montage.create(Component, /** @lends module:"montage/ui/slot.reel | |||
21 | value: false | 21 | value: false |
22 | }, | 22 | }, |
23 | 23 | ||
24 | didCreate: { | ||
25 | value: function() { | ||
26 | this.content = null; | ||
27 | } | ||
28 | }, | ||
29 | |||
24 | /** | 30 | /** |
25 | Description TODO | 31 | Description TODO |
26 | @type {Property} | 32 | @type {Property} |
@@ -32,6 +38,10 @@ exports.Slot = Montage.create(Component, /** @lends module:"montage/ui/slot.reel | |||
32 | serializable: true | 38 | serializable: true |
33 | }, | 39 | }, |
34 | 40 | ||
41 | _content: { | ||
42 | value: null | ||
43 | }, | ||
44 | |||
35 | /** | 45 | /** |
36 | Description TODO | 46 | Description TODO |
37 | @type {Function} | 47 | @type {Function} |
@@ -40,7 +50,7 @@ exports.Slot = Montage.create(Component, /** @lends module:"montage/ui/slot.reel | |||
40 | content: { | 50 | content: { |
41 | enumerable: false, | 51 | enumerable: false, |
42 | get: function() { | 52 | get: function() { |
43 | return Object.getPropertyDescriptor(Component, "domContent").get.call(this); | 53 | return this._content; |
44 | }, | 54 | }, |
45 | set: function(value) { | 55 | set: function(value) { |
46 | var element; | 56 | var element; |
@@ -63,6 +73,7 @@ exports.Slot = Montage.create(Component, /** @lends module:"montage/ui/slot.reel | |||
63 | } else { | 73 | } else { |
64 | Object.getPropertyDescriptor(Component, "domContent").set.call(this, value); | 74 | Object.getPropertyDescriptor(Component, "domContent").set.call(this, value); |
65 | } | 75 | } |
76 | this._content = value; | ||
66 | this.needsDraw = true; | 77 | this.needsDraw = true; |
67 | } | 78 | } |
68 | }, | 79 | }, |