aboutsummaryrefslogtreecommitdiff
path: root/js/data/panels-data.js
diff options
context:
space:
mode:
authorEric Guzman2012-04-23 11:55:55 -0700
committerEric Guzman2012-04-23 11:55:55 -0700
commitcdd1189e349e2974681e2c451e861e5b0db570e4 (patch)
treed8823c3d050e011032c563d20c1a5f61e67ae740 /js/data/panels-data.js
parentc0fce534c255ef1e25779e2f0e8de95bb4e160cf (diff)
parent5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff)
downloadninja-cdd1189e349e2974681e2c451e861e5b0db570e4.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/data/panels-data.js')
-rw-r--r--js/data/panels-data.js12
1 files changed, 12 insertions, 0 deletions
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index fd07b4fe..7ab40f11 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -105,6 +105,18 @@ exports.PanelsData = Montage.create(Montage, {
105 open: true, 105 open: true,
106 modulePath: "js/panels/presets/content.reel", 106 modulePath: "js/panels/presets/content.reel",
107 moduleName: "content" 107 moduleName: "content"
108 },
109 {
110 name: "History",
111 minHeight: 100,
112 height: 100,
113 maxHeight: null,
114 flexible: true,
115 collapsed: true,
116 scrollable: true,
117 open: true,
118 modulePath: "js/panels/history-panel/history.reel",
119 moduleName: "History"
108 } 120 }
109 ] 121 ]
110 } 122 }