diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/panels/presets | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/presets')
-rw-r--r-- | js/panels/presets/content.reel/content.js | 15 |
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, |