aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/content.reel/content.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/presets/content.reel/content.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/presets/content.reel/content.js')
-rw-r--r--js/panels/presets/content.reel/content.js15
1 files changed, 14 insertions, 1 deletions
diff --git a/js/panels/presets/content.reel/content.js b/js/panels/presets/content.reel/content.js
index 1ede7246..eba150c3 100644
--- a/js/panels/presets/content.reel/content.js
+++ b/js/panels/presets/content.reel/content.js
@@ -14,6 +14,10 @@ exports.content = Montage.create(Component, {
14 contentPanel : { 14 contentPanel : {
15 value: null 15 value: null
16 }, 16 },
17 activeTabIndex: {
18 value: null,
19 serializable: true
20 },
17 templateDidLoad : { 21 templateDidLoad : {
18 value: function() { 22 value: function() {
19 var storedTabIndex = this.application.localStorage.getItem("presetsTabIndex"); 23 var storedTabIndex = this.application.localStorage.getItem("presetsTabIndex");
@@ -55,7 +59,16 @@ exports.content = Montage.create(Component, {
55 this._activeTab = tabObject; 59 this._activeTab = tabObject;
56 60
57 this.needsDraw = this._needsTabSwitch = true; 61 this.needsDraw = this._needsTabSwitch = true;
58 } 62 },
63 serializable: true
64 },
65 tabBar: {
66 value: null,
67 serializable: true
68 },
69 tabs:{
70 value: null,
71 serializable: true
59 }, 72 },
60 _tabToDeactivate : { 73 _tabToDeactivate : {
61 value: null, 74 value: null,