aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Resizer.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/panels/Resizer.js
parent1bb2778224982aea7b9781c6559bb659983a400f (diff)
parenta827f2769d75848c0ba0bff03a927c1f2706322b (diff)
downloadninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/Resizer.js')
-rwxr-xr-xjs/panels/Resizer.js13
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: {