diff options
| author | Armen Kesablyan | 2012-02-22 16:26:41 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-22 16:26:41 -0800 |
| commit | 0bd1cefea2ab350fad1a891bdc926053b799aafc (patch) | |
| tree | 962f559fcc02a3dfeb297d59907e40fa153453f3 /js/components/layout/tool-button.reel/tool-button.js | |
| parent | 695bc5082f48dddf66ce31480a4faefc067b38bd (diff) | |
| parent | 2d2b1af8b5c0d506fe6a1cf65614101fec145970 (diff) | |
| download | ninja-0bd1cefea2ab350fad1a891bdc926053b799aafc.tar.gz | |
Merge branch 'refs/heads/master' into new-tool-icons
Diffstat (limited to 'js/components/layout/tool-button.reel/tool-button.js')
| -rwxr-xr-x[-rw-r--r--] | js/components/layout/tool-button.reel/tool-button.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/layout/tool-button.reel/tool-button.js b/js/components/layout/tool-button.reel/tool-button.js index 5cb0e7fc..6cea0dc3 100644..100755 --- a/js/components/layout/tool-button.reel/tool-button.js +++ b/js/components/layout/tool-button.reel/tool-button.js | |||
| @@ -40,7 +40,7 @@ exports.ToolButton = Montage.create(Component, { | |||
| 40 | }, | 40 | }, |
| 41 | 41 | ||
| 42 | _currentSubSelected: { value: 0}, | 42 | _currentSubSelected: { value: 0}, |
| 43 | 43 | ||
| 44 | prepareForDraw: { | 44 | prepareForDraw: { |
| 45 | enumerable: false, | 45 | enumerable: false, |
| 46 | value: function() { | 46 | value: function() { |