diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/ui/tree-basic/tree.reel/tree.js | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/ui/tree-basic/tree.reel/tree.js')
| -rwxr-xr-x | js/components/ui/tree-basic/tree.reel/tree.js | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/js/components/ui/tree-basic/tree.reel/tree.js b/js/components/ui/tree-basic/tree.reel/tree.js index 0b161aa6..14472475 100755 --- a/js/components/ui/tree-basic/tree.reel/tree.js +++ b/js/components/ui/tree-basic/tree.reel/tree.js | |||
| @@ -58,22 +58,22 @@ exports.Tree = Montage.create(Component, { | |||
| 58 | }, | 58 | }, |
| 59 | 59 | ||
| 60 | willDraw: { | 60 | willDraw: { |
| 61 | enumerable: false, | 61 | enumerable: false, |
| 62 | value: function() { | 62 | value: function() { |
| 63 | 63 | ||
| 64 | } | 64 | } |
| 65 | }, | 65 | }, |
| 66 | draw: { | 66 | draw: { |
| 67 | enumerable: false, | 67 | enumerable: false, |
| 68 | value: function() { | 68 | value: function() { |
| 69 | 69 | ||
| 70 | } | 70 | } |
| 71 | }, | 71 | }, |
| 72 | didDraw: { | 72 | didDraw: { |
| 73 | enumerable: false, | 73 | enumerable: false, |
| 74 | value: function() { | 74 | value: function() { |
| 75 | 75 | ||
| 76 | } | 76 | } |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | }); | 79 | }); |