aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Splitter.js
diff options
context:
space:
mode:
authorEric Guzman2012-06-19 01:20:36 -0700
committerEric Guzman2012-06-19 01:20:36 -0700
commit2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch)
treef69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/panels/Splitter.js
parent5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff)
parent1007cbf983ad0f2460a4122a492a96023fdb4439 (diff)
downloadninja-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/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 : {