diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/panels/Resizer.js | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/panels/Resizer.js')
-rwxr-xr-x | js/panels/Resizer.js | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/js/panels/Resizer.js b/js/panels/Resizer.js index 0252c4fb..0f4c39f7 100755 --- a/js/panels/Resizer.js +++ b/js/panels/Resizer.js | |||
@@ -54,7 +54,8 @@ exports.Resizer = Montage.create(Component, { | |||
54 | }, | 54 | }, |
55 | set: function(val) { | 55 | set: function(val) { |
56 | this._isInversed = val; | 56 | this._isInversed = val; |
57 | } | 57 | }, |
58 | serializable: true | ||
58 | }, | 59 | }, |
59 | 60 | ||
60 | _isVertical: { | 61 | _isVertical: { |
@@ -67,7 +68,8 @@ exports.Resizer = Montage.create(Component, { | |||
67 | }, | 68 | }, |
68 | set: function(val) { | 69 | set: function(val) { |
69 | this._isVertical = val; | 70 | this._isVertical = val; |
70 | } | 71 | }, |
72 | serializable: true | ||
71 | }, | 73 | }, |
72 | 74 | ||
73 | _isPanel: { | 75 | _isPanel: { |
@@ -79,8 +81,10 @@ exports.Resizer = Montage.create(Component, { | |||
79 | }, | 81 | }, |
80 | set: function(value) { | 82 | set: function(value) { |
81 | this._isPanel = value; | 83 | this._isPanel = value; |
82 | } | 84 | }, |
85 | serializable: true | ||
83 | }, | 86 | }, |
87 | |||
84 | _panel : { | 88 | _panel : { |
85 | value: null | 89 | value: null |
86 | }, | 90 | }, |
@@ -92,7 +96,8 @@ exports.Resizer = Montage.create(Component, { | |||
92 | set: function(val) { | 96 | set: function(val) { |
93 | this._panel = val; | 97 | this._panel = val; |
94 | if(val._element) this._panel = val._element; | 98 | if(val._element) this._panel = val._element; |
95 | } | 99 | }, |
100 | serializable: true | ||
96 | }, | 101 | }, |
97 | 102 | ||
98 | height: { | 103 | height: { |