aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Splitter.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/Splitter.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/Splitter.js')
-rwxr-xr-xjs/panels/Splitter.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index f0fb1a45..c6d46911 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -18,8 +18,7 @@ exports.Splitter = Montage.create(Component, {
18 }, 18 },
19 19
20 _panel: { 20 _panel: {
21 value: null, 21 value: null
22 enumerable:true
23 }, 22 },
24 23
25 panel: { 24 panel: {
@@ -41,7 +40,8 @@ exports.Splitter = Montage.create(Component, {
41 }, 40 },
42 set: function(val) { 41 set: function(val) {
43 this._resizeBar = val; 42 this._resizeBar = val;
44 } 43 },
44 serializable: true
45 }, 45 },
46 46
47 _collapsed : { 47 _collapsed : {