diff options
author | Pushkar Joshi | 2012-03-02 12:24:33 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-03-02 12:24:33 -0800 |
commit | 4419209a1fd850ab468209b562b66b0242b42a9c (patch) | |
tree | bd7ca04f963f5a3aeb4b3c06db6f187903307d45 /js/panels/Resizer.js | |
parent | 1b68bb87c458877cb850a96d8a093d6064bc41dc (diff) | |
parent | ff0a956f33df034e9a009cfcb8999e469456a4b5 (diff) | |
download | ninja-4419209a1fd850ab468209b562b66b0242b42a9c.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/Resizer.js')
-rwxr-xr-x | js/panels/Resizer.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/js/panels/Resizer.js b/js/panels/Resizer.js index ca6ed062..0252c4fb 100755 --- a/js/panels/Resizer.js +++ b/js/panels/Resizer.js | |||
@@ -90,16 +90,22 @@ exports.Resizer = Montage.create(Component, { | |||
90 | return this._panel; | 90 | return this._panel; |
91 | }, | 91 | }, |
92 | set: function(val) { | 92 | set: function(val) { |
93 | this._panel = val | 93 | this._panel = val; |
94 | if(val._element) this._panel = val._element; | ||
94 | } | 95 | } |
95 | }, | 96 | }, |
97 | |||
98 | height: { | ||
99 | value: null | ||
100 | }, | ||
96 | 101 | ||
97 | handleClick: { | 102 | handleClick: { |
98 | value: function() { | 103 | value: function() { |
99 | 104 | ||
100 | } | 105 | } |
101 | }, | 106 | }, |
102 | 107 | ||
108 | |||
103 | handleMousedown: { | 109 | handleMousedown: { |
104 | value: function(e) { | 110 | value: function(e) { |
105 | e.preventDefault(); | 111 | e.preventDefault(); |